changeset 1037:7ccd8ba5bc93

create copyRedBlackTree test
author matac42 <matac@cr.ie.u-ryukyu.ac.jp>
date Mon, 06 Nov 2023 15:10:39 +0900
parents 9b95501b272b
children 9a8eba5d27f8
files src/parallel_execution/CMakeLists.txt src/parallel_execution/RedBlackTree.cbc
diffstat 2 files changed, 14 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/parallel_execution/CMakeLists.txt	Fri Nov 03 19:34:36 2023 +0900
+++ b/src/parallel_execution/CMakeLists.txt	Mon Nov 06 15:10:39 2023 +0900
@@ -138,6 +138,13 @@
 
 GearsCommand(
   TARGET
+      rbtree_copy
+  SOURCES
+      SingleLinkedQueue.cbc test/rbTreeCopy_test.cbc RedBlackTree.cbc SingleLinkedStack.cbc compare.c
+)
+
+GearsCommand(
+  TARGET
       boundedBuffer
   SOURCES
   examples/boundedBuffer/main.cbc examples/boundedBuffer/initBuffer.cbc examples/boundedBuffer/SemaphoreImpl.cbc examples/boundedBuffer/BoundedBuffer.cbc examples/boundedBuffer/consumer.cbc examples/boundedBuffer/producer.cbc SpinLock.cbc CPUWorker.cbc TaskManagerImpl.cbc SingleLinkedQueue.cbc SynchronizedQueue.cbc MultiDimIterator.cbc AtomicReference.cbc
--- a/src/parallel_execution/RedBlackTree.cbc	Fri Nov 03 19:34:36 2023 +0900
+++ b/src/parallel_execution/RedBlackTree.cbc	Mon Nov 06 15:10:39 2023 +0900
@@ -89,16 +89,16 @@
     
 }
 
-__code copyTree(struct RedBlackTree* tree) {
+__code copyRedBlackTree(struct RedBlackTree* tree) {
     struct Stack* nodeStack = tree->nodeStack;
     struct Node* oldNode = tree->current;
     struct Node* newNode = tree->newNode;
     tree->previous = newNode;
     *newNode = *oldNode;
-    goto nodeStack->push((union Data*)newNode, copyTree1);
+    goto nodeStack->push((union Data*)newNode, copyRedBlackTree1);
 }
 
-__code copyTree1(struct RedBlackTree* tree, struct Node* node, __code next(...)) {
+__code copyRedBlackTree1(struct RedBlackTree* tree, struct Node* node, __code next(...)) {
     struct Node* oldNode = tree->current;
     struct Node* newNode = tree->previous;
     struct Node* newnewNode = &ALLOCATE(context, Node)->Node;
@@ -106,13 +106,13 @@
     newnewNode->value = oldNode->value;
     newnewNode->left = newNode->left;
     if (newnewNode->left != Null) {
-        goto copyTree(newnewNode->left);
+        goto copyRedBlackTree(newnewNode->left);
     }
     newnewNode->right = newNode->right;
     if (newnewNode->right != Null) {
-        goto copyTree(newnewNode->right);
+        goto copyRedBlackTree(newnewNode->right);
     }
-    goto copyTreePop(tree);
+    goto copyRedBlackTreePop(tree);
     tree->newNode = newnewNode;
     
     if (tree->current) {
@@ -124,7 +124,7 @@
     
 }
 
-__code copyTreePop(struct RedBlackTree* tree, struct Node* node, __code next(...)) {
+__code copyRedBlackTreePop(struct RedBlackTree* tree, struct Node* node, __code next(...)) {
     struct Stack* nodeStack = tree->nodeStack;
     if (->right != Null) {
         goto nodeStack->pop(rotateLeft);