-DISTCLEANFILES=Makefile.in
-INCLUDES= -I$(top_srcdir)/src/include
+INCLUDES= -I$(top_srcdir)/include
AM_CFLAGS=-g
+TESTS=test_rl test_sg
+EXTRA_DIST=bandwidth_deployment.txt $(TESTS)
-check_PROGRAMS=bandwidth_simulator bandwidth_maestro bandwidth_sensor
+if HAVE_SG
+ check_PROGRAMS=bandwidth_maestro bandwidth_sensor bandwidth_simulator
+
+ bandwidth_simulator_SOURCES= _bandwidth_simulator.c bandwidth.c
+ bandwidth_simulator_LDADD= $(top_builddir)/src/libgrassg.la $(top_builddir)/src/amok/libamok.la @LIBS_SimGrid@
+else
+ check_PROGRAMS=bandwidth_maestro bandwidth_sensor
+endif
-bandwidth_simulator_SOURCES= _bandwidth_simulator.c bandwidth.c
bandwidth_maestro_SOURCES= _bandwidth_maestro.c bandwidth.c
bandwidth_sensor_SOURCES= _bandwidth_sensor.c bandwidth.c
-
-bandwidth_simulator_LDADD= $(top_srcdir)/src/base/libgrassg.a $(top_srcdir)/src/modules/libgrasmodules.a @LIBS_SimGrid@
-bandwidth_maestro_LDADD= $(top_srcdir)/src/base/libgrasrl.a $(top_srcdir)/src/modules/libgrasmodules.a
-bandwidth_sensor_LDADD= $(top_srcdir)/src/base/libgrasrl.a $(top_srcdir)/src/modules/libgrasmodules.a
+bandwidth_maestro_LDADD= $(top_builddir)/src/libgrasrl.la $(top_builddir)/src/amok/libamok.la
+bandwidth_sensor_LDADD= $(top_builddir)/src/libgrasrl.la $(top_builddir)/src/amok/libamok.la
# cleanup temps
-CLEANFILES=_bandwidth_simulator.c _bandwidth_maestro.c _bandwidth_sensor.c
+MAINTAINERCLEANFILES=_bandwidth_simulator.c _bandwidth_maestro.c _bandwidth_sensor.c
# generate temps
_bandwidth_maestro.c _bandwidth_sensor.c _bandwidth_simulator.c: bandwidth_deployment.txt
- $(top_srcdir)/src/examples/gras_stub_generator bandwidth bandwidth_deployment.txt >/dev/null
+ $(top_srcdir)/examples/gras_stub_generator bandwidth bandwidth_deployment.txt >/dev/null
/* bandwidth - bandwidth test demo of GRAS features */
/* Authors: Martin Quinson */
-/* Copyright (C) 2003 the OURAGAN project. */
+/* Copyright (C) 2003,2004 da GRAS posse. */
/* 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 <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
+#include "gras.h"
+#include "amok/bandwidth.h"
-#include <gras.h>
+GRAS_LOG_NEW_DEFAULT_CATEGORY(Bandwidth,"Messages specific to this example");
/* **********************************************************************
* Sensor code
/* Global private data */
typedef struct {
- gras_sock_t *sock;
-} sensor_data_t;
+ gras_socket_t sock;
+} s_sensor_data_t,*sensor_data_t;
/* Function prototypes */
int sensor (int argc,char *argv[]);
int sensor (int argc,char *argv[]) {
gras_error_t errcode;
- sensor_data_t *g=gras_userdata_new(sensor_data_t);
+ sensor_data_t g;
- 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));
- return 1;
- }
+ gras_init(&argc,argv);
+ g=gras_userdata_new(s_sensor_data_t);
- if (grasbw_register_messages()) {
- gras_sock_close(g->sock);
+ amok_bw_init();
+
+ if ((errcode=gras_socket_server(atoi(argv[1]),&(g->sock)))) {
+ ERROR1("Sensor: Error %s encountered while opening the server socket",gras_error_name(errcode));
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));
- gras_sock_close(g->sock);
- return errcode;
- }
- if (errcode==no_error)
- break;
+ errcode=gras_msg_handle(60.0);
+ if (errcode != no_error) {
+ ERROR1("Sensor: Error '%s' while handling message",gras_error_name(errcode));
+ gras_socket_close(g->sock);
+ return errcode;
}
- gras_sleep(5,0);
- return gras_sock_close(g->sock);
+ gras_socket_close(g->sock);
+ return 0;
}
/* **********************************************************************
/* Global private data */
typedef struct {
- gras_sock_t *sock;
-} maestro_data_t;
+ gras_socket_t sock;
+} s_maestro_data_t,*maestro_data_t;
/* Function prototypes */
int maestro (int argc,char *argv[]);
int maestro(int argc,char *argv[]) {
gras_error_t errcode;
- maestro_data_t *g=gras_userdata_new(maestro_data_t);
+ maestro_data_t g;
double sec, bw;
- int bufSize=32 * 1024;
- int expSize=64 * 1024;
- int msgSize=64 * 1024;
-
- 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));
+ int buf_size=32;
+ int exp_size=64;
+ int msg_size=64;
+ gras_socket_t peer;
+
+ gras_init(&argc,argv);
+ g=gras_userdata_new(s_maestro_data_t);
+ amok_bw_init();
+ gras_os_sleep(1,0);
+
+ if ((errcode=gras_socket_server(6000,&(g->sock)))) {
+ ERROR1("Maestro: Error %s encountered while opening the server socket",gras_error_name(errcode));
return 1;
}
-
- if (grasbw_register_messages()) {
- gras_sock_close(g->sock);
- return 1;
+
+
+ if (argc != 5) {
+ ERROR0("Usage: maestro host port host port\n");
+ return 1;
}
- if (argc != 5) {
- fprintf(stderr,"Usage: maestro host port host port\n");
+ if ((errcode=gras_socket_client(argv[1],atoi(argv[2]),&peer))) {
+ ERROR3("Client: Unable to connect to my peer on %s:%s. Got %s",
+ argv[1],argv[2],gras_error_name(errcode));
return 1;
}
-
- 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));
+
+/* if ((errcode=amok_bw_request(argv[1],atoi(argv[2]),argv[3],atoi(argv[4]),
+ buf_size,exp_size,msg_size,&sec,&bw))) {*/
+
+ if ((errcode=amok_bw_test(peer,buf_size,exp_size,msg_size,&sec,&bw))) {
+ ERROR1("maestro: Error %s encountered while doing the test",gras_error_name(errcode));
return 1;
}
- fprintf(stderr,"maestro: Experience (%d ko in msgs of %d ko) took %f sec, achieving %f Mb/s\n",
- expSize/1024,msgSize/1024,
- sec,bw);
+ INFO6("maestro: Experience between me and %s:%d (%d ko in msgs of %d ko) took %f sec, achieving %f Mb/s",
+ argv[1],atoi(argv[2]),
+ exp_size,msg_size,
+ sec,bw);
- gras_sleep(5,0);
- return gras_sock_close(g->sock);
+ gras_socket_close(g->sock);
+ return 0;
}
