From: cherierm Date: Thu, 15 Nov 2007 18:54:40 +0000 (+0000) Subject: Just declare the variable at the beginning of the function (strict ansi) X-Git-Tag: v3.3~792 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f6e0662a8aa22de690e96c0a029a11ce9eb9ca57 Just declare the variable at the beginning of the function (strict ansi) git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5049 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/examples/msg/properties/msg_prop.c b/examples/msg/properties/msg_prop.c index 9706ed0d49..152fd7f9c5 100644 --- a/examples/msg/properties/msg_prop.c +++ b/examples/msg/properties/msg_prop.c @@ -27,21 +27,26 @@ int master(int argc, char *argv[]) { int slaves_count = 0; m_host_t *slaves = NULL; - + xbt_dict_t props; + xbt_dict_cursor_t cursor=NULL; int i; + char *key,*data; + const char *noexist="Unknown"; + const char*value; + char exist[]="Hdd"; { /* Process organisation */ slaves_count = argc - 4; slaves = xbt_new(m_host_t, sizeof(m_host_t) * slaves_count); - xbt_dict_t props; + for (i = 4; i < argc; i++) { slaves[i-4] = MSG_get_host_by_name(argv[i]); xbt_assert1(slaves[i-4]!=NULL, "Unknown host %s. Stopping Now! ", argv[i]); /* Get the property list of the host */ props = MSG_host_get_properties(slaves[i-4]); - xbt_dict_cursor_t cursor=NULL; - char *key,*data; + + /* Print the properties of the host */ xbt_dict_foreach(props,cursor,key,data) { @@ -49,8 +54,8 @@ int master(int argc, char *argv[]) } /* Try to get a property that does not exist */ - const char *noexist="Unknown"; - const char*value = MSG_host_get_property_value(slaves[i-4], noexist); + + value = MSG_host_get_property_value(slaves[i-4], noexist); if ( value == NULL) INFO2("Property: %s for host %s is undefined", noexist, argv[i]); else @@ -58,7 +63,7 @@ int master(int argc, char *argv[]) /* Modify an existing property test. First check it exists */\ INFO0("Trying to modify a host property"); - char exist[]="Hdd"; + value = MSG_host_get_property_value(slaves[i-4],exist); xbt_assert1(value,"\tProperty %s is undefined", exist); INFO2("\tProperty: %s old value: %s", exist, value); @@ -82,6 +87,8 @@ int slave(int argc, char *argv[]) xbt_dict_t props = MSG_process_get_properties(MSG_process_self()); xbt_dict_cursor_t cursor=NULL; char *key,*data; + const char *noexist="UnknownProcessProp"; + const char *value; /* Print the properties of the process */ xbt_dict_foreach(props,cursor,key,data) { @@ -89,8 +96,8 @@ int slave(int argc, char *argv[]) } /* Try to get a property that does not exist */ - const char *noexist="UnknownProcessProp"; - const char *value = MSG_process_get_property_value(MSG_process_self(),noexist); + + value = MSG_process_get_property_value(MSG_process_self(),noexist); if ( value == NULL) INFO2("Property: %s for process %s is undefined", noexist, MSG_process_get_name(MSG_process_self())); else diff --git a/examples/simdag/properties/sd_prop.c b/examples/simdag/properties/sd_prop.c index 843269c265..07d8b17a62 100755 --- a/examples/simdag/properties/sd_prop.c +++ b/examples/simdag/properties/sd_prop.c @@ -13,9 +13,36 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(test, int main(int argc, char **argv) { int i; + const char * platform_file; + const SD_workstation_t *workstations; + SD_workstation_t w1; + SD_workstation_t w2; + const char *name1; + const char *name2; + xbt_dict_t props; + xbt_dict_cursor_t cursor = NULL; + char *key,*data; + char noexist[]="NoProp"; + const char *value; + char exist[]="Hdd"; + const double computation_amount1 = 2000000; + const double computation_amount2 = 1000000; + const double communication_amount12 = 2000000; + const double communication_amount21 = 3000000; + const SD_link_t *route; + int route_size; + SD_task_t taskA, taskB, taskC, taskD, task; + const int workstation_number = 2; + SD_workstation_t workstation_list[2]; + double computation_amount[2]; + double communication_amount[4] = {0}; + double rate = -1.0; + SD_task_t *changed_tasks; /* initialisation of SD */ SD_init(&argc, argv); + + platform_file = argv[1]; /* xbt_log_control_set("sd.thres=debug"); */ @@ -26,24 +53,23 @@ int main(int argc, char **argv) { } /* creation of the environment */ - const char * platform_file = argv[1]; SD_create_environment(platform_file); /* test the estimation functions */ - const SD_workstation_t *workstations = SD_workstation_get_list(); - SD_workstation_t w1 = workstations[0]; - SD_workstation_t w2 = workstations[1]; + workstations = SD_workstation_get_list(); + w1 = workstations[0]; + w2 = workstations[1]; SD_workstation_set_access_mode(w2, SD_WORKSTATION_SEQUENTIAL_ACCESS); - const char *name1 = SD_workstation_get_name(w1); - const char *name2 = SD_workstation_get_name(w2); + name1 = SD_workstation_get_name(w1); + name2 = SD_workstation_get_name(w2); + /* The host properties can be retrived from all interfaces */ - xbt_dict_t props; + INFO1("Property list for workstation %s", name1); /* Get the property list of the workstation 1 */ props = SD_workstation_get_properties(w1); - xbt_dict_cursor_t cursor = NULL; - char *key,*data; + /* Trying to set a new property */ xbt_dict_set(props, xbt_strdup("NewProp"), strdup("newValue"), free); @@ -54,8 +80,8 @@ int main(int argc, char **argv) { } /* Try to get a property that does not exist */ - char noexist[]="NoProp"; - const char *value = SD_workstation_get_property_value(w1,noexist); + + value = SD_workstation_get_property_value(w1,noexist); if ( value == NULL) INFO1("\tProperty: %s is undefined", noexist); else @@ -74,7 +100,7 @@ int main(int argc, char **argv) { /* Modify an existing property test. First check it exists */\ INFO0("Modify an existing property"); - char exist[]="Hdd"; + value = SD_workstation_get_property_value(w2,exist); if ( value == NULL) INFO1("\tProperty: %s is undefined", exist); @@ -89,29 +115,23 @@ int main(int argc, char **argv) { INFO1("\tProperty: %s is undefined", exist); else INFO2("\tProperty: %s new value: %s", exist, value); - - - - const double computation_amount1 = 2000000; - const double computation_amount2 = 1000000; - const double communication_amount12 = 2000000; - const double communication_amount21 = 3000000; /* NOTE: The link properties can be retrieved only from the SimDag interface */ - const SD_link_t *route = SD_route_get_list(w1, w2); - int route_size = SD_route_get_size(w1, w2); + route = SD_route_get_list(w1, w2); + route_size = SD_route_get_size(w1, w2); for (i = 0; i < route_size; i++) { - - props = SD_link_get_properties(route[i]); xbt_dict_cursor_t cursor = NULL; char *key,*data; + char noexist1[]="Other"; + props = SD_link_get_properties(route[i]); + /* Print the properties of the current link */ xbt_dict_foreach(props,cursor,key,data) { INFO3("\tLink %s property: %s has value: %s",SD_link_get_name(route[i]),key,data); /* Try to get a property that does not exist */ - char noexist1[]="Other"; + value = SD_link_get_property_value(route[i], noexist1); if ( value == NULL) INFO2("\tProperty: %s for link %s is undefined", noexist, SD_link_get_name(route[i])); @@ -121,10 +141,10 @@ int main(int argc, char **argv) { } /* creation of the tasks and their dependencies */ - SD_task_t taskA = SD_task_create("Task A", NULL, 10.0); - SD_task_t taskB = SD_task_create("Task B", NULL, 40.0); - SD_task_t taskC = SD_task_create("Task C", NULL, 30.0); - SD_task_t taskD = SD_task_create("Task D", NULL, 60.0); + taskA = SD_task_create("Task A", NULL, 10.0); + taskB = SD_task_create("Task B", NULL, 40.0); + taskC = SD_task_create("Task C", NULL, 30.0); + taskD = SD_task_create("Task D", NULL, 60.0); SD_task_dependency_add(NULL, NULL, taskB, taskA); @@ -139,19 +159,18 @@ int main(int argc, char **argv) { /* scheduling parameters */ - - const int workstation_number = 2; - const SD_workstation_t workstation_list[] = {w1, w2}; - double computation_amount[] = {computation_amount1, computation_amount2}; - double communication_amount[] = - { - 0, communication_amount12, - communication_amount21, 0 - }; - double rate = -1.0; + workstation_list[0] = w1; + workstation_list[1] = w2; + computation_amount[0] = computation_amount1; + computation_amount[1] = computation_amount2; + + communication_amount[1] = communication_amount12; + communication_amount[2] = communication_amount21; + + /* estimated time */ - SD_task_t task = taskD; + task = taskD; INFO2("Estimated time for '%s': %f", SD_task_get_name(task), SD_task_get_execution_time(task, workstation_number, workstation_list, computation_amount, communication_amount, rate)); @@ -167,8 +186,6 @@ int main(int argc, char **argv) { SD_task_schedule(taskD, workstation_number, workstation_list, computation_amount, communication_amount, rate); - SD_task_t *changed_tasks; - changed_tasks = SD_simulate(-1.0); for (i = 0; changed_tasks[i] != NULL; i++) { INFO3("Task '%s' start time: %f, finish time: %f", diff --git a/examples/simdag/sd_test.c b/examples/simdag/sd_test.c index 0729329d21..e2f174fd13 100644 --- a/examples/simdag/sd_test.c +++ b/examples/simdag/sd_test.c @@ -9,6 +9,25 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(sd_test, int main(int argc, char **argv) { int i; + const char * platform_file; + const SD_workstation_t *workstations; + const char *name1; + const char *name2; + double computation_amount1; + double computation_amount2; + double communication_amount12; + double communication_amount21; + const SD_link_t *route; + int route_size; + SD_task_t task, taskA, taskB, taskC, taskD; + SD_task_t *changed_tasks; + xbt_ex_t ex; + const int workstation_number = 2; + SD_workstation_t workstation_list[2]; + double computation_amount[2]; + double communication_amount[4] = {0}; + double rate = -1.0; + SD_workstation_t w1, w2; /* initialisation of SD */ SD_init(&argc, argv); @@ -22,28 +41,28 @@ int main(int argc, char **argv) { } /* creation of the environment */ - const char * platform_file = argv[1]; + platform_file = argv[1]; SD_create_environment(platform_file); /* test the estimation functions */ - const SD_workstation_t *workstations = SD_workstation_get_list(); - SD_workstation_t w1 = workstations[0]; - SD_workstation_t w2 = workstations[1]; + workstations = SD_workstation_get_list(); + w1 = workstations[0]; + w2 = workstations[1]; SD_workstation_set_access_mode(w2, SD_WORKSTATION_SEQUENTIAL_ACCESS); - const char *name1 = SD_workstation_get_name(w1); - const char *name2 = SD_workstation_get_name(w2); - const double computation_amount1 = 2000000; - const double computation_amount2 = 1000000; - const double communication_amount12 = 2000000; - const double communication_amount21 = 3000000; + name1 = SD_workstation_get_name(w1); + name2 = SD_workstation_get_name(w2); + computation_amount1 = 2000000; + computation_amount2 = 1000000; + communication_amount12 = 2000000; + communication_amount21 = 3000000; INFO3("Computation time for %f flops on %s: %f", computation_amount1, name1, SD_workstation_get_computation_time(w1, computation_amount1)); INFO3("Computation time for %f flops on %s: %f", computation_amount2, name2, SD_workstation_get_computation_time(w2, computation_amount2)); INFO2("Route between %s and %s:", name1, name2); - const SD_link_t *route = SD_route_get_list(w1, w2); - int route_size = SD_route_get_size(w1, w2); + route = SD_route_get_list(w1, w2); + route_size = SD_route_get_size(w1, w2); for (i = 0; i < route_size; i++) { INFO3("\tLink %s: latency = %f, bandwidth = %f", SD_link_get_name(route[i]), SD_link_get_current_latency(route[i]), SD_link_get_current_bandwidth(route[i])); @@ -56,10 +75,10 @@ int main(int argc, char **argv) { SD_route_get_communication_time(w2, w1, communication_amount21)); /* creation of the tasks and their dependencies */ - SD_task_t taskA = SD_task_create("Task A", NULL, 10.0); - SD_task_t taskB = SD_task_create("Task B", NULL, 40.0); - SD_task_t taskC = SD_task_create("Task C", NULL, 30.0); - SD_task_t taskD = SD_task_create("Task D", NULL, 60.0); + taskA = SD_task_create("Task A", NULL, 10.0); + taskB = SD_task_create("Task B", NULL, 40.0); + taskC = SD_task_create("Task C", NULL, 30.0); + taskD = SD_task_create("Task D", NULL, 60.0); SD_task_dependency_add(NULL, NULL, taskB, taskA); @@ -68,7 +87,7 @@ int main(int argc, char **argv) { SD_task_dependency_add(NULL, NULL, taskD, taskC); /* SD_task_dependency_add(NULL, NULL, taskA, taskD); /\* deadlock */ - xbt_ex_t ex; + TRY { SD_task_dependency_add(NULL, NULL, taskA, taskA); /* shouldn't work and must raise an exception */ @@ -120,19 +139,16 @@ int main(int argc, char **argv) { /* scheduling parameters */ - - const int workstation_number = 2; - const SD_workstation_t workstation_list[] = {w1, w2}; - double computation_amount[] = {computation_amount1, computation_amount2}; - double communication_amount[] = - { - 0, communication_amount12, - communication_amount21, 0 - }; - double rate = -1.0; + workstation_list[0] = w1; + workstation_list[1] = w2; + computation_amount[0] = computation_amount1; + computation_amount[1] = computation_amount2; + + communication_amount[1] = communication_amount12; + communication_amount[2] = communication_amount21; /* estimated time */ - SD_task_t task = taskD; + task = taskD; INFO2("Estimated time for '%s': %f", SD_task_get_name(task), SD_task_get_execution_time(task, workstation_number, workstation_list, computation_amount, communication_amount, rate)); @@ -148,8 +164,6 @@ int main(int argc, char **argv) { SD_task_schedule(taskD, workstation_number, workstation_list, computation_amount, communication_amount, rate); - SD_task_t *changed_tasks; - changed_tasks = SD_simulate(-1.0); for (i = 0; changed_tasks[i] != NULL; i++) { INFO3("Task '%s' start time: %f, finish time: %f", diff --git a/examples/simdag/sd_test2.c b/examples/simdag/sd_test2.c index 5b0712e5f3..446675722a 100644 --- a/examples/simdag/sd_test2.c +++ b/examples/simdag/sd_test2.c @@ -17,6 +17,37 @@ static int nameCompareHosts(const void *n1, const void *n2) int main(int argc, char **argv) { int i,j; SD_task_t *changed_tasks; + int n_hosts; + const SD_workstation_t * hosts; + SD_task_t taskInit; + SD_task_t PtoPComm1; + SD_task_t PtoPComm2; + SD_task_t ParComp_wocomm; + SD_task_t IntraRedist; + SD_task_t ParComp_wcomm1; + SD_task_t InterRedist; + SD_task_t taskFinal; + SD_task_t ParComp_wcomm2; + const double no_cost[] = {1.0, 1.0}; + SD_workstation_t PtoPcomm1_hosts[2]; + SD_workstation_t PtoPcomm2_hosts[2]; + double PtoPcomm1_table[] = { 0, 12500000, 0, 0 }; /* 100Mb */ + double PtoPcomm2_table[] = { 0, 1250000, 0, 0 }; /* 10Mb */ + double ParComp_wocomm_cost[] = {1e+9,1e+9,1e+9,1e+9,1e+9}; /* 1 Gflop per Proc */ + double *ParComp_wocomm_table; + SD_workstation_t ParComp_wocomm_hosts[5]; + double *IntraRedist_cost; + double *IntraRedist_table; + SD_workstation_t IntraRedist_hosts[5]; + double ParComp_wcomm1_cost[] = {1e+9,1e+9,1e+9,1e+9,1e+9}; /* 1 Gflop per Proc */ + double *ParComp_wcomm1_table; + SD_workstation_t ParComp_wcomm1_hosts[5]; + double *InterRedist_cost; + double *InterRedist_table; + double ParComp_wcomm2_cost[] = {1e+8,1e+8,1e+8,1e+8,1e+8}; /* 1 Gflop per Proc (0.02sec duration) */ + SD_workstation_t ParComp_wcomm2_hosts[5]; + double final_cost = 5e+9; + double *ParComp_wcomm2_table; /* initialisation of SD */ SD_init(&argc, argv); @@ -25,23 +56,24 @@ int main(int argc, char **argv) { SD_create_environment(argv[1]); /* getting platform infos */ - int n_hosts = SD_workstation_get_number(); - const SD_workstation_t * hosts= SD_workstation_get_list(); + n_hosts = SD_workstation_get_number(); + hosts= SD_workstation_get_list(); /* sorting hosts by hostname */ qsort((void *)hosts,n_hosts, sizeof(SD_workstation_t),nameCompareHosts); /* creation of the tasks */ - SD_task_t taskInit = SD_task_create("Initial",NULL,1.0); - SD_task_t PtoPComm1 = SD_task_create("PtoP Comm 1", NULL, 1.0); - SD_task_t PtoPComm2 = SD_task_create("PtoP Comm 2", NULL, 1.0); - SD_task_t ParComp_wocomm = SD_task_create("Par Comp without comm", NULL, 1.0); - SD_task_t IntraRedist = SD_task_create("intra redist", NULL, 1.0); - SD_task_t ParComp_wcomm1 = SD_task_create("Par Comp with comm 1", NULL, 1.0); - SD_task_t InterRedist = SD_task_create("inter redist", NULL, 1.0); - SD_task_t taskFinal = SD_task_create("Final",NULL,1.0); - SD_task_t ParComp_wcomm2 = SD_task_create("Par Comp with comm 2", NULL, 1.0); + taskInit = SD_task_create("Initial",NULL,1.0); + PtoPComm1 = SD_task_create("PtoP Comm 1", NULL, 1.0); + PtoPComm2 = SD_task_create("PtoP Comm 2", NULL, 1.0); + ParComp_wocomm = SD_task_create("Par Comp without comm", NULL, 1.0); + IntraRedist = SD_task_create("intra redist", NULL, 1.0); + ParComp_wcomm1 = SD_task_create("Par Comp with comm 1", NULL, 1.0); + InterRedist = SD_task_create("inter redist", NULL, 1.0); + taskFinal = SD_task_create("Final",NULL,1.0); + ParComp_wcomm2 = SD_task_create("Par Comp with comm 2", NULL, 1.0); + /* creation of the dependencies */ SD_task_dependency_add(NULL, NULL, taskInit, PtoPComm1); @@ -54,22 +86,20 @@ int main(int argc, char **argv) { SD_task_dependency_add(NULL, NULL, ParComp_wcomm2, taskFinal); SD_task_dependency_add(NULL, NULL, PtoPComm2, taskFinal); - /* scheduling parameters */ - const double no_cost[] = {1.0, 1.0}; + /* scheduling parameters */ /* large point-to-point communication (0.1 sec duration) */ - double PtoPcomm1_table[] = { 0, 12500000, 0, 0 }; /* 100Mb */ - SD_workstation_t PtoPcomm1_hosts[] = {hosts[0],hosts[1]}; + PtoPcomm1_hosts[0] = hosts[0]; + PtoPcomm1_hosts[1] =hosts[1]; /* small point-to-point communication (0.01 sec duration) */ - double PtoPcomm2_table[] = { 0, 1250000, 0, 0 }; /* 10Mb */ - SD_workstation_t PtoPcomm2_hosts[] = {hosts[0],hosts[2]}; + PtoPcomm2_hosts[0] = hosts[0]; + PtoPcomm2_hosts[1] = hosts[2]; /* parallel task without intra communications (1 sec duration) */ - double ParComp_wocomm_cost[] = {1e+9,1e+9,1e+9,1e+9,1e+9}; /* 1 Gflop per Proc */ - double *ParComp_wocomm_table = (double*) calloc (25, sizeof(double)); - SD_workstation_t ParComp_wocomm_hosts[5]; + ParComp_wocomm_table = (double*) calloc (25, sizeof(double)); + for (i=0; i<5;i++){ ParComp_wocomm_hosts[i]=hosts[i]; } @@ -77,8 +107,8 @@ int main(int argc, char **argv) { /* redistribution within a cluster (small latencies) */ /* each host send (4*2.5Mb =) 10Mb */ /* bandwidth is shared between 5 flows (0.05sec duration) */ - double *IntraRedist_cost = (double*) calloc (5, sizeof(double)); - double *IntraRedist_table = (double*) calloc (25, sizeof(double)); + IntraRedist_cost = (double*) calloc (5, sizeof(double)); + IntraRedist_table = (double*) calloc (25, sizeof(double)); for (i=0;i<5;i++){ for (j=0;j<5;j++){ if (i==j) @@ -88,16 +118,14 @@ int main(int argc, char **argv) { } } - SD_workstation_t IntraRedist_hosts[5]; for (i=0; i<5;i++){ IntraRedist_hosts[i]=hosts[i]; } /* parallel task with intra communications */ /* Computation domination (1 sec duration) */ - double ParComp_wcomm1_cost[] = {1e+9,1e+9,1e+9,1e+9,1e+9}; /* 1 Gflop per Proc */ - double *ParComp_wcomm1_table = (double*) calloc (25, sizeof(double)); - SD_workstation_t ParComp_wcomm1_hosts[5]; + ParComp_wcomm1_table = (double*) calloc (25, sizeof(double)); + for (i=0; i<5;i++){ ParComp_wcomm1_hosts[i]=hosts[i]; } @@ -113,17 +141,17 @@ int main(int argc, char **argv) { /* inter cluster redistribution (big latency on the backbone) */ /* (0.5sec duration without latency impact)*/ - double *InterRedist_cost = (double*) calloc (10, sizeof(double)); - double *InterRedist_table = (double*) calloc (100, sizeof(double)); + InterRedist_cost = (double*) calloc (10, sizeof(double)); + InterRedist_table = (double*) calloc (100, sizeof(double)); for (i=0;i<5;i++){ InterRedist_table[i*10+i+5] = 1250000.; /* 10Mb */ } /* parallel task with intra communications */ /* Communication domination (0.1 sec duration) */ - double ParComp_wcomm2_cost[] = {1e+8,1e+8,1e+8,1e+8,1e+8}; /* 1 Gflop per Proc (0.02sec duration) */ - double *ParComp_wcomm2_table = (double*) calloc (25, sizeof(double)); - SD_workstation_t ParComp_wcomm2_hosts[5]; + + ParComp_wcomm2_table = (double*) calloc (25, sizeof(double)); + for (i=0; i<5;i++){ ParComp_wcomm2_hosts[i]=hosts[i+5]; } @@ -138,7 +166,7 @@ int main(int argc, char **argv) { } /* Sequential task */ - double final_cost = 5e+9; + /* scheduling the tasks */ SD_task_schedule(taskInit, 1, hosts, no_cost, no_cost, -1.0);