Make outputData a std::string (#116)

* libfaasm: don't use static variables that behave differently in wamr

* gh: bump version as we change libfaasm

* libfaasm: set output uses strings not byte arrays

* funcs: setOutput uses strings not bytes

* nits: run clang format

* mmap: fix return value

Author: csegarragonz

.env

@@ -1,3 +1,3 @@
-SYSROOT_VERSION=0.2.6
-SYSROOT_CLI_IMAGE=faasm.azurecr.io/cpp-sysroot:0.2.6
+SYSROOT_VERSION=0.2.7
+SYSROOT_CLI_IMAGE=faasm.azurecr.io/cpp-sysroot:0.2.7
 COMPOSE_PROJECT_NAME=cpp-dev

.github/workflows/tests.yml

@@ -19,7 +19,7 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     container:
-      image: faasm.azurecr.io/cpp-sysroot:0.2.6
+      image: faasm.azurecr.io/cpp-sysroot:0.2.7
       credentials:
         username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
         password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}

VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

func/demo/chain_output.cpp

@@ -1,18 +1,19 @@
-#include <faasm/compare.h>
 #include <faasm/faasm.h>
 #include <stdio.h>
 
+#include <string>
+
 int otherA()
 {
-    uint8_t outputA[5] = { 0, 1, 2, 3, 4 };
-    faasmSetOutput(outputA, 5);
+    std::string outputA = "expected A";
+    faasmSetOutput(outputA.c_str(), outputA.size());
     return 0;
 }
 
 int otherB()
 {
-    uint8_t outputB[3] = { 5, 4, 3 };
-    faasmSetOutput(outputB, 3);
+    std::string outputB = "longer expected B";
+    faasmSetOutput(outputB.c_str(), outputB.size());
     return 0;
 }
 
@@ -24,25 +25,29 @@ int main(int argc, char* argv[])
     unsigned int callIdA = faasmChain(otherA, nullptr, 0);
     unsigned int callIdB = faasmChain(otherB, nullptr, 0);
 
-    uint8_t expectedA[5] = { 0, 1, 2, 3, 4 };
-    uint8_t actualA[5] = { 0, 0, 0, 0, 0 };
+    std::string expectedA = "expected A";
+    std::string actualA;
+    actualA.reserve(expectedA.size());
 
-    uint8_t expectedB[3] = { 5, 4, 3 };
-    uint8_t actualB[3] = { 0, 0, 0 };
+    std::string expectedB = "longer expected B";
+    std::string actualB;
+    actualB.reserve(expectedB.size());
 
-    unsigned int resA = faasmAwaitCallOutput(callIdA, actualA, 5);
-    unsigned int resB = faasmAwaitCallOutput(callIdB, actualB, 3);
+    unsigned int resA =
+      faasmAwaitCallOutput(callIdA, actualA.c_str(), actualA.size());
+    unsigned int resB =
+      faasmAwaitCallOutput(callIdB, actualB.c_str(), actualB.size());
 
     if (resA != 0 || resB != 0) {
         printf("One or more chained calls failed: %i %i\n", resA, resB);
         return 1;
     }
 
-    if (!faasm::compareArrays<uint8_t>(actualA, expectedA, 5)) {
+    if (actualA != expectedA) {
         return 1;
     }
 
-    if (!faasm::compareArrays<uint8_t>(actualB, expectedB, 3)) {
+    if (actualB != expectedB) {
         return 1;
     }
 

func/demo/dummy.cpp

@@ -1,13 +1,12 @@
 #include <faasm/faasm.h>
 
+#include <string>
+
 int main(int argc, char* argv[])
 {
-    uint8_t output[5];
-    for (int i = 0; i < 5; i++) {
-        output[i] = (uint8_t)i;
-    }
+    std::string output = "dummy";
 
-    faasmSetOutput(output, 5);
+    faasmSetOutput(output.c_str(), output.size());
 
     return 0;
 }

func/demo/echo.cpp

@@ -15,14 +15,13 @@ int main(int argc, char* argv[])
     // Handle empty input
     if (inputLen == 0) {
         const char* output = "Nothing to echo";
-        auto bytesOutput = reinterpret_cast<const uint8_t*>(output);
-        faasmSetOutput(bytesOutput, strlen(output));
+        faasmSetOutput(output, strlen(output));
         return 0;
     }
 
     printf("Echoing %s\n", inputStr);
 
-    faasmSetOutput(reinterpret_cast<const uint8_t*>(inputStr), inputLen);
+    faasmSetOutput(inputStr, inputLen);
 
     return 0;
 }

func/demo/fibonacci.cpp

@@ -25,9 +25,7 @@ int main(int argc, char* argv[])
 
     std::string output =
       "Fibonacci " + std::to_string(fibNum) + " = " + std::to_string(result);
-    const uint8_t* outputBuffer;
-    outputBuffer = reinterpret_cast<const uint8_t*>(output.c_str());
-    faasmSetOutput(outputBuffer, output.size());
+    faasmSetOutput(output.c_str(), output.size());
 
     return 0;
 }

func/demo/getdents.cpp

@@ -38,8 +38,7 @@ int main(int argc, char* argv[])
 
     closedir(dirp);
 
-    faasmSetOutput(reinterpret_cast<const uint8_t*>(output.c_str()),
-                   output.size());
+    faasmSetOutput(output.c_str(), output.size());
 
     return 0;
 }

func/demo/hello.cpp

@@ -4,7 +4,7 @@ int main(int argc, char* argv[])
 {
     const char* message = "Hello Faasm!";
 
-    faasmSetOutput((uint8_t*)message, 12);
+    faasmSetOutput(message, 12);
 
     return 0;
 }

func/demo/mmap.cpp

@@ -13,7 +13,7 @@ int main(int argc, char* argv[])
     size_t nPages = 3;
     size_t memLen = (nPages * 64 * 1024) + 1234;
 
-    uint8_t outputBuf[1];
+    std::string output;
 
     char* memPtrs[10];
     std::array<std::string, 10> expected;
@@ -53,8 +53,8 @@ int main(int argc, char* argv[])
         }
     }
 
-    outputBuf[0] = 1;
-    faasmSetOutput(outputBuf, 1);
+    output = "success";
+    faasmSetOutput(output.c_str(), output.size());
 
     return 0;
 }