Add new entry in Release_Notes.

[simgrid.git] / src / mc / remote / Channel.hpp

diff --git a/src/mc/remote/Channel.hpp b/src/mc/remote/Channel.hpp
index 0acbf15..06d22b1 100644 (file)
--- a/src/mc/remote/Channel.hpp
+++ b/src/mc/remote/Channel.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2023. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -10,8 +10,7 @@
 
 #include <type_traits>
 
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
 
 /** A channel for exchanging messages between model-checker and model-checked app
  *
@@ -20,51 +19,45 @@ namespace mc {
  */
 class Channel {
   int socket_ = -1;
-  template <class M> static constexpr bool messageType()
-  {
-    return std::is_class<M>::value && std::is_trivial<M>::value;
-  }
+  template <class M> static constexpr bool messageType() { return std::is_class_v<M> && std::is_trivial_v<M>; }
+  std::vector<char> buffer_;
 
 public:
   Channel() = default;
   explicit Channel(int sock) : socket_(sock) {}
+  Channel(int sock, Channel const& other);
   ~Channel();
 
   // No copy:
   Channel(Channel const&) = delete;
   Channel& operator=(Channel const&) = delete;
 
-  // Move:
-  Channel(Channel&& that) : socket_(that.socket_) { that.socket_ = -1; }
-  Channel& operator=(Channel&& that)
-  {
-    std::swap(this->socket_, that.socket_);
-    return *this;
-  }
-
   // Send
   int send(const void* message, size_t size) const;
-  int send(e_mc_message_type type) const
+  int send(MessageType type) const
   {
     s_mc_message_t message = {type};
     return this->send(&message, sizeof(message));
   }
   /** @brief Send a message; returns 0 on success or errno on failure */
-  template <class M> typename std::enable_if<messageType<M>(), int>::type send(M const& m) const
+  template <class M> typename std::enable_if_t<messageType<M>(), int> send(M const& m) const
   {
     return this->send(&m, sizeof(M));
   }
 
   // Receive
-  ssize_t receive(void* message, size_t size, bool block = true) const;
-  template <class M> typename std::enable_if<messageType<M>(), ssize_t>::type receive(M& m) const
+  ssize_t receive(void* message, size_t size, int flags = 0);
+  template <class M> typename std::enable_if_t<messageType<M>(), ssize_t> receive(M& m)
   {
-    return this->receive(&m, sizeof(M));
+    return this->receive(&m, sizeof(M), 0);
   }
+  void reinject(const char* data, size_t size);
+  bool has_pending_data() const { return not buffer_.empty(); }
 
+  // Socket handling
   int get_socket() const { return socket_; }
+  void reset_socket(int socket) { socket_ = socket; }
 };
-}
-}
+} // namespace simgrid::mc
 
 #endif