[Spread-cvs] cvs commit: spread/daemon Readme.txt events.c

[jonathan at spread.org]

jonathan    04/09/24 10:57:29

  Modified:    daemon   Readme.txt events.c
  Log:
  Reenable SleepEx() call on Windows to implement E_delay(). select was not working.
  
  Revision  Changes    Path
  1.60      +1 -0      spread/daemon/Readme.txt
  
  Index: Readme.txt
  ===================================================================
  RCS file: /storage/cvsroot/spread/daemon/Readme.txt,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- Readme.txt	24 Sep 2004 00:30:08 -0000	1.59
  +++ Readme.txt	24 Sep 2004 14:57:29 -0000	1.60
  @@ -85,6 +85,7 @@
       group (i.e. they cannot be -wo (write-only)) but not all processes have to send.
       This allows easy testing with differing numbers of senders (just change how
       many spflooders start with -ro and how many do not).
  +11) Make E_delay() work on Win32. 
   
   SOURCE INSTALL:
   ---------------
  
  
  
  1.7       +2 -5      spread/daemon/events.c
  
  Index: events.c
  ===================================================================
  RCS file: /storage/cvsroot/spread/daemon/events.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- events.c	5 Mar 2004 00:32:46 -0000	1.6
  +++ events.c	24 Sep 2004 14:57:29 -0000	1.7
  @@ -330,18 +330,15 @@
   	sp_time	tmp_t;
   
   	tmp_t = t;
  +
  +#ifndef ARCH_PC_WIN95
           if (select(0, NULL, NULL, NULL, (struct timeval *)&tmp_t ) < 0)
           {
                   Alarm( EVENTS, "E_delay: select delay returned error: %s\n", strerror(errno));
           }
  -        /* I think the following special case for win95 was erroneously removed */
  -#if 0
  -#ifndef        ARCH_PC_WIN95
  -        select(0, NULL, NULL, NULL, (struct timeval *)&tmp_t );
   #else  /* ARCH_PC_WIN95 */
           SleepEx( tmp_t.sec*1000+tmp_t.usec/1000, 0 );
   #endif /* ARCH_PC_WIN95 */   
  -#endif
   
   }