Merge branch 'feedback_DR' of gitlab.irit.fr:sepia-pub/mael/batmen into feedback_DR

default.nix

@@ -31,7 +31,7 @@ let
       ];
       mesonFlags = []
         ++ pkgs.lib.optional doCoverage [ "-Db_coverage=true" ];
-      nativeBuildInputs = with kapack; [pkgs.meson pkgs.ninja pkgs.pkgconfig
+      nativeBuildInputs = with kapack; [pkgs.meson pkgs.ninja pkgs.pkg-config
         pkgs.boost pkgs.gmp pkgs.rapidjson intervalset loguru pkgs.cppzmq pkgs.zeromq];
       # Debug build, without any Nix stripping magic.
       mesonBuildType = "debug";

meson.build

 project('batmen', 'cpp',
     version: '1.0',
     license: 'LGPLv3',
-    default_options: ['cpp_std=c++11'],
+    default_options: ['cpp_std=c++14'],
     meson_version: '>=0.40.0'
 )
 

src/network.cpp

@@ -32,17 +32,13 @@ void Network::bind(const std::string &socket_endpoint)
 
 void Network::write(const string &content)
 {
-    // Let's make sure the sent message is in UTF-8
-    string msg_utf8 = boost::locale::conv::to_utf<char>(content, "UTF-8");
-
-    LOG_F(INFO, "Sending '%s'", msg_utf8.c_str());
-    _socket->send(msg_utf8.data(), msg_utf8.size());
+    _socket->send(zmq::buffer(content), zmq::send_flags::none);
 }
 
 void Network::read(string &received_content)
 {
     zmq::message_t message;
-    _socket->recv(&message);
+    _socket->recv(message, zmq::recv_flags::none);
 
     received_content = string((char*)message.data(), message.size());
 

src/users/user_description_file_template.json

@@ -107,7 +107,7 @@
         },
         {
             "name": "kalvin",
-            "category": "feedback_user_think_time_only",
+            "category": "fb_user_think_time_only",
             "param": {
                 "input_json": "kalvin.SABjson"
             }

test/test_schedulers_mono.py

@@ -26,8 +26,9 @@ def test_fcfs(platform_monoC, workload_static):
 
     # Checks that the jobs have been executed in FCFS order
     jobs = pd.read_csv(f"{output_dir}/_jobs.csv")
+    jobs = jobs[jobs.success==1]
     jobs.sort_values(by="submission_time", inplace=True)
-    assert jobs[jobs.success==1].starting_time.is_monotonic_increasing
+    assert jobs.starting_time.is_monotonic_increasing
 
 def test_easy_bf_small_instance():
     """Tests the scheduler easy backfilling on a small instance"""