X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ff021a73f0cd26b2f27ca729783aa486393f9b3a..654d4134187f74c5b78fa02335cd529625aba79a:/examples/saturate/saturate.c?ds=sidebyside diff --git a/examples/saturate/saturate.c b/examples/saturate/saturate.c index 52136fd4cd..e19549f716 100644 --- a/examples/saturate/saturate.c +++ b/examples/saturate/saturate.c @@ -1,12 +1,11 @@ /* $Id$ */ /* saturate - link saturation demo of GRAS features */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ -/* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ +/* Copyright (c) 2003 Martin Quinson. All rights reserved. */ +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include @@ -15,41 +14,45 @@ #include +XBT_LOG_NEW_DEFAULT_CATEGORY(saturate,"Messages specific to this example"); + /* ********************************************************************** * Sensor code * **********************************************************************/ /* Global private data */ typedef struct { - gras_sock_t *sock; + gras_socket_t *sock; } sensor_data_t; /* Function prototypes */ int sensor (int argc,char *argv[]); int sensor (int argc,char *argv[]) { - gras_error_t errcode; + xbt_error_t errcode; sensor_data_t *g=gras_userdata_new(sensor_data_t); - if ((errcode=gras_sock_server_open(4000,4000,&(g->sock)))) { - fprintf(stderr,"Sensor: Error %s encountered while opening the server socket\n",gras_error_name(errcode)); + if ((errcode=gras_socket_server(4000,&(g->sock)))) { + CRITICAL1("Sensor: Error %s encountered while opening the server socket",xbt_error_name(errcode)); return 1; } if (grasbw_register_messages()) { - gras_sock_close(g->sock); + gras_socket_close(g->sock); return 1; } while (1) { - if ((errcode=gras_msg_handle(60.0)) && errcode != timeout_error) { - fprintf(stderr,"Sensor: Error '%s' while handling message\n", - gras_error_name(errcode)); + if ((errcode=gras_msg_handle(60.0)) && errcode != timeout_error) { + CRITICAL1("Sensor: Error '%s' while handling message", + xbt_error_name(errcode)); } } - gras_sleep(5,0); - return gras_sock_close(g->sock); + gras_os_sleep(5,0); + gras_socket_close(g->sock); + + return 0; } /* ********************************************************************** @@ -58,7 +61,7 @@ int sensor (int argc,char *argv[]) { /* Global private data */ typedef struct { - gras_sock_t *sock; + gras_socket_t *sock; } maestro_data_t; /* Function prototypes */ @@ -66,7 +69,7 @@ int maestro (int argc,char *argv[]); double XP(const char *bw1, const char *bw2, const char *sat1, const char *sat2); double XP(const char *bw1, const char *bw2, const char *sat1, const char *sat2) { - gras_error_t errcode; + xbt_error_t errcode; int bufSize=32 * 1024; int expSize=64 * 1024; int msgSize=64 * 1024; @@ -74,7 +77,7 @@ double XP(const char *bw1, const char *bw2, const char *sat1, const char *sat2) double sec, bw, sec_sat,bw_sat; if ((errcode=grasbw_request(bw1,4000,bw2,4000,bufSize,expSize,msgSize,&sec,&bw))) { - fprintf(stderr,"MAESTRO: Error %s encountered while doing the test\n",gras_error_name(errcode)); + fprintf(stderr,"MAESTRO: Error %s encountered while doing the test\n",xbt_error_name(errcode)); return -1; } @@ -82,12 +85,12 @@ double XP(const char *bw1, const char *bw2, const char *sat1, const char *sat2) if ((errcode=grasbw_saturate_start(sat1,4000,sat2,4000,satSize,60))) { fprintf(stderr,"MAESTRO: Error %s encountered while starting saturation\n", - gras_error_name(errcode)); + xbt_error_name(errcode)); return -1; } - gras_sleep(1,0); + gras_os_sleep(1,0); if ((errcode=grasbw_request(bw1,4000,bw2,4000,bufSize,expSize,msgSize,&sec_sat,&bw_sat))) { - fprintf(stderr,"MAESTRO: Error %s encountered while doing the test\n",gras_error_name(errcode)); + fprintf(stderr,"MAESTRO: Error %s encountered while doing the test\n",xbt_error_name(errcode)); return -1; } @@ -96,7 +99,7 @@ double XP(const char *bw1, const char *bw2, const char *sat1, const char *sat2) if ((errcode=grasbw_saturate_stop(sat1,4000,sat2,4000))) { fprintf(stderr,"MAESTRO: Error %s encountered while stopping saturation\n", - gras_error_name(errcode)); + xbt_error_name(errcode)); return -1; } @@ -119,7 +122,7 @@ int maestro(int argc,char *argv[]) { int msgSize=expSize; int satSize=msgSize * 100; double dummy,beginSim; - gras_error_t errcode; + xbt_error_t errcode; maestro_data_t *g=gras_userdata_new(maestro_data_t); // const char *hosts[MAXHOSTS] = { "61", "62", "63", "69", "70", "77", "81", "83", "85", "87", "88", "95", "98", "107", "109", "111", "112", "121", "124", "125", "131", "145", "150", "156", "157", "162", "165", "168", "169", "170", "175", "177", "178" }; const char *hosts[MAXHOSTS] = { "A", "B", "C", "D" }; @@ -129,32 +132,32 @@ int maestro(int argc,char *argv[]) { int a,b,c,d,begin; - if ((errcode=gras_sock_server_open(4000,5000,&(g->sock)))) { - fprintf(stderr,"MAESTRO: Error %s encountered while opening the server socket\n",gras_error_name(errcode)); + if ((errcode=gras_socket_server(4000,&(g->sock)))) { + fprintf(stderr,"MAESTRO: Error %s encountered while opening the server socket\n",xbt_error_name(errcode)); return 1; } if (grasbw_register_messages()) { - gras_sock_close(g->sock); + gras_socket_close(g->sock); return 1; } begin=time(NULL); - beginSim=gras_time(); + beginSim=gras_os_time(); for (a=0; a %f (%f vs %f)%s\n", - gras_time(), + gras_os_time(), hosts[c],hosts[d],hosts[a],hosts[b], bw_sat[c][d]/bw[c][d],bw[c][d],bw_sat[c][d], @@ -196,15 +199,15 @@ int maestro(int argc,char *argv[]) { if ((errcode=grasbw_saturate_stop(hosts[a],4000,hosts[b],4000))) { fprintf(stderr,"MAESTRO: Error %s encountered while stopping saturation\n", - gras_error_name(errcode)); + xbt_error_name(errcode)); return -1; } fprintf(stderr,"Did an iteration on saturation pair in %ld sec (%.2f simulated sec)\n", - time(NULL)-begin, gras_time()-beginSim); + time(NULL)-begin, gras_os_time()-beginSim); } } - gras_sleep(5,0); + gras_os_sleep(5,0); exit(0); #if 0 return 0; @@ -212,16 +215,16 @@ int maestro(int argc,char *argv[]) { fprintf(stderr,"MAESTRO: Start saturation with size %d\n",msgSize); if ((errcode=grasbw_saturate_start(argv[5],atoi(argv[6]),argv[7],atoi(argv[8]),msgSize*10,60))) { fprintf(stderr,"MAESTRO: Error %s encountered while starting saturation\n", - gras_error_name(errcode)); + xbt_error_name(errcode)); return 1; } fprintf(stderr,"MAESTRO: Saturation started\n"); - gras_sleep(5,0); + gras_os_sleep(5,0); /* test with saturation */ if ((errcode=grasbw_request(argv[1],atoi(argv[2]),argv[3],atoi(argv[4]), bufSize,expSize,msgSize,&sec,&bw))) { - fprintf(stderr,"MAESTRO: Error %s encountered while doing the test\n",gras_error_name(errcode)); + fprintf(stderr,"MAESTRO: Error %s encountered while doing the test\n",xbt_error_name(errcode)); return 1; } @@ -232,14 +235,14 @@ int maestro(int argc,char *argv[]) { /* stop saturation */ if ((errcode=grasbw_saturate_stop(argv[5],atoi(argv[6]),argv[7],atoi(argv[8])))) { fprintf(stderr,"MAESTRO: Error %s encountered while stopping saturation\n", - gras_error_name(errcode)); + xbt_error_name(errcode)); return 1; } /* test without saturation */ if ((errcode=grasbw_request(argv[1],atoi(argv[2]),argv[3],atoi(argv[4]), bufSize,expSize,msgSize,&sec,&bw))) { - fprintf(stderr,"MAESTRO: Error %s encountered while doing the test\n",gras_error_name(errcode)); + fprintf(stderr,"MAESTRO: Error %s encountered while doing the test\n",xbt_error_name(errcode)); return 1; } @@ -247,7 +250,9 @@ int maestro(int argc,char *argv[]) { expSize/1024,msgSize/1024, sec,bw); - gras_sleep(5,0); + gras_os_sleep(5,0); #endif - return gras_sock_close(g->sock); + gras_socket_close(g->sock); + + return 0; }