Changeset f37147b for src/tests

Timestamp:

Feb 28, 2017, 3:24:35 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

20221d4, dd020c0

Parents:

d0ffed1 (diff), 14f6bb39 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src/tests

Files:

• avltree/avl_test.c (modified) (1 diff)
• monitor.c (modified) (2 diffs)

src/tests/avltree/avl_test.c

@@ -36 +36 @@
 
   // char* -> char*
-  int ?<?(char *a, char *b) {
-    return strcmp(a,b) < 0;
+  struct c_str { char *str; };  // wraps a C string
+  int ?<?(c_str a, c_str b) {
+    return strcmp(a.str,b.str) < 0;
   }
-  tree(char *, char *) * ssmap = create("queso", "cheese");
-  insert(&ssmap, "foo", "bar");
-  insert(&ssmap, "hello", "world");
+  tree(c_str, char *) * ssmap = create((c_str){"queso"}, "cheese");
+  insert(&ssmap, (c_str){"foo"}, "bar");
+  insert(&ssmap, (c_str){"hello"}, "world");
   assert( height(ssmap) == 2 );
 
-  printf("%s %s %s\n", *find(ssmap, "hello"), *find(ssmap, "foo"), *find(ssmap, "queso"));
+  printf("%s %s %s\n", *find(ssmap, (c_str){"hello"}), *find(ssmap, (c_str){"foo"}), *find(ssmap, (c_str){"queso"}));
 
-  remove(&ssmap, "foo");
+  remove(&ssmap, (c_str){"foo"});
   delete(ssmap);
 }

src/tests/monitor.c

@@ -6 +6 @@
 struct global_t {
         int value;
-        monitor m;
+        __monitor_t m;
 };
 
@@ -16 +16 @@
 
 void increment( /*mutex*/ global_t * this ) {
-        monitor_guard g = { &this->m };
-        this->value += 1;
+        monitor_guard_t g1 = { &this->m };
+        {
+                monitor_guard_t g2 = { &this->m };
+                {
+                        monitor_guard_t g3 = { &this->m };
+                        this->value += 1;
+                }
+        }
 }