asserts

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

diff --git a/src/util/os_priority.c b/src/util/os_priority.c
index 14aab8ce1c86c5b6f44e79036f57f300b0338587..77b2627035f06426cb559842445084865d2fe52b 100644 (file)
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -69,35 +69,39 @@ GNUNET_OS_set_process_priority (pid_t proc,
   /* convert to MINGW/Unix values */
   switch (prio)
     {
-    case GNUNET_SCHEDULER_PRIORITY_DEFAULT:
+    case GNUNET_SCHEDULER_PRIORITY_UI:
+    case GNUNET_SCHEDULER_PRIORITY_URGENT:
 #ifdef MINGW
-      rprio = NORMAL_PRIORITY_CLASS;
+      rprio = HIGH_PRIORITY_CLASS;
 #else
       rprio = 0;
 #endif
       break;
+
     case GNUNET_SCHEDULER_PRIORITY_HIGH:
 #ifdef MINGW
       rprio = ABOVE_NORMAL_PRIORITY_CLASS;
 #else
-      rprio = -5;
+      rprio = 5;
 #endif
       break;
-    case GNUNET_SCHEDULER_PRIORITY_BACKGROUND:
+
+    case GNUNET_SCHEDULER_PRIORITY_DEFAULT:
 #ifdef MINGW
-      rprio = BELOW_NORMAL_PRIORITY_CLASS;
+      rprio = NORMAL_PRIORITY_CLASS;
 #else
-      rprio = 10;
+      rprio = 7;
 #endif
       break;
-    case GNUNET_SCHEDULER_PRIORITY_UI:
-    case GNUNET_SCHEDULER_PRIORITY_URGENT:
+
+    case GNUNET_SCHEDULER_PRIORITY_BACKGROUND:
 #ifdef MINGW
-      rprio = HIGH_PRIORITY_CLASS;
+      rprio = BELOW_NORMAL_PRIORITY_CLASS;
 #else
-      rprio = -10;
+      rprio = 10;
 #endif
       break;
+
     case GNUNET_SCHEDULER_PRIORITY_IDLE:
 #ifdef MINGW
       rprio = IDLE_PRIORITY_CLASS;
@@ -112,11 +116,16 @@ GNUNET_OS_set_process_priority (pid_t proc,
   /* Set process priority */
 #ifdef MINGW
   SetPriorityClass (GetCurrentProcess (), rprio);
-#else
-  if (proc == getpid ())
+#elif LINUX 
+  if ( (0 == proc) ||
+       (proc == getpid () ) )
     {
+      int have = nice (0);
+      int delta = rprio - have;
       errno = 0;
-      if ((-1 == nice (rprio)) && (errno != 0))
+      if ( (delta != 0) &&
+          (rprio == nice (delta)) && 
+          (errno != 0) )
         {
           GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING |
                                GNUNET_ERROR_TYPE_BULK, "nice");
@@ -133,6 +142,9 @@ GNUNET_OS_set_process_priority (pid_t proc,
           return GNUNET_SYSERR;
         }
     }
+#else
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
+             "Priority management not availabe for this platform\n");
 #endif
   return GNUNET_OK;
 }