*** ../netlib/pvm3.2.0/conf/CRAY.def	Wed Jun 16 16:58:16 1993
--- conf/CRAY.def	Thu Sep 16 17:49:14 1993
***************
*** 1,4 ****
! ARCHCFLAGS	=	-DSYSVSIGNAL -DRSHCOMMAND=\"/usr/ucb/remsh\"
  ARCHDLIB	=
  ARCHDOBJ	=
  ARCHLIB	=
--- 1,4 ----
! ARCHCFLAGS	=	-DSYSVSIGNAL -DNOWAIT3 -DRSHCOMMAND=\"/usr/ucb/remsh\"
  ARCHDLIB	=
  ARCHDOBJ	=
  ARCHLIB	=
*** ../netlib/pvm3.2.0/conf/CRAY2.def	Tue Jul 13 11:48:37 1993
--- conf/CRAY2.def	Thu Sep 16 17:49:18 1993
***************
*** 1,4 ****
! ARCHCFLAGS	=	-DSYSVSIGNAL -DRSHCOMMAND=\"/usr/ucb/remsh\"
  ARCHDLIB	=
  ARCHDOBJ	=
  ARCHLIB	=
--- 1,4 ----
! ARCHCFLAGS	=	-DSYSVSIGNAL -DNOWAIT3 -DRSHCOMMAND=\"/usr/ucb/remsh\"
  ARCHDLIB	=
  ARCHDOBJ	=
  ARCHLIB	=
*** ../netlib/pvm3.2.0/conf/DGAV.def	Wed Jun 16 16:58:34 1993
--- conf/DGAV.def	Wed Sep 22 13:35:15 1993
***************
*** 1,4 ****
! ARCHCFLAGS	=	-DNOSTRCASE -DSYSVSIGNAL -DSYSVSTR -DRSHCOMMAND=\"/usr/ucb/remsh\"
  ARCHDLIB	=
  ARCHDOBJ	=
  ARCHLIB	=
--- 1,4 ----
! ARCHCFLAGS	=	-DNOSTRCASE -DSYSVSIGNAL -DNOWAIT3 -DSYSVSTR -DRSHCOMMAND=\"/usr/ucb/remsh\"
  ARCHDLIB	=
  ARCHDOBJ	=
  ARCHLIB	=
*** ../netlib/pvm3.2.0/conf/I860.def	Thu Jul  8 14:08:23 1993
--- conf/I860.def	Wed Sep 22 14:13:44 1993
***************
*** 1,6 ****
  # Intel iPSC/860 with 386(SRM) frontend
  # 
! ARCHCFLAGS	=	-DSYSVSIGNAL -DSYSVSTR -DRSHCOMMAND=\"/usr/ucb/rcmd\"
  ARCHDLIB	=	-lrpc -lsocket -host
  ARCHDOBJ	=
  ARCHLIB		=	-lrpc -lsocket
--- 1,6 ----
  # Intel iPSC/860 with 386(SRM) frontend
  # 
! ARCHCFLAGS	=	-DSYSVSIGNAL -DNOWAIT3 -DNOWAITPID -DSYSVSTR -DRSHCOMMAND=\"/usr/ucb/rcmd\"
  ARCHDLIB	=	-lrpc -lsocket -host
  ARCHDOBJ	=
  ARCHLIB		=	-lrpc -lsocket
*** ../netlib/pvm3.2.0/conf/I860I860.def	Thu Jul  8 14:08:23 1993
--- conf/I860I860.def	Wed Sep 22 14:13:48 1993
***************
*** 1,6 ****
  # Intel iPSC/860 with 386(SRM) frontend
  # 
! ARCHCFLAGS	=	-DSYSVSIGNAL -DSYSVSTR -DRSHCOMMAND=\"/usr/ucb/rcmd\"
  ARCHDLIB	=	-lrpc -lsocket -host
  ARCHDOBJ	=
  ARCHLIB		=	-lrpc -lsocket
--- 1,6 ----
  # Intel iPSC/860 with 386(SRM) frontend
  # 
! ARCHCFLAGS	=	-DSYSVSIGNAL -DNOWAIT3 -DNOWAITPID -DSYSVSTR -DRSHCOMMAND=\"/usr/ucb/rcmd\"
  ARCHDLIB	=	-lrpc -lsocket -host
  ARCHDOBJ	=
  ARCHLIB		=	-lrpc -lsocket
*** ../netlib/pvm3.2.0/conf/I860SGI.def	Thu Jul  8 14:08:23 1993
--- conf/I860SGI.def	Wed Sep 22 14:14:09 1993
***************
*** 1,6 ****
  # Intel iPSC/860 with SGI frontend
  #
! ARCHCFLAGS	=	-DSYSVSIGNAL -DRSHCOMMAND=\"/usr/bsd/rsh\"
  ARCHDLIB	=	-lsun -lhost
  ARCHDOBJ	=
  ARCHLIB		=	-lsun
--- 1,6 ----
  # Intel iPSC/860 with SGI frontend
  #
! ARCHCFLAGS	=	-DSYSVSIGNAL -DNOWAIT3 -DRSHCOMMAND=\"/usr/bsd/rsh\"
  ARCHDLIB	=	-lsun -lhost
  ARCHDOBJ	=
  ARCHLIB		=	-lsun
*** ../netlib/pvm3.2.0/conf/IPSC2.def	Wed Jun 16 16:58:57 1993
--- conf/IPSC2.def	Wed Sep 22 14:14:03 1993
***************
*** 1,4 ****
! ARCHCFLAGS	=	-DSYSVSIGNAL -DSYSVSTR -DRSHCOMMAND=\"/usr/ucb/rcmd\"
  ARCHDLIB	=	-lsocket
  ARCHDOBJ	=
  ARCHLIB	=	-lsocket
--- 1,4 ----
! ARCHCFLAGS	=	-DSYSVSIGNAL -DNOWAIT3 -DNOWAITPID -DSYSVSTR -DRSHCOMMAND=\"/usr/ucb/rcmd\"
  ARCHDLIB	=	-lsocket
  ARCHDOBJ	=
  ARCHLIB	=	-lsocket
*** ../netlib/pvm3.2.0/conf/KSR1.def	Wed Jun 16 16:58:51 1993
--- conf/KSR1.def	Thu Sep 16 17:49:41 1993
***************
*** 1,4 ****
! ARCHCFLAGS	=
  ARCHDLIB	=
  ARCHDOBJ	=
  ARCHLIB	=
--- 1,4 ----
! ARCHCFLAGS	=	-DNOWAIT3
  ARCHDLIB	=
  ARCHDOBJ	=
  ARCHLIB	=
*** ../netlib/pvm3.2.0/conf/LINUX.def	Wed Aug 25 23:09:47 1993
--- conf/LINUX.def	Thu Sep 16 17:49:23 1993
***************
*** 1,6 ****
! ARCHCFLAGS	=	-DNOSOCKOPT -DSYSVSIGNAL
  ARCHDLIB	=
  ARCHDOBJ	=
  ARCHLIB	=
  HASRANLIB	=	t
! PVM_ARCH	=	SUN4
--- 1,6 ----
! ARCHCFLAGS	=	-DNOSOCKOPT -DSYSVSIGNAL -DNOWAIT3
  ARCHDLIB	=
  ARCHDOBJ	=
  ARCHLIB	=
  HASRANLIB	=	t
! PVM_ARCH	=	LINUX
*** /dev/null	Wed Sep 22 16:06:49 1993
--- conf/MASPAR.def	Fri Sep 17 13:00:14 1993
***************
*** 0 ****
--- 1,6 ----
+ ARCHCFLAGS	=
+ ARCHDLIB	=
+ ARCHDOBJ	=
+ ARCHLIB	=
+ HASRANLIB	=	t
+ PVM_ARCH	=	MASPAR
*** ../netlib/pvm3.2.0/conf/PGON.def	Thu Jul  8 14:08:23 1993
--- conf/PGON.def	Thu Sep 16 17:49:38 1993
***************
*** 1,7 ****
! ARCHCFLAGS	=
  ARCHDLIB	=	-lnx
  ARCHDOBJ	=
! ARCHLIB		=	-lrpc
  HASRANLIB	=	f
  PVM_ARCH	=	PGON
  AR_FRONT	=	ar860
--- 1,7 ----
! ARCHCFLAGS	=	-DNOWAIT3
  ARCHDLIB	=	-lnx
  ARCHDOBJ	=
! ARCHLIB		=	-lrpc -lnx
  HASRANLIB	=	f
  PVM_ARCH	=	PGON
  AR_FRONT	=	ar860
*** ../netlib/pvm3.2.0/conf/SUN4SOL2.def	Tue Jul 13 14:45:14 1993
--- conf/SUN4SOL2.def	Fri Sep 17 11:34:47 1993
***************
*** 1,6 ****
! ARCHCFLAGS	=	-DSYSVBFUNC
! ARCHDLIB	=
  ARCHDOBJ	=
  ARCHLIB	=	-lnsl -lsocket
! HASRANLIB	=	t
  PVM_ARCH	=	SUN4SOL2
--- 1,6 ----
! ARCHCFLAGS	=	-DSYSVBFUNC -DSYSVSTR -DNOGETDTBLSIZ -DSYSVSIGNAL -DNOWAIT3
! ARCHDLIB	=	-lnsl -lsocket
  ARCHDOBJ	=
  ARCHLIB	=	-lnsl -lsocket
! HASRANLIB	=	f
  PVM_ARCH	=	SUN4SOL2
*** ../netlib/pvm3.2.0/conf/TITN.def	Wed Jun 16 16:59:11 1993
--- conf/TITN.def	Thu Sep 16 17:51:45 1993
***************
*** 1,4 ****
! ARCHCFLAGS	=	-DNOGETDTBLSIZ -DSYSVSIGNAL -DSYSVSTR -DNOREXEC -DNOSOCKOPT
  ARCHDLIB	=
  ARCHDOBJ	=
  ARCHLIB	=
--- 1,4 ----
! ARCHCFLAGS	=	-DNOGETDTBLSIZ -DSYSVSIGNAL -DNOWAIT3 -DSYSVSTR -DNOREXEC -DNOSOCKOPT
  ARCHDLIB	=
  ARCHDOBJ	=
  ARCHLIB	=
*** ../netlib/pvm3.2.0/console/Makefile.aimk	Mon Aug 30 19:30:40 1993
--- console/Makefile.aimk	Wed Sep 22 14:02:45 1993
***************
*** 7,13 ****
  #  ARCHLIB    = special libs needed for daemon
  #
  SHELL	=	/bin/sh
- CC	=	cc
  SDIR	=	..
  PVMIDIR	=	../../include
  PVMLDIR	=	../../lib/$(PVM_ARCH)
--- 7,12 ----
*** ../netlib/pvm3.2.0/console/cons.c	Mon Aug 30 19:30:41 1993
--- console/cons.c	Thu Sep 16 17:34:14 1993
***************
*** 33,38 ****
--- 33,42 ----
   *	machine and other tasks.
   *
  $Log: cons.c,v $
+  * Revision 1.2  1993/09/16  21:33:40  manchek
+  * moved notify(HostAdd) to before we read script file.
+  * added include for linux/time.h
+  *
   * Revision 1.1  1993/08/30  23:30:32  manchek
   * Initial revision
   *
***************
*** 40,45 ****
--- 44,52 ----
  
  #include <stdio.h>
  #include <sys/types.h>
+ #ifdef IMA_LINUX
+ #include <linux/time.h>
+ #endif
  #ifdef IMA_RS6K
  #include <sys/select.h>
  #endif
***************
*** 69,75 ****
  struct hostinfo *hostlist = 0;
  struct alias *aliases = 0;
  
! static char rcsid[] = "$Id: cons.c,v 1.1 1993/08/30 23:30:32 manchek Exp $";
  
  
  main(argc, argv)
--- 76,82 ----
  struct hostinfo *hostlist = 0;
  struct alias *aliases = 0;
  
! static char rcsid[] = "$Id: cons.c,v 1.2 1993/09/16 21:33:40 manchek Exp $";
  
  
  main(argc, argv)
***************
*** 119,124 ****
--- 126,133 ----
  /*
  	ttpcb_dumpall();
  */
+ 	pvm_notify(PvmHostAdd, 99, 0, (int*)0);
+ 
  	if (!(p = getenv("HOME")))
  		p = ".";
  	sprintf(cmd, "%s/.pvmrc", p);
***************
*** 137,144 ****
  		FD_SET(np[0], &rfds);
  		nfds = np[0] + 1;
  	}
- 
- 	pvm_notify(PvmHostAdd, 99, 0, (int*)0);
  
  	printf(prompt);
  	fflush(stdout);
--- 146,151 ----
*** ../netlib/pvm3.2.0/examples/CM5/Makefile	Wed Jul  7 22:39:10 1993
--- examples/CM5/Makefile	Wed Sep 22 14:06:37 1993
***************
*** 21,27 ****
  BDIR	=	$(PVMDIR)/bin
  XDIR	=	$(BDIR)/$(PVM_ARCH)
  
- CC	=	cc
  CFLAGS	=	-O -I../../include 
  LIBS	=	$(PVMLIB) $(ARCHLIB)
  NODELIBS	=	$(PVMPELIB) $(ARCHLIB)
--- 21,26 ----
*** ../netlib/pvm3.2.0/examples/I860/Makefile	Mon Jul  5 21:52:59 1993
--- examples/I860/Makefile	Wed Sep 22 14:06:32 1993
***************
*** 20,26 ****
  BDIR	=	$(PVMDIR)/bin
  XDIR	=	$(BDIR)/$(PVM_ARCH)
  
- CC		=	cc
  CFLAGS	=	-O -I../../include
  LIBS	=	$(PVMLIB) $(ARCHLIB)
  
--- 20,25 ----
*** ../netlib/pvm3.2.0/examples/Makefile.aimk	Thu Aug  5 12:56:03 1993
--- examples/Makefile.aimk	Wed Sep 22 14:06:35 1993
***************
*** 19,25 ****
  BDIR	=	$(PVMDIR)/bin
  XDIR	=	$(BDIR)/$(PVM_ARCH)
  
- CC	=	cc
  CFLAGS	=	-g -I../../include
  LIBS	=	$(PVMLIB) $(ARCHLIB)
  
--- 19,24 ----
*** ../netlib/pvm3.2.0/examples/PGON/Makefile	Mon Jul  5 21:53:16 1993
--- examples/PGON/Makefile	Wed Sep 15 11:09:13 1993
***************
*** 10,16 ****
  # ARCH and ARCHLIB are set for you if you use 'aimk'.
  #
  # PVM_ARCH	=	PGON
! ARCHLIB	=	-lrpc
  # END of custom section - leave this line here
  #
  PVMDIR	=	../..
--- 10,16 ----
  # ARCH and ARCHLIB are set for you if you use 'aimk'.
  #
  # PVM_ARCH	=	PGON
! ARCHLIB	=	-lrpc -lnx
  # END of custom section - leave this line here
  #
  PVMDIR	=	../..
*** ../netlib/pvm3.2.0/examples/testall.f	Wed Aug 11 09:26:35 1993
--- examples/testall.f	Wed Sep 15 11:14:05 1993
***************
*** 19,25 ****
        integer i, mbuf, oldbuf, err, stid, msgtag, bytes, ntask 
        integer nhost, narch, mstat, pstat, nobuf, j
        integer tids(10), sbuf(3), rbuf(2)
!       integer htids(10), mtus(10), speeds(10)
        integer iwhich, ttids(10), ptids(10), flag(10)
        integer*2   i2data(100)
        integer*4   i4data(100)
--- 19,25 ----
        integer i, mbuf, oldbuf, err, stid, msgtag, bytes, ntask 
        integer nhost, narch, mstat, pstat, nobuf, j
        integer tids(10), sbuf(3), rbuf(2)
!       integer htids(10), speeds(10)
        integer iwhich, ttids(10), ptids(10), flag(10)
        integer*2   i2data(100)
        integer*4   i4data(100)
***************
*** 167,173 ****
           print *,' '
           print *,'Testing Information routines'
           CALL PVMFCONFIG( nhost, narch, htids(1), hosts(1), archs(1), 
!      >                    mtus(1), speeds(1), info )
           if( info .lt. 0 ) then
              print *,'Error in pvmfconfig info=',info
           else
--- 167,173 ----
           print *,' '
           print *,'Testing Information routines'
           CALL PVMFCONFIG( nhost, narch, htids(1), hosts(1), archs(1), 
!      >                    speeds(1), info )
           if( info .lt. 0 ) then
              print *,'Error in pvmfconfig info=',info
           else
***************
*** 179,190 ****
       >              '-----------------------------------------'
              i = 1
              print *,i, hosts(i), archs(i), htids(i),
!      >              mtus(i), speeds(i)
              do 123 i=2, nhost
                 CALL PVMFCONFIG( nhost, narch, htids(i), hosts(i),
!      >                    archs(i), mtus(i), speeds(i), info )
                 print *,i, hosts(i), archs(i), htids(i),
!      >                 mtus(i), speeds(i)
    123       continue
              print *,'        -------------------------',
       >              '-----------------------------------------'
--- 179,190 ----
       >              '-----------------------------------------'
              i = 1
              print *,i, hosts(i), archs(i), htids(i),
!      >              speeds(i)
              do 123 i=2, nhost
                 CALL PVMFCONFIG( nhost, narch, htids(i), hosts(i),
!      >                    archs(i), speeds(i), info )
                 print *,i, hosts(i), archs(i), htids(i),
!      >                 speeds(i)
    123       continue
              print *,'        -------------------------',
       >              '-----------------------------------------'
*** ../netlib/pvm3.2.0/lib/pvmgetarch	Thu Aug 26 17:11:04 1993
--- lib/pvmgetarch	Wed Sep 15 11:11:52 1993
***************
*** 92,103 ****
  		i386 ) ARCH=BSD386 ;;
  		esac
  	fi
  fi
  
  if [ "$ARCH" = SUN4 ]; then
  	rel="`/bin/uname -r`"
  	case "$rel" in
! 	5.2 )   ARCH=SUN4SOL2 ;;
  	esac
  fi
  if [ "$ARCH" = SUN4 -a -f /dev/cm ]; then ARCH=CM2; fi
--- 92,111 ----
  		i386 ) ARCH=BSD386 ;;
  		esac
  	fi
+ 
+ 	if [ -f /usr/bin/uname ]; then
+ 		os="`/usr/bin/uname -s`"
+ 		ht="`/usr/bin/uname -m`"
+ 		case "$os,$ht" in
+ 		Linux,i[34]86 ) ARCH=LINUX ;;
+ 		esac
+ 	fi
  fi
  
  if [ "$ARCH" = SUN4 ]; then
  	rel="`/bin/uname -r`"
  	case "$rel" in
! 	5.* )   ARCH=SUN4SOL2 ;;
  	esac
  fi
  if [ "$ARCH" = SUN4 -a -f /dev/cm ]; then ARCH=CM2; fi
*** ../netlib/pvm3.2.0/libfpvm/HPPA/Makefile	Thu Aug 26 10:39:25 1993
--- libfpvm/HPPA/Makefile	Wed Sep 22 14:05:02 1993
***************
*** 11,17 ****
  
  SHELL	=	/bin/sh
  SDIR =  ..
- CC   =  cc
  CFLAGS = -g -D$(PVM_ARCH) -c $(ARCHCFLAGS) -I$(SDIR) -I$(SDIR)/../include $(CDEBUGFLAGS)
  RM = rm -f
  M4 = m4 -DUSCORYES
--- 11,16 ----
*** ../netlib/pvm3.2.0/libfpvm/Makefile.aimk	Thu Aug 26 10:28:05 1993
--- libfpvm/Makefile.aimk	Wed Sep 22 14:04:44 1993
***************
*** 4,10 ****
  
  SHELL	=	/bin/sh
  SDIR =  ..
- CC   =  cc
  CFLAGS = -g -D$(PVM_ARCH) -c $(ARCHCFLAGS) -I$(SDIR) -I$(SDIR)/../include $(CDEBUGFLAGS)
  RM = rm -f
  M4 = m4
--- 4,9 ----
*** ../netlib/pvm3.2.0/man/man3/pack.3	Tue Aug 31 16:04:00 1993
--- man/man3/pack.3	Wed Sep 22 14:55:52 1993
***************
*** 148,154 ****
      modifiers : null | modifiers mchar
  .br
      mchar : 'h' | 'l' | 'u'
! .br
  Formats:
  .nf
    +  means initsend - must match an int (how) in the param list.
--- 148,154 ----
      modifiers : null | modifiers mchar
  .br
      mchar : 'h' | 'l' | 'u'
! 
  Formats:
  .nf
    +  means initsend - must match an int (how) in the param list.
*** ../netlib/pvm3.2.0/man/man3/unpack.3	Tue Aug 31 16:04:01 1993
--- man/man3/unpack.3	Wed Sep 22 14:56:09 1993
***************
*** 149,155 ****
      modifiers : null | modifiers mchar
  .br
      mchar : 'h' | 'l' | 'u'
! .br
  Formats:
  .nf
    +  means initsend - must match an int (how) in the param list.
--- 149,155 ----
      modifiers : null | modifiers mchar
  .br
      mchar : 'h' | 'l' | 'u'
! 
  Formats:
  .nf
    +  means initsend - must match an int (how) in the param list.
*** /dev/null	Wed Sep 22 16:07:07 1993
--- patches/Contents	Wed Sep 22 16:06:42 1993
***************
*** 0 ****
--- 1,62 ----
+ 
+ patch #1
+ version:
+     3.2.0 -> 3.2.1
+     interoperable with v 3.2.0.
+ files:
+     patch  conf/CRAY.def
+     patch  conf/CRAY2.def
+     patch  conf/DGAV.def
+     patch  conf/I860.def
+     patch  conf/I860I860.def
+     patch  conf/I860SGI.def
+     patch  conf/IPSC2.def
+     patch  conf/KSR1.def
+     patch  conf/LINUX.def
+     create conf/MASPAR.def
+     patch  conf/PGON.def
+     patch  conf/SUN4SOL2.def
+     patch  conf/TITN.def
+     patch  console/Makefile.aimk
+     patch  console/cons.c
+     patch  examples/CM5/Makefile
+     patch  examples/I860/Makefile
+     patch  examples/Makefile.aimk
+     patch  examples/PGON/Makefile
+     patch  examples/testall.f
+     patch  lib/pvmgetarch
+     patch  libfpvm/HPPA/Makefile
+     patch  libfpvm/Makefile.aimk
+     patch  man/man3/pack.3
+     patch  man/man3/unpack.3
+     create patches/Contents
+     patch  pvmgs/Makefile.aimk
+     patch  src/Makefile.aimk
+     patch  src/global.h
+     patch  src/host.c
+     patch  src/lpvm.c
+     patch  src/lpvmgen.c
+     patch  src/patchlevel.h
+     patch  src/pvmd.c
+     patch  xep/CM5/Makefile
+     patch  xep/Makefile.aimk
+     patch  xep/PGON/Makefile
+     patch  xep/PMAX/Makefile
+ what:
+     . pvmd signal code uses new macros.  SYSVSIGNAL should be set for sysV 
+       handlers (need to reset after a signal).  NOWAIT3 should be
+       defined if wait3() isn't available.  NOWAITPID should be defined
+       if neither wait3() nor waitpid() is available.
+     . added conf/MASPAR.def file.
+     . fixed bug - console would hang if hosts added in .pvmrc script.
+     . fixed PGON library defs, "-lrpc -lnx".
+     . pvm_start_pvmd() doesn't free return val of pvmgetpvmd().
+     . pvm_send() was missing a return near end.
+     . fixed LINUX.def - had wrong arch name.
+     . pvmgetarch now detects LINUX machines and Solaris machines correctly.
+     . removed CC = cc from all makefiles.
+     . fixed SUN4SOL2.def
+     . fixed examples/testall.f - was calling config() incorrectly.
+     . added <linux/time.h> to console/cons.c.
+     . defined max() in src/host.c
+ 
*** ../netlib/pvm3.2.0/pvmgs/Makefile.aimk	Sun Aug 29 12:11:26 1993
--- pvmgs/Makefile.aimk	Wed Sep 22 14:06:10 1993
***************
*** 13,19 ****
  #  SYSVSTR         for strchr() instead of index()
  #
  SHELL	=	/bin/sh
- CC	=	cc
  SDIR	=	..
  DOBJ	=	pvmgs.o
  LOBJ	=	pvm_gsulib.o
--- 13,18 ----
*** ../netlib/pvm3.2.0/src/Makefile.aimk	Mon Aug 30 19:29:32 1993
--- src/Makefile.aimk	Wed Sep 22 14:57:43 1993
***************
*** 15,20 ****
--- 15,22 ----
  #  NOSOCKOPT       if system doesn't have setsockopt() or it doesn't work
  #  NOSTRCASE       if system doesn't have strcasecmp, strncasecmp
  #  NOTMPNAM        if system doesn't have tmpnam() or it's hosed
+ #  NOWAIT3         if system doesn't have wait3()
+ #  NOWAITPID       if system doesn't have waitpid() either
  #  OVERLOADHOST    to allow different virtual machines to overlap on a host
  #  RSHCOMMAND      for rsh command other than "/usr/ucb/rsh"
  #  RSHNPLL         for number of parallel rsh startups (default is 8)
***************
*** 27,33 ****
  #  USE_PVM_ALLOC   to enable instrumented malloc functions (for debugging pvm)
  #
  SHELL	=	/bin/sh
- CC	=	cc
  SDIR	=	..
  LIBDIR	=	../../lib/$(PVM_ARCH)
  #OPTIONS	=	-O
--- 29,34 ----
*** ../netlib/pvm3.2.0/src/global.h	Mon Aug 30 19:29:32 1993
--- src/global.h	Wed Sep 22 14:59:52 1993
***************
*** 32,37 ****
--- 32,40 ----
   *	Generic includes.
   *
  $Log: global.h,v $
+  * Revision 1.2  1993/09/22  18:59:46  manchek
+  * version change
+  *
   * Revision 1.1  1993/08/30  23:26:47  manchek
   * Initial revision
   *
***************
*** 40,46 ****
  
  /* release version */
  
! #define	PVM_VER	"3.2.0"
  
  /* UDPMAXLEN should be set to the largest UDP message length
     your system can handle. */
--- 43,49 ----
  
  /* release version */
  
! #define	PVM_VER	"3.2.1"
  
  /* UDPMAXLEN should be set to the largest UDP message length
     your system can handle. */
*** ../netlib/pvm3.2.0/src/host.c	Mon Aug 30 19:29:32 1993
--- src/host.c	Wed Sep 15 11:04:08 1993
***************
*** 32,37 ****
--- 32,40 ----
   *	Host table functions.
   *
  $Log: host.c,v $
+  * Revision 1.2  1993/09/15  15:03:31  manchek
+  * defined max() if not already there
+  *
   * Revision 1.1  1993/08/30  23:26:47  manchek
   * Initial revision
   *
***************
*** 70,75 ****
--- 73,82 ----
  #include "ddpro.h"
  #include "bfunc.h"
  
+ #ifndef	max
+ #define	max(a,b)	((a)>(b)?(a):(b))
+ #endif
+ 
  #ifdef SOCKADHASLEN
  #define SIZ(p) max(sizeof(p), (p).sa_len)
  #else
***************
*** 95,101 ****
   **           **
   ***************/
  
! static char rcsid[] = "$Id: host.c,v 1.1 1993/08/30 23:26:47 manchek Exp $";
  static char pvmtxt[1024];			/* scratch space for error messages */
  
  
--- 102,108 ----
   **           **
   ***************/
  
! static char rcsid[] = "$Id: host.c,v 1.2 1993/09/15 15:03:31 manchek Exp $";
  static char pvmtxt[1024];			/* scratch space for error messages */
  
  
*** ../netlib/pvm3.2.0/src/lpvm.c	Mon Aug 30 19:29:33 1993
--- src/lpvm.c	Thu Sep 16 17:36:47 1993
***************
*** 32,37 ****
--- 32,40 ----
   *	Libpvm core for unix environment.
   *
  $Log: lpvm.c,v $
+  * Revision 1.2  1993/09/16  21:36:20  manchek
+  * pvm_start_pvmd() was freeing the return string from pvmgetpvmd()
+  *
   * Revision 1.1  1993/08/30  23:26:48  manchek
   * Initial revision
   *
***************
*** 193,199 ****
   **           **
   ***************/
  
! static char rcsid[] = "$Id: lpvm.c,v 1.1 1993/08/30 23:26:48 manchek Exp $";
  static int debugmask = 0;				/* which debugging info */
  static int mxfersingle = 1;				/* mxfer returns after single frag */
  static char pvmtxt[512];				/* scratch for error log */
--- 196,202 ----
   **           **
   ***************/
  
! static char rcsid[] = "$Id: lpvm.c,v 1.2 1993/09/16 21:36:20 manchek Exp $";
  static int debugmask = 0;				/* which debugging info */
  static int mxfersingle = 1;				/* mxfer returns after single frag */
  static char pvmtxt[512];				/* scratch for error log */
***************
*** 1909,1915 ****
  	(void)wait(0);
  
  	PVM_FREE(av);
- 	PVM_FREE(fn);
  
  	for (cc = 8; cc > 0 && stat(buf, &sb) == -1; cc--)
  		sleep(1);
--- 1912,1917 ----
*** ../netlib/pvm3.2.0/src/lpvmgen.c	Mon Aug 30 19:29:33 1993
--- src/lpvmgen.c	Thu Sep 16 17:37:58 1993
***************
*** 32,37 ****
--- 32,40 ----
   *	Libpvm generic functions.
   *
  $Log: lpvmgen.c,v $
+  * Revision 1.2  1993/09/16  21:37:39  manchek
+  * pvm_send() missing a return before lpvmerr()
+  *
   * Revision 1.1  1993/08/30  23:26:48  manchek
   * Initial revision
   *
***************
*** 92,98 ****
  
  static int def_match();
  
! static char rcsid[] = "$Id: lpvmgen.c,v 1.1 1993/08/30 23:26:48 manchek Exp $";
  static char pvmtxt[512];				/* scratch for error log */
  static int (*recv_match)() = def_match;
  
--- 95,101 ----
  
  static int def_match();
  
! static char rcsid[] = "$Id: lpvmgen.c,v 1.2 1993/09/16 21:37:39 manchek Exp $";
  static char pvmtxt[512];				/* scratch for error log */
  static int (*recv_match)() = def_match;
  
***************
*** 815,821 ****
  /* XXX short-ckt to us should go here.  maybe can inc frag chain
     XXX count and make new message, put on pvmrxlist. */
  	if ((cc = mroute(pvmsbufmid, tid, code, 0)) < 0)
! 		lpvmerr("pvm_send", cc);
  	return 0;
  }
  
--- 818,824 ----
  /* XXX short-ckt to us should go here.  maybe can inc frag chain
     XXX count and make new message, put on pvmrxlist. */
  	if ((cc = mroute(pvmsbufmid, tid, code, 0)) < 0)
! 		return lpvmerr("pvm_send", cc);
  	return 0;
  }
  
*** ../netlib/pvm3.2.0/src/patchlevel.h	Mon Aug 30 19:29:33 1993
--- src/patchlevel.h	Wed Sep 22 15:00:42 1993
***************
*** 1,3 ****
  
! #define PATCHLEVEL 0
  
--- 1,3 ----
  
! #define PATCHLEVEL 1
  
*** ../netlib/pvm3.2.0/src/pvmd.c	Mon Aug 30 19:29:34 1993
--- src/pvmd.c	Wed Sep 22 15:16:00 1993
***************
*** 32,37 ****
--- 32,44 ----
   *	Mr. pvm daemon.
   *
  $Log: pvmd.c,v $
+  * Revision 1.3  1993/09/22  19:14:47  manchek
+  * added network resend statistic.
+  * removed redundant code in netinpkt() where it finds mca
+  *
+  * Revision 1.2  1993/09/16  21:45:32  manchek
+  * replaced reap() - now uses SYSVSIGNAL and NOWAIT3 macros
+  *
   * Revision 1.1  1993/08/30  23:26:50  manchek
   * Initial revision
   *
***************
*** 108,113 ****
--- 115,121 ----
  	int sdneg, sdok;				/* neg, ok sendtos */
  	int rfok;						/* ok recvfroms */
  	int refrag;						/* refragmented frags */
+ 	int netret;						/* network resends */
  };
  
  struct statistics stats;
***************
*** 171,177 ****
   **           **
   ***************/
  
! static char rcsid[] = "$Id: pvmd.c,v 1.1 1993/08/30 23:26:50 manchek Exp $";
  static int *deads = 0;			/* circ queue of dead pids */
  static char pvmtxt[512];		/* scratch for error log */
  static int ndead = 0;			/* len of deads */
--- 179,185 ----
   **           **
   ***************/
  
! static char rcsid[] = "$Id: pvmd.c,v 1.3 1993/09/22 19:14:47 manchek Exp $";
  static int *deads = 0;			/* circ queue of dead pids */
  static char pvmtxt[512];		/* scratch for error log */
  static int ndead = 0;			/* len of deads */
***************
*** 499,524 ****
  
  	sig = sig;
  
! #ifdef	SYSVSIGNAL
! 	if ((pid = wait((int *)0)) > 0) {
! 		deads[wdead] = pid;
! 		if (++wdead >= ndead)
! 			wdead = 0;
! 	}
! 	(void)signal(SIGCLD, reap);
! 
! #else	/*SYSVSIGNAL*/
! #ifdef	IMA_PGON
! 	while ((pid = waitpid(-1, (int *)0, WNOHANG)) > 0)
  #else
! 	while ((pid = wait3(0, WNOHANG, (struct rusage *)0)) > 0)
  #endif
  	{
  		deads[wdead] = pid;
  		if (++wdead >= ndead)
  			wdead = 0;
  	}
! #endif	/*SYSVSIGNAL*/
  }
  
  
--- 507,529 ----
  
  	sig = sig;
  
! #ifdef	NOWAIT3
! #ifdef	NOWAITPID
! 	if ((pid = wait((int *)0)) > 0)
  #else
! 	while ((pid = waitpid(-1, (int *)0, WNOHANG)) > 0)
  #endif
+ #else	/*NOWAIT3*/
+ 	while ((pid = wait3(0, WNOHANG, (struct rusage *)0)) > 0)
+ #endif	/*NOWAIT3*/
  	{
  		deads[wdead] = pid;
  		if (++wdead >= ndead)
  			wdead = 0;
  	}
! #ifdef	SYSVSIGNAL
! 	(void)signal(SIGCLD, reap);
! #endif
  }
  
  
***************
*** 1072,1077 ****
--- 1077,1086 ----
  				pp->pk_at = tnow;
  			TVXADDY(&pp->pk_rtv, &tnow, &pp->pk_rta);
  			TVXADDY(&pp->pk_rto, &pp->pk_rto, &pp->pk_rta);
+ #ifdef	STATISTICS
+ 			if (pp->pk_nrt)
+ 				stats.netret++;
+ #endif
  			++pp->pk_nrt;
  			if (pp->pk_rta.tv_sec < DDMAXRTT) {
  				TVXADDY(&pp->pk_rta, &pp->pk_rta, &pp->pk_rta);
***************
*** 1386,1403 ****
  		}
  	}
  
! 	if (TIDISMCA(dst)) {
! 		for (mcap = hp->hd_mcas->mc_link; mcap != hp->hd_mcas;
! 				mcap = mcap->mc_link)
! 			if (mcap->mc_tid == dst)
! 				break;
! 		if (mcap == hp->hd_mcas) {
! 			sprintf(pvmtxt,
! 					"netinpkt() pkt from t%x for t%x scrapped (not us)\n",
! 					src, dst);
! 			pvmlogerror(pvmtxt);
! 			goto done;
! 		}
  
  #if	defined(IMA_PGON) || defined(IMA_I860) || defined(IMA_CM5)
  		mpp_mcast(src, pp, mcap->mc_dsts, mcap->mc_ndst);
--- 1395,1401 ----
  		}
  	}
  
! 	if (mcap) {
  
  #if	defined(IMA_PGON) || defined(IMA_I860) || defined(IMA_CM5)
  		mpp_mcast(src, pp, mcap->mc_dsts, mcap->mc_ndst);
***************
*** 2929,2934 ****
--- 2927,2934 ----
  			stats.wrok, stats.wrshr, stats.wrzer, stats.wrneg);
  	pvmlogerror(pvmtxt);
  	sprintf(pvmtxt, " refrags: %d\n", stats.refrag);
+ 	pvmlogerror(pvmtxt);
+ 	sprintf(pvmtxt, " netwk resends: %d\n", stats.netret);
  	pvmlogerror(pvmtxt);
  	return 0;
  }
*** ../netlib/pvm3.2.0/xep/CM5/Makefile	Wed Jul  7 21:55:05 1993
--- xep/CM5/Makefile	Wed Sep 22 14:05:50 1993
***************
*** 22,28 ****
  XLDIR	=	/usr/lib
  XDIR	=	$(BDIR)/$(PVM_ARCH)
  
- CC	=	cc
  CFLAGS	=	$(ARCHCFLAGS) -O -I$(PVMIDIR) -L$(PVMLDIR) $(ARCHCFLAGS)
  LIBS	=	$(PVMLIB) $(ARCHLIB)
  XLIBS	=	-lXaw -lXt -lXmu -lXext -lX11
--- 22,27 ----
*** ../netlib/pvm3.2.0/xep/Makefile.aimk	Mon Aug 30 14:47:43 1993
--- xep/Makefile.aimk	Wed Sep 22 14:05:52 1993
***************
*** 13,19 ****
  BDIR	=	../../bin
  XDIR	=	$(BDIR)/$(PVM_ARCH)
  
- CC	=	cc
  CFLAGS	=	$(ARCHCFLAGS) -O -I$(PVMIDIR) -L$(PVMLDIR) $(ARCHCFLAGS)
  LIBS	=	$(PVMLIB) $(ARCHLIB)
  XLIBS	=	-lXaw -lXmu -lXext -lXt -lX11
--- 13,18 ----
*** ../netlib/pvm3.2.0/xep/PGON/Makefile	Wed Jul  7 21:55:34 1993
--- xep/PGON/Makefile	Wed Sep 15 14:27:07 1993
***************
*** 11,17 ****
  PVMIDIR	=	../../include
  PVMLDIR	=	../../lib/$(ARCH)
  PVMLIB	=	-lpvm3
! ARCHLIB	=	-lrpc
  SDIR	=	..
  BDIR	=	../../bin
  # on cross compiler host
--- 11,17 ----
  PVMIDIR	=	../../include
  PVMLDIR	=	../../lib/$(ARCH)
  PVMLIB	=	-lpvm3
! ARCHLIB	=	-lrpc -lnx
  SDIR	=	..
  BDIR	=	../../bin
  # on cross compiler host
*** ../netlib/pvm3.2.0/xep/PMAX/Makefile	Mon Aug 30 14:45:03 1993
--- xep/PMAX/Makefile	Wed Sep 22 14:05:54 1993
***************
*** 13,19 ****
  BDIR	=	../../bin
  XDIR	=	$(BDIR)/$(PVM_ARCH)
  
- CC	=	cc
  CFLAGS	=	$(ARCHCFLAGS) -O -I$(PVMIDIR) -L$(PVMLDIR) $(ARCHCFLAGS)
  LIBS	=	$(PVMLIB) $(ARCHLIB)
  XLIBS	=	-lXaw -lXmu-mit -lXext-mit -lXt-mit -lX11-mit
--- 13,18 ----
