diff options
| -rw-r--r-- | default.nix | 2 | ||||
| -rw-r--r-- | modules/io/c++/io_unix.cpp | 4 | ||||
| -rw-r--r-- | modules/io/examples/echo_server.cpp | 2 | ||||
| -rw-r--r-- | modules/io_codec/examples/peer_echo_client.cpp | 2 | ||||
| -rw-r--r-- | modules/io_codec/examples/peer_echo_server.cpp | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/default.nix b/default.nix index 1018ce8..b7d696f 100644 --- a/default.nix +++ b/default.nix @@ -167,7 +167,6 @@ in rec { forstio.codec-netcdf forstio.io forstio.io_codec - forstio.io-tls forstio.remote forstio.remote-filesystem forstio.crypto @@ -177,6 +176,7 @@ in rec { unstable = pkgs.symlinkJoin { name = "forstio-unstable-${version}"; paths = [ + forstio.io-tls forstio.remote-sycl forstio.remote-thread # forstio.codec-minecraft diff --git a/modules/io/c++/io_unix.cpp b/modules/io/c++/io_unix.cpp index 37af107..a715535 100644 --- a/modules/io/c++/io_unix.cpp +++ b/modules/io/c++/io_unix.cpp @@ -18,6 +18,7 @@ #include <errno.h> #include <unistd.h> +#include <chrono> #include <queue> #include <sstream> #include <unordered_map> @@ -213,7 +214,8 @@ public: void wait_until(uint64_t nanosec) override { auto now = std::chrono::steady_clock::now(); - std::chrono::steady_clock::time_point time_point = nanosec; + std::chrono::steady_clock::time_point tp; + std::chrono::steady_clock::time_point time_point = tp + std::chrono::nanoseconds{nanosec}; if (time_point <= now) { poll(); } else { diff --git a/modules/io/examples/echo_server.cpp b/modules/io/examples/echo_server.cpp index aa052a0..4336048 100644 --- a/modules/io/examples/echo_server.cpp +++ b/modules/io/examples/echo_server.cpp @@ -156,7 +156,7 @@ int main(){ wait_scope.poll(); while(keep_running){ - wait_scope.wait(std::chrono::seconds{5}); + wait_scope.wait_for(1*1000*1000); } std::cout<<"\n\nShutting down echo server"<<std::endl; diff --git a/modules/io_codec/examples/peer_echo_client.cpp b/modules/io_codec/examples/peer_echo_client.cpp index 16ece9b..7cd6fe7 100644 --- a/modules/io_codec/examples/peer_echo_client.cpp +++ b/modules/io_codec/examples/peer_echo_client.cpp @@ -123,7 +123,7 @@ int main(int argc, char** argv){ }).detach(); while(keep_running){ - wait.wait(std::chrono::seconds{1u}); + wait.wait_for(1000*1000); } return 0; diff --git a/modules/io_codec/examples/peer_echo_server.cpp b/modules/io_codec/examples/peer_echo_server.cpp index 1849517..5670953 100644 --- a/modules/io_codec/examples/peer_echo_server.cpp +++ b/modules/io_codec/examples/peer_echo_server.cpp @@ -92,7 +92,7 @@ int main(){ }).detach(); while(keep_running){ - wait.wait(std::chrono::seconds{1u}); + wait.wait_for(1u*1000*1000); } return 0; |