changes

[cdsspec-compiler.git] / benchmark / ms-queue / my_queue.h

diff --git a/benchmark/ms-queue/my_queue.h b/benchmark/ms-queue/my_queue.h
index cc10de498e2f7317c8439a5a387fe2cd9a9faabf..0768428df5d9fadc1a1b29195b3de2c94068e87b 100644 (file)
--- a/benchmark/ms-queue/my_queue.h
+++ b/benchmark/ms-queue/my_queue.h
@@ -3,6 +3,13 @@
 
 #include <stdatomic.h>
 
+#include <spec_lib.h>
+#include <stdlib.h>
+#include <cdsannotate.h>
+#include <specannotation.h>
+#include <model_memory.h>
+#include "common.h" 
+
 #define MAX_NODES                      0xf
 
 typedef unsigned long long pointer;
@@ -30,23 +37,44 @@ typedef struct {
 
 void init_queue(queue_t *q, int num_threads);
 
-#include <list>
-using namespace std;
 /**
        @Begin
+       @Options:
+               LANG = C;
        @Global_define:
                @DeclareStruct:
                typedef struct tag_elem {
-                       Tag id;
+                       call_id_t id;
                        unsigned int data;
                } tag_elem_t;
                
                @DeclareVar:
-               list<tag_elem_t> __queue;
-               Tag tag;
+               spec_list *__queue;
+               id_tag_t *tag;
                @InitVar:
-                       __queue = list<tag_elem_t>();
-                       tag = 1; // Beginning of available id
+                       __queue = new_spec_list();
+                       tag = new_id_tag(); // Beginning of available id
+               @DefineFunc:
+                       tag_elem_t* new_tag_elem(call_id_t id, unsigned int data) {
+                               tag_elem_t *e = (tag_elem_t*) CMODEL_MALLOC(sizeof(tag_elem_t));
+                               e->id = id;
+                               e->data = data;
+                               return e;
+                       }
+               @DefineFunc:
+                       void free_tag_elem(tag_elem_t *e) {
+                               free(e);
+                       }
+               @DefineFunc:
+                       call_id_t get_id(void *wrapper) {
+                               if (wrapper == NULL)
+                                       return 0;
+                               return ((tag_elem_t*) wrapper)->id;
+                       }
+               @DefineFunc:
+                       unsigned int get_data(void *wrapper) {
+                               return ((tag_elem_t*) wrapper)->data;
+                       }
        @Happens_before:
                # Only check the happens-before relationship according to the id of the
                # commit_point_set. For commit_point_set that has same ID, A -> B means
@@ -60,15 +88,14 @@ using namespace std;
 /**
        @Begin
        @Interface: Enqueue
-       @Commit_point_set: Enqueue_Success_Point
-       @ID: tag++
+       @Commit_point_set: Enqueue_Read_Tail | Enqueue_UpdateNext
+       @ID: get_and_inc(tag)
        @Action:
                # __ID__ is an internal macro that refers to the id of the current
                # interface call
-               tag_elem_t elem;
-               elem.id = __ID__;
-               elem.data = val;
-               __queue.push_back(elem);
+               tag_elem_t *elem = new_tag_elem(__ID__, val);
+               push_back(__queue, elem);
+               //model_print("Enqueue: input=%d\n", val);
        @End
 */
 void enqueue(queue_t *q, unsigned int val);
@@ -76,16 +103,20 @@ void enqueue(queue_t *q, unsigned int val);
 /**
        @Begin
        @Interface: Dequeue
-       @Commit_point_set: Dequeue_Success_Point
-       @ID: __queue.back().id
+       @Commit_point_set: Dequeue_Read_Head | Dequeue_Read_Tail | Dequeue_LoadNext
+       @ID: get_id(front(__queue))
        @Action:
-               unsigned int _Old_Val = __queue.front().data;
-               __queue.pop_front();
+               unsigned int _Old_Val = 0;
+               if (size(__queue) > 0) {
+                       _Old_Val = get_data(front(__queue));
+                       pop_front(__queue);
+               }
+       //      model_print("Dequeue: __RET__=%d, retVal=%d, Old_Val=%d\n", __RET__, *retVal, _Old_Val);
        @Post_check:
-               _Old_Val == __RET__
+               _Old_Val == 0 ? !__RET__ : _Old_Val == *retVal
        @End
 */
-unsigned int dequeue(queue_t *q);
+bool dequeue(queue_t *q, int *retVal);
 int get_thread_num();
 
 #endif