Changeset 1913 for trunk

Timestamp:

Apr 25, 2005, 7:18:54 AM (20 years ago)

Author:

bird

Message:

Corrected some stupid bugs.

File:

• trunk/src/emx/src/lib/sys/priority.c (modified) (4 diffs, 1 prop)

trunk/src/emx/src/lib/sys/priority.c

@@ -96 +96 @@
     /* PRTYC_REGULAR */
     {   0,   0,  -1,  -1,  -1,  -2,  -2,  -3,  -3,  -3,  -4,  -4,  -4,  -4,  -4,  -5,  -5,  -5,  -5,  -5,  -6,  -6,  -6,  -6,  -6,  -7,  -7,  -7,  -7,  -7,  -8,  -9 },
+    /* PRTYC_TIMECRITICAL */
+    { -18, -18, -18, -18, -18, -18, -18, -18, -18, -18, -18, -18, -18, -18, -18, -19, -19, -19, -19, -19, -19, -19, -19, -19, -19, -19, -19, -19, -19, -19, -19, -20 },
     /* PRTYC_FOREGROUNDSERVER */
-    { -10, -11, -11, -11, -11, -12, -12, -12, -12, -12, -13, -13, -13, -13, -13, -14, -14, -14, -14, -14, -15, -15, -15, -15, -15, -16, -16, -16, -16, -16, -16, -17 },
-    /* PRTYC_TIMECRITICAL */
-    { -18, -18, -18, -18, -18, -18, -18, -18, -18, -18, -18, -18, -18, -18, -18, -19, -19, -19, -19, -19, -19, -19, -19, -19, -19, -19, -19, -19, -19, -19, -19, -20 }
+    { -10, -11, -11, -11, -11, -12, -12, -12, -12, -12, -13, -13, -13, -13, -13, -14, -14, -14, -14, -14, -15, -15, -15, -15, -15, -16, -16, -16, -16, -16, -16, -17 }
 };
 
@@ -120 +120 @@
 
 
-/** Convert from Unix to OS/2. Indexed by level + 21. */
+/** Convert from Unix to OS/2. Indexed by level + 20. */
 static const unsigned short gToOS2[41] =
 {
@@ -128 +128 @@
     0x041f, 0x0419, 0x0414, 0x040f, 0x040a, 0x0405, 0x0401, 0x0400,
     /* RG (-9 to 0) */
-    0x021f, 0x021e, 0x0219, 0x0214, 0x020f, 0x021a, 0x0207, 0x0205, 0x0202, 0x0200,
+    0x021f, 0x021e, 0x0219, 0x0214, 0x020f, 0x020a, 0x0207, 0x0205, 0x0202, 0x0200,
     /* ID (1 to 20) */                                                   /* vv10vv */
     0x011f, 0x011e, 0x011d, 0x011c, 0x011b, 0x011a, 0x0119, 0x0118, 0x0117, 0x0116, 0x0114, 0x0111, 0x010f, 0x010c, 0x010a, 0x0107, 0x0105, 0x0102, 0x0101, 0x0100
@@ -141 +141 @@
 int __libc_back_priorityOS2FromUnix(int iNice)
 {
-    LIBC_ASSERTM(iNice + 21 >= 0 && iNice + 21 <= sizeof(gToOS2) / sizeof(gToOS2[0]), "iNice=%d\n", iNice);
-    return gToOS2[iNice + 21];
+    LIBC_ASSERTM(iNice + 20 >= 0 && iNice + 20 <= sizeof(gToOS2) / sizeof(gToOS2[0]), "iNice=%d\n", iNice);
+    return gToOS2[iNice + 20];
 }
 
+
+#if 0
+/* testing the tables */
+#include <stdio.h>
+static int iPrev = 20;
+static int checkOS2(int iPrio)
+{
+    int iNice = __libc_back_priorityUnixFromOS2(iPrio);
+    int iRev = __libc_back_priorityOS2FromUnix(iNice);
+    if (    iRev > iPrio
+        || (iRev & ~0xff) < (iPrio & ~0xff)
+        || iPrev < iNice)
+    {
+        printf("Error: iPrio=%#x iNice=%d iPrev=%d iRev=%#x\n", iPrio, iNice, iPrev, iRev);
+        return 1;
+    }
+    else
+        printf("Info: iPrio=%#x iNice=%d\n", iPrio, iNice);
+    iPrev = iNice;
+    return 0;
+}
+
+int main()
+{
+    int i;
+    int rc = 0;
+    for (i = 0; i < 32; i++)
+        rc += checkOS2(0x100 | i);
+    for (i = 0; i < 32; i++)
+        rc += checkOS2(0x200 | i);
+    for (i = 0; i < 32; i++)
+        rc += checkOS2(0x400 | i);
+    for (i = 0; i < 32; i++)
+        rc += checkOS2(0x300 | i);
+    for (i = -20; i <= 20; i++)
+    {
+        int iPrio = __libc_back_priorityOS2FromUnix(i);
+        int iRev = __libc_back_priorityUnixFromOS2(iPrio);
+        if (iRev != i)
+        {
+            printf("Error: i=%d iPrio=%#x iRev=%d\n", i, iPrio, iRev);
+            rc++;
+        }
+    }
+    return rc;
+}
+
+#endif