build environment in Docker

common/cpp/include/io/io.h

@@ -7,6 +7,7 @@
 #include <vector>
 #include <chrono>
 #include <thread>
+#include <functional>
 
 #include "common/data_structs.h"
 #include "common/io_error.h"

deploy/docker_buildenv/Ubuntu18.04/Dockerfile

+from ubuntu:18.04
+
+ENV GOPATH /tmp
+
+RUN apt update && apt install -y cmake g++ libcurl4-openssl-dev golang zlib1g-dev python cython python-numpy python3 cython3 python3-numpy
+
+
+RUN apt install -y git
+
+
+ADD build.sh /bin/build.sh
\ No newline at end of file

deploy/docker_buildenv/Ubuntu18.04/build.sh

+#!/usr/bin/env bash
+
+cd /asapo/build
+cmake -DCMAKE_BUILD_TYPE="Debug" ..
+cd worker && make
+cd ../producer && make
+

deploy/docker_buildenv/Ubuntu18.04/build_image.sh

+#!/usr/bin/env bash
+docker build -t yakser/asapo-env:ubuntu18.04 .
+#docker push yakser/asapo-env:ubuntu18.04

tests/manual/performance_broker_receiver/getlast_broker.cpp

@@ -45,54 +45,54 @@ std::vector<std::thread> StartThreads(const Params& params,
                                       std::vector<int>* nbuf,
                                       std::vector<int>* nfiles_total) {
     auto exec_next = [&params, nfiles, errors, nbuf, nfiles_total](int i) {
-      asapo::FileInfo fi;
-      Error err;
-      auto broker = asapo::DataBrokerFactory::CreateServerBroker(params.server, params.file_path, params.beamtime_id,
-                                                                 params.token, &err);
-      broker->SetTimeout((uint64_t) params.timeout_ms);
-      asapo::FileData data;
-
-      lock.lock();
-
-      if (group_id.empty()) {
-          group_id = broker->GenerateNewGroupId(&err);
-          if (err) {
-              (*errors)[i] += ProcessError(err);
-              return;
-          }
-      }
-
-      lock.unlock();
-
-      auto start = system_clock::now();
-      while (std::chrono::duration_cast<std::chrono::milliseconds>(system_clock::now() - start).count() <
-          params.timeout_ms) {
-          if (params.datasets) {
-              auto dataset = broker->GetLastDataset(group_id, &err);
-              if (err == nullptr) {
-                  for (auto& fi : dataset.content) {
-                      (*nbuf)[i] += fi.buf_id == 0 ? 0 : 1;
-                      (*nfiles_total)[i]++;
-                  }
-              }
-          } else {
-              err = broker->GetLast(&fi, group_id, params.read_data ? &data : nullptr);
-              if (err == nullptr) {
-                  (*nbuf)[i] += fi.buf_id == 0 ? 0 : 1;
-                  if (params.read_data && (*nfiles)[i] < 10 && fi.size < 10) {
-                      data[9] = 0;
-                      std::cout << "Received: " << reinterpret_cast<char const*>(data.get()) << std::endl;
-                  }
-              }
-          }
-          if (err) {
-              (*errors)[i] += ProcessError(err);
-              if (err == asapo::IOErrorTemplates::kTimeout) {
-                  break;
-              }
-          }
-          (*nfiles)[i]++;
-      }
+        asapo::FileInfo fi;
+        Error err;
+        auto broker = asapo::DataBrokerFactory::CreateServerBroker(params.server, params.file_path, params.beamtime_id,
+                      params.token, &err);
+        broker->SetTimeout((uint64_t) params.timeout_ms);
+        asapo::FileData data;
+
+        lock.lock();
+
+        if (group_id.empty()) {
+            group_id = broker->GenerateNewGroupId(&err);
+            if (err) {
+                (*errors)[i] += ProcessError(err);
+                return;
+            }
+        }
+
+        lock.unlock();
+
+        auto start = system_clock::now();
+        while (std::chrono::duration_cast<std::chrono::milliseconds>(system_clock::now() - start).count() <
+                params.timeout_ms) {
+            if (params.datasets) {
+                auto dataset = broker->GetLastDataset(group_id, &err);
+                if (err == nullptr) {
+                    for (auto& fi : dataset.content) {
+                        (*nbuf)[i] += fi.buf_id == 0 ? 0 : 1;
+                        (*nfiles_total)[i]++;
+                    }
+                }
+            } else {
+                err = broker->GetLast(&fi, group_id, params.read_data ? &data : nullptr);
+                if (err == nullptr) {
+                    (*nbuf)[i] += fi.buf_id == 0 ? 0 : 1;
+                    if (params.read_data && (*nfiles)[i] < 10 && fi.size < 10) {
+                        data[9] = 0;
+                        std::cout << "Received: " << reinterpret_cast<char const*>(data.get()) << std::endl;
+                    }
+                }
+            }
+            if (err) {
+                (*errors)[i] += ProcessError(err);
+                if (err == asapo::IOErrorTemplates::kTimeout) {
+                    break;
+                }
+            }
+            (*nfiles)[i]++;
+        }
     };
 
     std::vector<std::thread> threads;
@@ -131,7 +131,7 @@ int main(int argc, char* argv[]) {
     params.datasets = false;
     if (argc != 8 && argc != 9) {
         std::cout << "Usage: " + std::string{argv[0]}
-            + " <server> <files_path> <run_name> <nthreads> <token> <timeout ms> <metaonly> [use datasets]"
+                  + " <server> <files_path> <run_name> <nthreads> <token> <timeout ms> <metaonly> [use datasets]"
                   <<
                   std::endl;
         exit(EXIT_FAILURE);