[GNUnet-SVN] r1065 - in GNUnet/src/applications: dht/tools gap session tbench

[durner]

Author: durner
Date: 2005-06-26 07:48:26 -0700 (Sun, 26 Jun 2005)
New Revision: 1065

Modified:
   GNUnet/src/applications/dht/tools/dhttest2.c
   GNUnet/src/applications/gap/gaptest.c
   GNUnet/src/applications/session/sessiontest.c
   GNUnet/src/applications/tbench/tbenchtest.c
Log:
Windows has no kill()

Modified: GNUnet/src/applications/dht/tools/dhttest2.c
===================================================================
--- GNUnet/src/applications/dht/tools/dhttest2.c        2005-06-26 14:47:50 UTC 
(rev 1064)
+++ GNUnet/src/applications/dht/tools/dhttest2.c        2005-06-26 14:48:26 UTC 
(rev 1065)
@@ -96,12 +96,12 @@
   system("cp peer1/data/hosts/* peer2/data/hosts/");
   system("cp peer2/data/hosts/* peer1/data/hosts/");
   if (daemon1 != -1) {
-    if (0 != kill(daemon1, SIGTERM))
+    if (! termProcess(daemon1))
       DIE_STRERROR("kill");
     GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon1));
   }
   if (daemon2 != -1) {
-    if (0 != kill(daemon2, SIGTERM))
+    if (! termProcess(daemon2))
       DIE_STRERROR("kill");
     GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
   }
@@ -230,12 +230,12 @@
  FAILURE:
   stopCron();
   if (daemon1 != -1) {
-    if (0 != kill(daemon1, SIGTERM))
+    if (! termProcess(daemon1))
       DIE_STRERROR("kill");
     GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon1));
   }
   if (daemon2 != -1) {
-    if (0 != kill(daemon2, SIGTERM))
+    if (! termProcess(daemon2))
       DIE_STRERROR("kill");
     GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
   } 

Modified: GNUnet/src/applications/gap/gaptest.c
===================================================================
--- GNUnet/src/applications/gap/gaptest.c       2005-06-26 14:47:50 UTC (rev 
1064)
+++ GNUnet/src/applications/gap/gaptest.c       2005-06-26 14:48:26 UTC (rev 
1065)
@@ -281,12 +281,12 @@
   system("cp peer1/data/hosts/* peer2/data/hosts/");
   system("cp peer2/data/hosts/* peer1/data/hosts/");
   if (daemon1 != -1) {
-    if (0 != kill(daemon1, SIGTERM))
+    if (! termProcess(daemon1))
       DIE_STRERROR("kill");
     GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon1));
   }
   if (daemon2 != -1) {
-    if (0 != kill(daemon2, SIGTERM))
+    if (! termProcess(daemon2))
       DIE_STRERROR("kill");
     GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
   }
@@ -349,12 +349,12 @@
  FAILURE:
 
   if (daemon1 != -1) {
-    if (0 != kill(daemon1, SIGTERM))
+    if (! termProcess(daemon1))
       DIE_STRERROR("kill");
     GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon1));
   }
   if (daemon2 != -1) {
-    if (0 != kill(daemon2, SIGTERM))
+    if (! termProcess(daemon2))
       DIE_STRERROR("kill");
     GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
   } 

Modified: GNUnet/src/applications/session/sessiontest.c
===================================================================
--- GNUnet/src/applications/session/sessiontest.c       2005-06-26 14:47:50 UTC 
(rev 1064)
+++ GNUnet/src/applications/session/sessiontest.c       2005-06-26 14:48:26 UTC 
(rev 1065)
@@ -88,12 +88,12 @@
   system("cp peer1/data/hosts/* peer2/data/hosts/");
   system("cp peer2/data/hosts/* peer1/data/hosts/");  
   if (daemon1 != -1) {
-    if (0 != kill(daemon1, SIGTERM))
+    if (! termProcess(daemon1))
       DIE_STRERROR("kill");
     GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon1));
   }
   if (daemon2 != -1) {
-    if (0 != kill(daemon2, SIGTERM))
+    if (! termProcess(daemon2))
       DIE_STRERROR("kill");
     GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
   }
@@ -142,12 +142,12 @@
   }
   releaseClientSocket(sock);
   if (daemon1 != -1) {
-    if (0 != kill(daemon1, SIGTERM))
+    if (! termProcess(daemon1))
       DIE_STRERROR("kill");
     GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon1));
   }
   if (daemon2 != -1) {
-    if (0 != kill(daemon2, SIGTERM))
+    if (! termProcess(daemon2))
       DIE_STRERROR("kill");
     GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
   } 

Modified: GNUnet/src/applications/tbench/tbenchtest.c
===================================================================
--- GNUnet/src/applications/tbench/tbenchtest.c 2005-06-26 14:47:50 UTC (rev 
1064)
+++ GNUnet/src/applications/tbench/tbenchtest.c 2005-06-26 14:48:26 UTC (rev 
1065)
@@ -169,12 +169,12 @@
   system("cp peer1/data/hosts/* peer2/data/hosts/");
   system("cp peer2/data/hosts/* peer1/data/hosts/");
   if (daemon1 != -1) {
-    if (0 != kill(daemon1, SIGTERM))
+    if (! termProcess(daemon1))
       DIE_STRERROR("kill");
     GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon1));
   }
   if (daemon2 != -1) {
-    if (0 != kill(daemon2, SIGTERM))
+    if (! termProcess(daemon2))
       DIE_STRERROR("kill");
     GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
   }
@@ -223,12 +223,12 @@
   ret = test(sock, 32768, 10, 10, 500 * cronMILLIS, 1, 10 * cronSECONDS);
   releaseClientSocket(sock);
   if (daemon1 != -1) {
-    if (0 != kill(daemon1, SIGTERM))
+    if (! termProcess(daemon1))
       DIE_STRERROR("kill");
     GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon1));
   }
   if (daemon2 != -1) {
-    if (0 != kill(daemon2, SIGTERM))
+    if (! termProcess(daemon2))
       DIE_STRERROR("kill");
     GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
   }