Changeset 83 for trunk/src/helpers/semaphores.c

Timestamp:

Jun 28, 2001, 7:13:56 PM (24 years ago)

Author:

umoeller

Message:

Many misc updates.

File:

• trunk/src/helpers/semaphores.c (modified) (5 diffs)

trunk/src/helpers/semaphores.c

@@ -396 +396 @@
 
                 // check if this thread has a reader entry already
-                if (pReader = (PREADERTREENODE)treeFindEQID(&pMutex->ReaderThreadsTree,
-                                                            tidMyself)) // ID to look for
+                if (pReader = (PREADERTREENODE)treeFind(pMutex->ReaderThreadsTree,
+                                                        tidMyself,  // ID to look for
+                                                        treeCompareKeys))
                 {
                     // yes:
@@ -418 +419 @@
                         // store the thread ID as the tree ID to
                         // sort by (so we can find by TID)
-                        pReader->Tree.id = tidMyself;
+                        pReader->Tree.ulKey = tidMyself;
                         // set requests count to 1
                         pReader->cRequests = 1;
 
-                        treeInsertID(&pMutex->ReaderThreadsTree,
-                                     (TREE*)pReader,
-                                     FALSE);
+                        treeInsert(&pMutex->ReaderThreadsTree,
+                                   (TREE*)pReader,
+                                   treeCompareKeys);
                         (pMutex->cReaderThreads)++;
                     }
@@ -466 +467 @@
 
             // find the READERTREENODE for our TID
-            if (    (pReader = (PREADERTREENODE)treeFindEQID(&pMutex->ReaderThreadsTree,
-                                                             tidMyself)) // ID to look for
+            if (    (pReader = (PREADERTREENODE)treeFind(pMutex->ReaderThreadsTree,
+                                                         tidMyself,  // ID to look for
+                                                         treeCompareKeys))
                  && (pReader->cRequests)
                )
@@ -535 +537 @@
 
             // find the READERTREENODE for our TID
-            if (    (!(pReader = (PREADERTREENODE)treeFindEQID(&pMutex->ReaderThreadsTree,
-                                                               tidMyself)))          // ID to look for
+            if (    (!(pReader = (PREADERTREENODE)treeFind(pMutex->ReaderThreadsTree,
+                                                           tidMyself,          // ID to look for
+                                                           treeCompareKeys)))
                  || (pReader->cRequests == 0)
                )
@@ -603 +606 @@
                 // check if current TID holds read request also
                 PREADERTREENODE pReader
-                    = (PREADERTREENODE)treeFindEQID(&pMutex->ReaderThreadsTree,
-                                                    tidMyself);
+                    = (PREADERTREENODE)treeFind(pMutex->ReaderThreadsTree,
+                                                tidMyself,
+                                                treeCompareKeys);
                             // != NULL if this TID has a reader already