[Spread-cvs] cvs commit: spread/daemon Makefile.in r.c s.c Readme.txt
jonathan at spread.org
jonathan at spread.org
Fri Mar 28 11:24:49 EST 2003
jonathan 03/03/28 11:24:49
Modified: daemon Makefile.in r.c s.c Readme.txt
Log:
Create make targets for the old r and s testing programs.
Change their built name to spsend and sprecv to avoid conflicts.
Remove compile warnings from r.c and s.c.
Revision Changes Path
1.6 +8 -0 spread/daemon/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /storage/cvsroot/spread/daemon/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.in 1 Oct 2002 21:02:14 -0000 1.5
+++ Makefile.in 28 Mar 2003 16:24:48 -0000 1.6
@@ -168,6 +168,14 @@
spsimple_user$(EXEEXT): simple_user.o libspread.a
$(LD) -o $@ simple_user.o $(LDFLAGS) libspread.a $(LIBS)
+testprog: spsend$(EXEEXT) sprecv$(EXEEXT)
+
+spsend$(EXEEXT): s.o alarm.o data_link.o events.o memory.o
+ $(LD) -o $@ s.o alarm.o data_link.o events.o memory.o $(LDFLAGS) $(LIBS)
+
+sprecv$(EXEEXT): r.o alarm.o data_link.o
+ $(LD) -o $@ r.o alarm.o data_link.o $(LDFLAGS) $(LIBS)
+
$(MANPAGES): $(MANPAGES_IN)
@if [ ! -d docs ]; then \
$(buildtoolsdir)/mkinstalldirs docs; \
1.5 +7 -3 spread/daemon/r.c
Index: r.c
===================================================================
RCS file: /storage/cvsroot/spread/daemon/r.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- r.c 22 Sep 2002 02:56:52 -0000 1.4
+++ r.c 28 Mar 2003 16:24:48 -0000 1.5
@@ -33,6 +33,9 @@
#include "arch.h"
+
+#include <string.h>
+
#include "alarm.h"
#include "data_link.h"
@@ -52,10 +55,10 @@
static void Usage( int argc, char *argv[] );
-main( int argc, char *argv[] )
+int main( int argc, char *argv[] )
{
channel chan;
- scatter scat;
+ sys_scatter scat;
char buf[100000];
int ret,i;
int *type;
@@ -143,6 +146,7 @@
corrupt = 0;
}
}
+ exit(0);
}
static void Usage(int argc, char *argv[])
@@ -163,7 +167,7 @@
Detailed_report = 1;
argc--;
}else if( !strncmp( *argv, "-p", 2 ) ){
- sscanf(argv[1], "%d", &Port );
+ sscanf(argv[1], "%hd", &Port );
argc--; argv++;
}else if( !strncmp( *argv, "-a", 2 ) ){
sscanf(argv[1], "%s", IP );
1.3 +10 -6 spread/daemon/s.c
Index: s.c
===================================================================
RCS file: /storage/cvsroot/spread/daemon/s.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- s.c 22 Sep 2002 02:56:52 -0000 1.2
+++ s.c 28 Mar 2003 16:24:48 -0000 1.3
@@ -33,6 +33,9 @@
#include "arch.h"
+
+#include <string.h>
+
#include "alarm.h"
#include "sp_events.h"
#include "data_link.h"
@@ -54,11 +57,11 @@
static void Usage( int argc, char *argv[] );
-main( int argc, char *argv[] )
+int main( int argc, char *argv[] )
{
channel chan;
- scatter scat;
+ sys_scatter scat;
char buf[100000];
int ret,i,i1,i2,i3,i4;
int address;
@@ -89,7 +92,7 @@
sscanf( IP ,"%d.%d.%d.%d",&i1, &i2, &i3, &i4);
address = ( (i1 << 24 ) | (i2 << 16) | (i3 << 8) | i4 );
- printf("Checking (%d.%d.%d.%d, %d). Each burst has %d packets, %d bytes each with %d msec delay in between, for a total of %d packets\n",i1,i2,i3,i4, Port, Burst, Num_bytes, Delay.usec/1000+Delay.sec*1000, Num_packets );
+ printf("Checking (%d.%d.%d.%d, %d). Each burst has %d packets, %d bytes each with %ld msec delay in between, for a total of %d packets\n",i1,i2,i3,i4, Port, Burst, Num_bytes, Delay.usec/1000+Delay.sec*1000, Num_packets );
type = (int32 *)buf;
count = (int32 *)&buf[4];
@@ -116,8 +119,9 @@
*type = Set_endian( 1 );
E_delay( Delay );
ret = DL_send( chan, address, Port, &scat );
- printf("total time is (%d,%d), with %d problems \n",total_time.sec, total_time.usec, total_problems );
+ printf("total time is (%ld,%ld), with %d problems \n",total_time.sec, total_time.usec, total_problems );
+ exit(0);
}
static void Usage(int argc, char *argv[])
@@ -137,7 +141,7 @@
if( !strncmp( *argv, "-t", 2 ) )
{
- sscanf(argv[1], "%d", &Delay.usec );
+ sscanf(argv[1], "%ld", &Delay.usec );
Delay.usec = Delay.usec*1000;
Delay.sec = 0;
if( Delay.usec > 1000000 )
@@ -147,7 +151,7 @@
}
argc--; argv++;
}else if( !strncmp( *argv, "-p", 2 ) ){
- sscanf(argv[1], "%d", &Port );
+ sscanf(argv[1], "%hd", &Port );
argc--; argv++;
}else if( !strncmp( *argv, "-b", 2 ) ){
sscanf(argv[1], "%d", &Burst );
1.28 +15 -1 spread/daemon/Readme.txt
Index: Readme.txt
===================================================================
RCS file: /storage/cvsroot/spread/daemon/Readme.txt,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Readme.txt 27 Sep 2002 22:39:29 -0000 1.27
+++ Readme.txt 28 Mar 2003 16:24:48 -0000 1.28
@@ -46,8 +46,22 @@
| WWW : http://www.spread.org and http://www.cnds.jhu.edu |
| Contact: spread at spread.org |
| |
-| Version 3.17.0 Built 25/September/2002 |
+| Version 3.17.1 Built XX/November/2002 |
\===========================================================================/
+
+November XX, 2002 Ver 3.17.1
+----------------------------
+Bugfixes:
+*) Fix memory corruption and crash with groups of large size.
+*) Correct make install so it installs header files.
+*) Fix syntax error in build.xml file for Java/Ant.
+*) Cleanup prototypes to remove compiler warnings.
+*) Fix parser to correctly recognize upper, lower, and mixed case command options.
+*) During make install, remove old symlinks.
+*) Change setgroups call to be more portable. (fixes MacOSX)
+*) Change name of r and s to sprecv and spsend, and add as make targets.
+ They can be built by "make testprog" (not built by default).
+*) Work on making long group names possible.
September 25, 2002 Ver 3.17.0
----------------------
More information about the Spread-cvs
mailing list