diff --git a/default.nix b/default.nix index f7a9eeb4dd6b8ec9c2a67b05080c7e204774aa88..8dfdba47202d85edc1a3380bce6b9da8eeb97b58 100644 --- a/default.nix +++ b/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"; diff --git a/meson.build b/meson.build index 74b894fe3872bfbb64bc4e777a2a600222edb4b8..e2d3f05b2c64de4f3b081a78fec731a8ef86c6df 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ 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' ) diff --git a/src/network.cpp b/src/network.cpp index 8d43f73aebd49d35ea5d6071a225c7642b044266..0ad5656f090a56d0d46210d8f9e3102fcfc96810 100644 --- a/src/network.cpp +++ b/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()); diff --git a/src/users/user_description_file_template.json b/src/users/user_description_file_template.json index a1f2cc2b439bc855a1fc8869ee4a6db38716832c..71e8cbf39488268ca546718116d91b6066039617 100644 --- a/src/users/user_description_file_template.json +++ b/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" } diff --git a/test/test_schedulers_mono.py b/test/test_schedulers_mono.py index 0e85977b01abbef599b45d9a91421073b6f99ed6..0ab0d6493337fa307980643eded77848a730a5df 100755 --- a/test/test_schedulers_mono.py +++ b/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"""