Remove state global locks (#85)

* Remove global locks and everything that uses them

* Tidy up pi func

* Remove scale_check function

* New version

Author: Shillaker

.env

@@ -1,3 +1,3 @@
-SYSROOT_VERSION=0.1.5
-SYSROOT_CLI_IMAGE=faasm/cpp-sysroot:0.1.5
+SYSROOT_VERSION=0.1.6
+SYSROOT_CLI_IMAGE=faasm/cpp-sysroot:0.1.6
 COMPOSE_PROJECT_NAME=cpp-dev

.github/workflows/tests.yml

@@ -12,7 +12,7 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-20.04
     container:
-      image: faasm/cpp-sysroot:0.1.5
+      image: faasm/cpp-sysroot:0.1.6
     defaults:
       run:
         working-directory: /code/cpp

VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

func/demo/CMakeLists.txt

@@ -43,7 +43,6 @@ demo_func(getpwuid getpwuid.cpp)
 demo_func(gettime gettime.cpp)
 demo_func(heap heap.cpp)
 demo_func(hello hello.cpp)
-demo_func(increment increment.cpp)
 demo_func(isatty isatty.cpp)
 demo_func(listdir listdir.cpp)
 demo_func(lock lock.c)
@@ -66,7 +65,6 @@ demo_func(print_state print_state.cpp)
 demo_func(ptr_ptr ptr_ptr.cpp)
 demo_func(random random.cpp)
 demo_func(random_float random_float.cpp)
-demo_func(scale_check scale_check.cpp)
 demo_func(shared_file shared_file.cpp)
 demo_func(simple simple.cpp)
 demo_func(sizes sizes.cpp)

func/demo/pi.cpp

@@ -1,4 +1,3 @@
-#include <faasm/counter.h>
 #include <faasm/faasm.h>
 #include <faasm/input.h>
 #include <faasm/random.h>
@@ -12,8 +11,6 @@
 
 int piStep()
 {
-    auto sum = faasm::AtomicInt("pi");
-
     int count = 0;
     for (int i = 0; i < CHUNK_SIZE; i++) {
         // Two random points
@@ -26,8 +23,8 @@ int piStep()
         }
     }
 
-    sum += count;
-
+    // Append count for this worker
+    faasmAppendState("pi", BYTES(&count), sizeof(int));
     return 0;
 }
 
@@ -40,15 +37,19 @@ int main(int argc, char* argv[])
     int nWorkers = std::stoi(inputData);
     int nTotal = CHUNK_SIZE * nWorkers;
 
-    // Initialise the sum
-    auto sum = faasm::AtomicInt("pi");
-    sum.reset();
-
     // Dispatch chained calls
     faasmChainBatch(piStep, "", nWorkers);
 
-    // Get the final result
-    int finalCount = sum.get();
+    // Read in the counts
+    size_t buffSize = nWorkers * sizeof(int);
+    auto buffer = new int[nWorkers];
+    faasmReadAppendedState("pi", (uint8_t*)buffer, buffSize, nWorkers);
+
+    // Sum the counts
+    int finalCount = 0;
+    for (int w = 0; w < nWorkers; w++) {
+        finalCount += buffer[w];
+    }
 
     // Estimate pi
     float pi = 4 * ((float)finalCount / (nTotal));
@@ -59,5 +60,6 @@ int main(int argc, char* argv[])
     printf("%s", output.c_str());
     faasm::setStringOutput(output.c_str());
 
+    delete[] buffer;
     return 0;
 }

func/demo/scale_check.cpp

@@ -10,7 +10,6 @@ set(PUBLIC_HEADERS
         faasm/host_interface.h
         faasm/array.h
         faasm/compare.h
-        faasm/counter.h
         faasm/faasm.h
         faasm/files.h
         faasm/input.h
@@ -27,7 +26,6 @@ set(PUBLIC_HEADERS
 set(LIB_FILES
         compare.cpp
         core.cpp
-        counter.cpp
         files.cpp
         input.cpp
         matrix.cpp

libfaasm/CMakeLists.txt

@@ -108,16 +108,6 @@ void faasmPullState(const char* key, long stateLen)
     __faasm_pull_state(key, stateLen);
 }
 
-void faasmLockStateGlobal(const char* key)
-{
-    __faasm_lock_state_global(key);
-}
-
-void faasmUnlockStateGlobal(const char* key)
-{
-    __faasm_unlock_state_global(key);
-}
-
 void faasmLockStateRead(const char* key)
 {
     __faasm_lock_state_read(key);

libfaasm/core.cpp

@@ -15,8 +15,6 @@ __faasm_flag_state_dirty
 __faasm_flag_state_offset_dirty
 __faasm_read_state_offset
 __faasm_read_state_offset_ptr
-__faasm_lock_state_global
-__faasm_unlock_state_global
 __faasm_lock_state_read
 __faasm_unlock_state_read
 __faasm_lock_state_write