From 4ff4ac495bca3ade2ccf66c8eb93973b50e88adf Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 7 Feb 2016 18:14:19 +0100 Subject: [PATCH] kill all atol() from our codebase --- examples/msg/icomms/peer.c | 12 ++++++------ examples/msg/icomms/peer2.c | 8 ++++---- examples/msg/icomms/peer3.c | 10 +++++----- examples/msg/masterslave/masterslave_arg.c | 4 ++-- examples/msg/masterslave/masterslave_mailbox.c | 15 +++++++-------- examples/msg/tracing/categories.c | 6 +++--- examples/msg/tracing/ms.c | 10 +++++----- .../masterslave_mailbox_smpi.c | 13 ++++++------- src/smpi/smpi_base.cpp | 6 ++++-- src/surf/network_smpi.cpp | 8 ++++++-- src/xbt/xbt_log_appender_file.c | 5 ++++- 11 files changed, 52 insertions(+), 45 deletions(-) diff --git a/examples/msg/icomms/peer.c b/examples/msg/icomms/peer.c index a94c91e458..77e6058aa2 100644 --- a/examples/msg/icomms/peer.c +++ b/examples/msg/icomms/peer.c @@ -34,12 +34,12 @@ msg_error_t test_all(const char *platform_file, /** Sender function */ int sender(int argc, char *argv[]) { - long number_of_tasks = atol(argv[1]); - double task_comp_size = atof(argv[2]); - double task_comm_size = atof(argv[3]); - long receivers_count = atol(argv[4]); - double sleep_start_time = atof(argv[5]); - double sleep_test_time = atof(argv[6]); + long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s"); + double task_comp_size = xbt_str_parse_double(argv[2], "Invalid compute size: %s"); + double task_comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s"); + long receivers_count = xbt_str_parse_int(argv[4], "Invalid amount of receivers: %s"); + double sleep_start_time = xbt_str_parse_double(argv[5], "Invalid sleep start time: %s"); + double sleep_test_time = xbt_str_parse_double(argv[6], "Invalid test time: %s"); XBT_INFO("sleep_start_time : %f , sleep_test_time : %f", sleep_start_time, sleep_test_time); diff --git a/examples/msg/icomms/peer2.c b/examples/msg/icomms/peer2.c index b5b4b5b9c0..a2cf462a27 100644 --- a/examples/msg/icomms/peer2.c +++ b/examples/msg/icomms/peer2.c @@ -28,10 +28,10 @@ msg_error_t test_all(const char *platform_file, /** Sender function */ int sender(int argc, char *argv[]) { - long number_of_tasks = atol(argv[1]); - double task_comp_size = atof(argv[2]); - double task_comm_size = atof(argv[3]); - long receivers_count = atol(argv[4]); + long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s"); + double task_comp_size = xbt_str_parse_double(argv[2], "Invalid computational size: %s"); + double task_comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s"); + long receivers_count = xbt_str_parse_int(argv[4], "Invalid amount of receivers: %s"); msg_comm_t *comm = xbt_new(msg_comm_t, number_of_tasks + receivers_count); int i; diff --git a/examples/msg/icomms/peer3.c b/examples/msg/icomms/peer3.c index 155b702dcb..22072b4ae8 100644 --- a/examples/msg/icomms/peer3.c +++ b/examples/msg/icomms/peer3.c @@ -28,11 +28,11 @@ msg_error_t test_all(const char *platform_file, /** Sender function */ int sender(int argc, char *argv[]) { - long number_of_tasks = atol(argv[1]); - double task_comp_size = atof(argv[2]); - double task_comm_size = atof(argv[3]); - long receivers_count = atol(argv[4]); - int diff_com = atol(argv[5]); + long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s"); + double task_comp_size = xbt_str_parse_double(argv[2], "Invalid computational size: %s"); + double task_comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s"); + long receivers_count = xbt_str_parse_int(argv[4], "Invalid amount of receivers: %s"); + int diff_com = xbt_str_parse_int(argv[5], "Invalid value for diff_comm: %s"); double coef = 0; xbt_dynar_t d = xbt_dynar_new(sizeof(msg_comm_t), NULL); int i; diff --git a/examples/msg/masterslave/masterslave_arg.c b/examples/msg/masterslave/masterslave_arg.c index ecaafac2c4..611b26d14d 100644 --- a/examples/msg/masterslave/masterslave_arg.c +++ b/examples/msg/masterslave/masterslave_arg.c @@ -98,8 +98,8 @@ int main(int argc, char *argv[]) MSG_create_environment(argv[1]); - number_of_jobs = atol(argv[2]); - number_of_slaves = atol(argv[3]); + number_of_jobs = xbt_str_parse_int(argv[2], "Invalid amount of jobs: %s"); + number_of_slaves = xbt_str_parse_int(argv[3], "Invalid amount of slaves: %s"); xbt_dynar_t host_dynar = MSG_hosts_as_dynar(); long number_max = xbt_dynar_length(host_dynar); XBT_INFO("Got %ld slaves, %ld tasks to process, and %ld hosts", number_of_slaves, number_of_jobs,number_max); diff --git a/examples/msg/masterslave/masterslave_mailbox.c b/examples/msg/masterslave/masterslave_mailbox.c index 77377226bd..8c4c100720 100644 --- a/examples/msg/masterslave/masterslave_mailbox.c +++ b/examples/msg/masterslave/masterslave_mailbox.c @@ -6,7 +6,7 @@ #include #include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ -#include "xbt/sysdep.h" /* calloc, printf */ +#include "xbt/sysdep.h" /* Create a log channel to have nice outputs. */ #include "xbt/log.h" @@ -17,18 +17,17 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, int master(int argc, char *argv[]); int slave(int argc, char *argv[]); -/** Emitter function */ +/** Sender function */ int master(int argc, char *argv[]) { - long number_of_tasks = atol(argv[1]); - double task_comp_size = atof(argv[2]); - double task_comm_size = atof(argv[3]); - long slaves_count = atol(argv[4]); + long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s"); + double task_comp_size = xbt_str_parse_double(argv[2], "Invalid computational size: %s"); + double task_comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s"); + long slaves_count = xbt_str_parse_int(argv[4], "Invalid amount of slaves: %s"); int i; - XBT_INFO("Got %ld slaves and %ld tasks to process", slaves_count, - number_of_tasks); + XBT_INFO("Got %ld slaves and %ld tasks to process", slaves_count, number_of_tasks); for (i = 0; i < number_of_tasks; i++) { char mailbox[256]; diff --git a/examples/msg/tracing/categories.c b/examples/msg/tracing/categories.c index f47b7b1f1b..f5e3fc95e8 100644 --- a/examples/msg/tracing/categories.c +++ b/examples/msg/tracing/categories.c @@ -32,11 +32,11 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, int master(int argc, char *argv[]); int slave(int argc, char *argv[]); -/** Emitter function */ +/** sender function */ int master(int argc, char *argv[]) { - long number_of_tasks = atol(argv[1]); - long slaves_count = atol(argv[4]); + long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s"); + long slaves_count = xbt_str_parse_int(argv[4], "Invalid amount of slaves: %s"); int i; for (i = 0; i < number_of_tasks; i++) { diff --git a/examples/msg/tracing/ms.c b/examples/msg/tracing/ms.c index 18d7b116ca..697a814ced 100644 --- a/examples/msg/tracing/ms.c +++ b/examples/msg/tracing/ms.c @@ -32,13 +32,13 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, int master(int argc, char *argv[]); int slave(int argc, char *argv[]); -/** Emitter function */ +/** sender function */ int master(int argc, char *argv[]) { - long number_of_tasks = atol(argv[1]); - double task_comp_size = atof(argv[2]); - double task_comm_size = atof(argv[3]); - long slaves_count = atol(argv[4]); + long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s"); + double task_comp_size = xbt_str_parse_double(argv[2], "Invalid computational size: %s"); + double task_comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s"); + long slaves_count = xbt_str_parse_int(argv[4], "Invalid amount of slaves: %s"); //setting the variable "is_master" (previously declared) to value 1 TRACE_host_variable_set(MSG_host_get_name(MSG_host_self()), "is_master", 1); diff --git a/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c b/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c index f0b2daa156..119c30fb0c 100644 --- a/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c +++ b/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c @@ -19,18 +19,17 @@ int slave(int argc, char *argv[]); int master_mpi(int argc, char *argv[]); int alltoall_mpi(int argc, char *argv[]); -/** Emitter function */ +/** sender function */ int master(int argc, char *argv[]) { - long number_of_tasks = atol(argv[1]); - double task_comp_size = atof(argv[2]); - double task_comm_size = atof(argv[3]); - long slaves_count = atol(argv[4]); + long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s"); + double task_comp_size = xbt_str_parse_double(argv[2], "Invalid computational size: %s"); + double task_comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s"); + long slaves_count = xbt_str_parse_int(argv[4], "Invalid amount of slaves: %s"); int i; - XBT_INFO("Got %ld slaves and %ld tasks to process", slaves_count, - number_of_tasks); + XBT_INFO("Got %ld slaves and %ld tasks to process", slaves_count, number_of_tasks); for (i = 0; i < number_of_tasks; i++) { char mailbox[256]; diff --git a/src/smpi/smpi_base.cpp b/src/smpi/smpi_base.cpp index 8d66a0279a..4cbf4edac0 100644 --- a/src/smpi/smpi_base.cpp +++ b/src/smpi/smpi_base.cpp @@ -103,9 +103,11 @@ static xbt_dynar_t parse_factor(const char *smpi_coef_string) xbt_die("Malformed radical for smpi factor: '%s'", smpi_coef_string); for(i =0; i0); data->filename=xbt_strdup(sep+1); *sep='\0'; - data->limit=atol(buf); + char *endptr; + data->limit=strtol(buf,&endptr,10); + xbt_assert(endptr[0]=='\0', "Invalid buffer size: %s", buf); + xbt_free(buf); if(roll) data->count=-1; else -- 2.20.1