Changeset 218096f

Timestamp:

Sep 28, 2021, 2:45:42 PM (3 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

0f781fb8

Parents:

056cbdb

Message:

String performance improvements

Location:

libcfa/src/containers

Files:

• string_res.cfa (modified) (14 diffs)
• string_res.hfa (modified) (2 diffs)

libcfa/src/containers/string_res.cfa

@@ -17 +17 @@
 #include <stdlib.hfa>  // e.g. malloc
 #include <string.h>    // e.g. strlen
+#include <assert.h>
 
 //######################### VbyteHeap "header" #########################
@@ -102 +103 @@
 // creator.
 
-void ?{}( HandleNode & this ) with(this) {
+static inline void ?{}( HandleNode & this ) with(this) {
 #ifdef VbyteDebug
     serr | "enter:HandleNode::HandleNode, this:" | &this;
@@ -117 +118 @@
 // collection.
 
-void ?{}( HandleNode & this, VbyteHeap & vh ) with(this) {
+static inline void ?{}( HandleNode & this, VbyteHeap & vh ) with(this) {
 #ifdef VbyteDebug
     serr | "enter:HandleNode::HandleNode, this:" | &this;
@@ -133 +134 @@
 // is the responsibility of the creator to destroy it.
 
-void ^?{}( HandleNode & this ) with(this) {
+static inline void ^?{}( HandleNode & this ) with(this) {
 #ifdef VbyteDebug
     serr | "enter:HandleNode::~HandleNode, this:" | & this;
@@ -223 +224 @@
 void ?{}(string_res &s, const string_res & s2, StrResInitMode mode, size_t start, size_t end ) {
 
-    (s.Handle){ HeapArea };
+    verify( start <= end && end <= s2.Handle.lnth );
+
+    (s.Handle){};
     s.Handle.s = s2.Handle.s + start;
     s.Handle.lnth = end - start;
-    MoveThisAfter(s.Handle, s2.Handle );                        // insert this handle after rhs handle
+    AddThisAfter(s.Handle, s2.Handle );                 // insert this handle after rhs handle
     // ^ bug?  skip others at early point in string
     
@@ -234 +237 @@
         s.shareEditSet_next = &s;
     } else {
-        assert( mode == SHARE_EDITS );
+        verify( mode == SHARE_EDITS );
 
         // s2 is logically const but not implementation const
@@ -297 +300 @@
     char *limit = pasting.Handle.s + pasting.Handle.lnth;
     for (string_res * p = this.shareEditSet_next; p != &this; p = p->shareEditSet_next) {
-        assert (p->Handle.s >= beforeBegin);
+        verify (p->Handle.s >= beforeBegin);
         if ( p->Handle.s >= afterBegin ) {
-            assert ( p->Handle.s <= afterBegin + afterLen );
-            assert ( p->Handle.s + p->Handle.lnth <= afterBegin + afterLen );
+            verify ( p->Handle.s <= afterBegin + afterLen );
+            verify ( p->Handle.s + p->Handle.lnth <= afterBegin + afterLen );
             // p starts after the edit
             // take start and end as end-anchored
@@ -318 +321 @@
             } else {
                 // p ends after the edit
-                assert ( p->Handle.s + p->Handle.lnth <= afterBegin + afterLen );
+                verify ( p->Handle.s + p->Handle.lnth <= afterBegin + afterLen );
                 // take end as end-anchored
                 // stretch-shrink p according to the edit
@@ -328 +331 @@
             p->Handle.s = pasting.Handle.s + startOffsetFromStart;
         } else {
-            assert ( p->Handle.s < afterBegin );
+            verify ( p->Handle.s < afterBegin );
             // p starts during the edit
-            assert( p->Handle.s + p->Handle.lnth >= beforeBegin + beforeLen );
+            verify( p->Handle.s + p->Handle.lnth >= beforeBegin + beforeLen );
             if ( p->Handle.s + p->Handle.lnth < afterBegin ) {
                 // p ends during the edit; p does not include the last character replaced
@@ -374 +377 @@
     s.shareEditSet_prev->shareEditSet_next = s.shareEditSet_next;
     s.shareEditSet_next->shareEditSet_prev = s.shareEditSet_prev;
-    s.shareEditSet_next = &s;
-    s.shareEditSet_prev = &s;
+    // s.shareEditSet_next = &s;
+    // s.shareEditSet_prev = &s;
 }
 
@@ -385 +388 @@
     //TODO: Check if index is valid (no exceptions yet)
     return Handle.s[index];
+}
+
+void assignAt(const string_res &s, size_t index, char val) {
+    string_res editZone = { s, SHARE_EDITS, index, index+1 };
+    assign(editZone, &val, 1);
 }
 
@@ -653 +661 @@
                 NoBytes = ( uintptr_t )EndVbyte + size;         // try again
                 if ( NoBytes > ( uintptr_t )ExtVbyte ) {        // enough room for new byte-string ?
+// unimplemented feature - assert, not verify
 assert( 0 && "need to implement actual growth" );
                         // extend( size );                              // extend the byte-string area
@@ -677 +686 @@
                 //      | ( h->s ) | " and keep handles in ascending order";
                 // exit(-1 );
-                assert( 0 && "VbyteSM: Error - Cannot move byte strings as requested and keep handles in ascending order");
+                verify( 0 && "VbyteSM: Error - Cannot move byte strings as requested and keep handles in ascending order");
     } // if
 
@@ -839 +848 @@
     if ( AmountFree < ( int )( CurrSize * 0.1 )) {      // free space less than 10% ?
 
+// unimplemented feature - assert, not verify
 assert( 0 && "need to implement actual growth" );
 //              extend( CurrSize );                             // extend the heap

libcfa/src/containers/string_res.hfa

@@ -31 +31 @@
     unsigned int lnth;                                  // length of byte string
 }; // HandleNode
-
-void ?{}( HandleNode & );                       // constructor for header node
-
-void ?{}( HandleNode &, VbyteHeap & );          // constructor for nodes in the handle list
-void ^?{}( HandleNode & );                      // destructor for handle nodes
 
 extern VbyteHeap * DEBUG_string_heap;
@@ -105 +100 @@
 
 // Character access
+void assignAt(const string_res &s, size_t index, char val);
 char ?[?](const string_res &s, size_t index); // Mike changed to ret by val from Sunjay's ref, to match Peter's
 //char codePointAt(const string_res &s, size_t index); // revisit under Unicode