Add gitignore

Author: Teenvan

.gitignore

@@ -0,0 +1,32 @@
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "vector": "cpp"
+    }
+}

input.h

@@ -0,0 +1,9 @@
+#pragma once
+
+namespace WaitFreeSimulation
+{
+    class Input
+    {
+
+    };
+}

normalized_lock_free.cpp

@@ -1,4 +1,2 @@
-#pragma once
-
 #include "normalized_lock_free.h"
 

normalized_lock_free.h

@@ -5,7 +5,6 @@
 #include "cas_descriptor.h"
 #include "contention_measure.h"
 #include "operation.h"
-#include "result.h"
 #include <vector>
 
 namespace WaitFreeSimulation

operation_record.cpp

@@ -1,18 +1,15 @@
-#pragma once
 #include "operation_record.h"
 #include <_types/_uint32_t.h>
 #include <algorithm>
 
 namespace WaitFreeSimulation
 {
-    template <class I, class O>
-    OperationRecord<I, O>::OperationRecord(uint64_t current) 
+    OperationRecord::OperationRecord(uint64_t current) 
     : completed(false),
     at(current)
     {}
 
-    template <class I, class O>
-    OperationRecord<I, O>::OperationRecord(OperationRecord<I, O>& otherRecord):
+    OperationRecord::OperationRecord(OperationRecord& otherRecord):
     completed(otherRecord.completed), at(otherRecord.at)
     {}
 

operation_record.h

@@ -1,22 +1,29 @@
 #pragma once
 
 #include "operation_state.h"
+#include <vector>
+#include "input.h"
+#include "output.h"
+#include "cas_descriptor.h"
 #include <cstdint>
 
 namespace WaitFreeSimulation
 {   
-    template<class I, class O>
     class OperationRecord
     {
+        using Cases = std::vector<CasDescriptor>;
+
         public:
             bool completed;
             uint32_t at;
             uint32_t ownerTid; // Owner thread identifier
-            I input; // Object with operation and input parameters
+            Input input; // Object with operation and input parameters
             OperationState state;
+            Output out;
+            Cases casDescriptors;
 
             OperationRecord(uint64_t current);
             // Copy constructor
-            OperationRecord(OperationRecord<I, O>& otherRecord);   
+            OperationRecord(OperationRecord& otherRecord);   
     };
 }

operation_record_box.cpp

@@ -2,14 +2,12 @@
 
 namespace WaitFreeSimulation
 {
-    template <class I, class O>
-    OperationRecordBox<I, O>::OperationRecordBox(OperationRecord<I, O>* value)
+    OperationRecordBox::OperationRecordBox(OperationRecord* value)
     : v(value)
     {}
 
-    template <class I, class O>
-    std::atomic<OperationRecord<I, O>*> OperationRecordBox<I, O>::operationPointer() const
-    {
-        return v;
-    }
+    // std::atomic<OperationRecord*>& OperationRecordBox::operationPointer() const
+    // {
+    //     return v;
+    // }
 }

operation_record_box.h

@@ -5,13 +5,10 @@
 
 namespace WaitFreeSimulation
 {
-    template<class I, class O>
     class OperationRecordBox
     {
         public:
-            OperationRecordBox(OperationRecord<I, O>* v);
-            std::atomic<OperationRecord<I, O>*> operationPointer() const;
-        private:    
-            std::atomic<OperationRecord<I, O>*> v;
+            OperationRecordBox(OperationRecord* v);   
+            std::atomic<OperationRecord*> v;
     };
 }

output.h

@@ -0,0 +1,9 @@
+#pragma once
+
+namespace WaitFreeSimulation
+{
+    class Output
+    {
+
+    };
+}