Changeset 454 for branches

Timestamp:

08/27/07 21:01:11 (15 months ago)

Author:

krobillard

Message:

Optimized ur_internDefault(). Repeated calls to _orderWords() were causing a
massive performance hit.

Files:

• branches/thune/thread_safe/context.c (modified) (5 diffs)

branches/thune/thread_safe/context.c

@@ -303 +303 @@
 
 /**
-  Add word to context if it does not already exist.
-  If added, the word is initialied as unset.
-
-  \return  Index of word in context.
-*/
-int ur_internWordT( UThread* ut, const UContext* ctx, UAtom atom )
-{
-    int wrdN;
-    UBlock* vblk;
+  Find word in context by atom.
+  \return  Word index or -1 if not found.
+*/
+static int _lookupNoSort( UThread* ut, const UContext* ctx, UAtom atom )
+{
     UBlock* wblk;
     UCell* it;
     UCell* end;
-
-
-    // Lookup word.
 
     wblk = ur_blockPtr( ctx->ctx.wordBlk );
@@ -331 +324 @@
             ++it;
         }
+        return -1;
     }
     else
     {
-        wrdN = _binarySearch( it, wblk->used, atom );
-        if( wrdN > -1 )
-            return wrdN;
-    }
-
-
-    // Not found - add new word.
-
+        return _binarySearch( it, wblk->used, atom );
+    }
+}
+
+
+static int _internWord( UThread* ut, const UContext* ctx, UAtom atom )
+{
+    int wrdN;
+    UBlock* vblk;
+    UBlock* wblk;
+    UCell* it;
+
+    wblk = ur_blockPtr( ctx->ctx.wordBlk );
     wrdN = wblk->used;
     UR_EXPAND_1( UCell, wblk, it );
@@ -365 +364 @@
 
     return wrdN;
+}
+
+
+/**
+  Add word to context if it does not already exist.
+  If added, the word is initialied as unset.
+
+  \return  Index of word in context.
+*/
+int ur_internWordT( UThread* ut, const UContext* ctx, UAtom atom )
+{
+    int wrdN;
+
+    wrdN = _lookupNoSort( ut, ctx, atom );
+    if( wrdN > -1 )
+        return wrdN;
+
+    // Not found - add new word.
+    return _internWord( ut, ctx, atom );
 }
 
@@ -571 +589 @@
     {
         --cit;
-        wrdN = ur_lookup( cit, atom );
+        wrdN = _lookupNoSort( ut, cit, atom );
         if( wrdN > -1 )
             goto assign;
@@ -594 +612 @@
     // Word not found, so intern into current module (top of context stack).
     cit = ctop - 1;
-    wrdN = ur_internWord( cit, atom );
+    wrdN = _internWord( ut, cit, atom );
 
 assign: