fix

[oweals/gnunet.git] / src / util / test_os_load.c

diff --git a/src/util/test_os_load.c b/src/util/test_os_load.c
index 2f82f60c73b818da54e0195684c3fcac879338a3..a5639b048e0ea8cc5d5f8057503e949b4cb96dab 100644 (file)
--- a/src/util/test_os_load.c
+++ b/src/util/test_os_load.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -77,7 +77,6 @@ testcpu ()
       fprintf (stderr,
                "\nbusy loop failed to increase CPU load: %d >= %d.",
                ret, GNUNET_OS_load_cpu_get (cfg));
-      ret = 1;
     }
   else
     {
@@ -86,20 +85,19 @@ testcpu ()
                "\nbusy loop increased CPU load: %d < %d.",
                ret, GNUNET_OS_load_cpu_get (cfg));
 #endif
-      ret = 0;
     }
   fprintf (stderr, "\n");
 
 
   GNUNET_CONFIGURATION_destroy (cfg);
-  return ret;
+  return 0;
 }
 
 static int
 testdisk ()
 {
   int ret;
-  int fd;
+  struct GNUNET_DISK_FileHandle *fh;
   char buf[65536];
   struct GNUNET_TIME_Absolute start;
   struct GNUNET_CONFIGURATION_Handle *cfg;
@@ -132,27 +130,31 @@ testdisk ()
       return 0;
     }
   memset (buf, 42, sizeof (buf));
-  fd =
-    GNUNET_DISK_file_open (".loadfile", O_WRONLY | O_CREAT,
-                           S_IRUSR | S_IWUSR);
-  GNUNET_assert (fd != -1);
+  fh = GNUNET_DISK_file_open (".loadfile", GNUNET_DISK_OPEN_WRITE
+                              | GNUNET_DISK_OPEN_CREATE,
+                              GNUNET_DISK_PERM_USER_READ |
+                              GNUNET_DISK_PERM_USER_WRITE);
+  GNUNET_assert (GNUNET_NO == GNUNET_DISK_handle_invalid (fh));
   while (GNUNET_TIME_absolute_get_duration (start).value < 60 * 1000)
     {
-      LSEEK (fd, GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
-                                           1024 * 1024 * 1024), SEEK_SET);
-      GNUNET_assert (sizeof (buf) == WRITE (fd, buf, sizeof (buf)));
-      fsync (fd);
+      GNUNET_DISK_file_seek (fh,
+                             GNUNET_CRYPTO_random_u64
+                             (GNUNET_CRYPTO_QUALITY_WEAK, 1024 * 1024 * 1024),
+                             GNUNET_DISK_SEEK_SET);
+      GNUNET_assert (sizeof (buf) ==
+                     GNUNET_DISK_file_write (fh, buf, sizeof (buf)));
+      GNUNET_DISK_file_sync (fh);
       if (ret < GNUNET_OS_load_disk_get (cfg))
         break;
     }
-  GNUNET_break (0 == CLOSE (fd));
+  GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (fh));
   GNUNET_break (0 == UNLINK (".loadfile"));
   if (ret >= GNUNET_OS_load_disk_get (cfg))
     {
       fprintf (stderr,
                "\nbusy loop failed to increase IO load: %d >= %d.",
                ret, GNUNET_OS_load_disk_get (cfg));
-      ret = 1;
+      ret = 0;
     }
   else
     {
@@ -165,7 +167,7 @@ testdisk ()
     }
   fprintf (stderr, "\n");
   GNUNET_CONFIGURATION_destroy (cfg);
-  return 0;
+  return ret;
 }
 
 int