Commit 16b7bf55 authored by Jonathon Duerig's avatar Jonathon Duerig

Upgraded monitor to deal with udp, udp pseudo-connections, version 3 libnetmon...

Upgraded monitor to deal with udp, udp pseudo-connections, version 3 libnetmon format, version 1 magent format, fixed timing issue, generalized the difference between sockets and connections, and others.
parent 5da05762
......@@ -39,7 +39,7 @@ const unsigned int MAX_SOCKS = 256;
/*
* Output version clients should use
*/
unsigned int output_version = 2;
unsigned int output_version = 3;
/*
* Limit the maximum socket size
......@@ -217,7 +217,7 @@ int main(int argc, char **argv) {
unlink(SOCKPATH);
servaddr.sun_family = AF_LOCAL;
strcpy(servaddr.sun_path, SOCKPATH);
if (bind(sockfd, (struct sockaddr*) &servaddr, sizeof(servaddr))) {
perror("Failed to bind() socket\n");
return 1;
......@@ -241,7 +241,7 @@ int main(int argc, char **argv) {
unlink(CONTROLSOCK);
cservaddr.sun_family = AF_LOCAL;
strcpy(cservaddr.sun_path, CONTROLSOCK);
if (bind(controlsockfd, (struct sockaddr*) &cservaddr, sizeof(cservaddr))) {
perror("Failed to bind() control socket\n");
return 1;
......@@ -269,14 +269,14 @@ int main(int argc, char **argv) {
while (1) {
/*
* Make a blocking call to select() to wait for a client to connect or
* Make a blocking call to select() to wait for a client to connect or
* send us data
*/
/* fprintf(stderr,"Waiting for clients\n"); */
bcopy(&real_fdset,&returned_fdset,sizeof(fd_set));
if (select(max_clientfd + 1,&returned_fdset,NULL,NULL,NULL) <= 0) {
/*
/*
* Just repeat in case of failure
*/
continue;
......
This diff is collapsed.
......@@ -68,5 +68,4 @@ fi
#echo "Starting up monitor for $PROJECT/$EXPERIMENT $PELAB_IP $SIP";
echo "Starting up monitor with options --mapping=$IPMAP --experiment=$PROJECT/$EXPERIMENT --ip=$PELAB_IP $INITARG $ARGS";
exec $NETMON_DIR/$NETMOND -v 2 -f 262144 | tee $LOGDIR/libnetmon.out | $PYTHON $MONITOR_DIR/$MONITOR --mapping=$IPMAP --experiment=$PROJECT/$EXPERIMENT --ip=$PELAB_IP $INITARG $ARGS
#exec $NETMON_DIR/$NETMOND -v 2 | $PYTHON $MONITOR_DIR/$MONITOR ip-mapping.txt $PROJECT/$EXPERIMENT $PELAB_IP $SIP
exec $NETMON_DIR/$NETMOND -v 3 -u -f 262144 | tee $LOGDIR/libnetmon.out | $PYTHON $MONITOR_DIR/$MONITOR --mapping=$IPMAP --experiment=$PROJECT/$EXPERIMENT --ip=$PELAB_IP $INITARG $ARGS
......@@ -16,9 +16,9 @@ no way to correlate individual streams on one elab with those on
PlanetLab with streams of the other without more information.";
$stubPort = 3249;
$usePeriod = 1;
$averageCount = 50;
$averagePeriod = 0.3;
$usePeriod = 0;
$averageCount = 100;
$averagePeriod = 1.0;
sub offeredLoad
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment