Detect/fix conflicting visibility and fix visibility wrt lua/java bindings

[simgrid.git] / src / mc / mc_process.h

diff --git a/src/mc/mc_process.h b/src/mc/mc_process.h
index 5879580..570d84b 100644 (file)
--- a/src/mc/mc_process.h
+++ b/src/mc/mc_process.h
@@ -1,20 +1,23 @@
-/* Copyright (c) 2008-2014. The SimGrid Team.
+/* Copyright (c) 2008-2015. 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. */
 
-#ifndef MC_PROCESS_H
-#define MC_PROCESS_H
+#ifndef SIMGRID_MC_PROCESS_H
+#define SIMGRID_MC_PROCESS_H
+
+#include <type_traits>
 
-#include <stdbool.h>
 #include <sys/types.h>
 
 #include <vector>
+#include <memory>
 
 #include "simgrid_config.h"
 #include <sys/types.h>
 
+#include <xbt/base.h>
 #include <xbt/mmalloc.h>
 
 #ifdef HAVE_MC
@@ -25,7 +28,7 @@
 #include "simix/popping_private.h"
 #include "simix/smx_private.h"
 
-#include "mc_forward.h"
+#include "mc_forward.hpp"
 #include "mc_base.h"
 #include "mc_mmalloc.h" // std_heap
 #include "mc_memory_map.h"
@@ -61,6 +64,7 @@ public:
   Process(pid_t pid, int sockfd);
   ~Process();
 
+
   bool is_self() const
   {
     return this->process_flags & MC_PROCESS_SELF_FLAG;
@@ -69,7 +73,7 @@ public:
   // Read memory:
   const void* read_bytes(void* buffer, std::size_t size,
     remote_ptr<void> address, int process_index = ProcessIndexAny,
-    ReadMode mode = Normal) const MC_OVERRIDE;
+    ReadMode mode = Normal) const override;
   void read_variable(const char* name, void* target, size_t size) const;
   template<class T>
   T read_variable(const char *name) const
@@ -86,11 +90,11 @@ public:
   void clear_bytes(remote_ptr<void> address, size_t len);
 
   // Debug information:
-  mc_object_info_t find_object_info(remote_ptr<void> addr) const;
-  mc_object_info_t find_object_info_exec(remote_ptr<void> addr) const;
-  mc_object_info_t find_object_info_rw(remote_ptr<void> addr) const;
-  dw_frame_t find_function(remote_ptr<void> ip) const;
-  dw_variable_t find_variable(const char* name) const;
+  std::shared_ptr<simgrid::mc::ObjectInformation> find_object_info(remote_ptr<void> addr) const;
+  std::shared_ptr<simgrid::mc::ObjectInformation> find_object_info_exec(remote_ptr<void> addr) const;
+  std::shared_ptr<simgrid::mc::ObjectInformation> find_object_info_rw(remote_ptr<void> addr) const;
+  simgrid::mc::Frame* find_function(remote_ptr<void> ip) const;
+  simgrid::mc::Variable* find_variable(const char* name) const;
 
   // Heap access:
   xbt_mheap_t get_heap()
@@ -135,6 +139,25 @@ public:
     return status_;
   }
 
+  template<class M>
+  typename std::enable_if< std::is_class<M>::value && std::is_trivial<M>::value, int >::type
+  send_message(M const& m)
+  {
+    return MC_protocol_send(this->socket_, &m, sizeof(M));
+  }
+
+  int send_message(e_mc_message_type message_id)
+  {
+    return MC_protocol_send_simple_message(this->socket_, message_id);
+  }
+
+  template<class M>
+  typename std::enable_if< std::is_class<M>::value && std::is_trivial<M>::value, ssize_t >::type
+  receive_message(M& m)
+  {
+    return MC_receive_message(this->socket_, &m, sizeof(M), 0);
+  }
+
 private:
   void init_memory_map_info();
   void refresh_heap();
@@ -142,22 +165,19 @@ private:
 private:
   mc_process_flags_t process_flags;
   pid_t pid_;
-public: // to be private
-  int socket;
-private:
+  int socket_;
   int status_;
   bool running_;
-  memory_map_t memory_map;
+  std::vector<VmMap> memory_map_;
   remote_ptr<void> maestro_stack_start_, maestro_stack_end_;
   int memory_file;
   std::vector<IgnoredRegion> ignored_regions_;
 
 public: // object info
-  // TODO, make private (first, objectify mc_object_info_t)
-  mc_object_info_t libsimgrid_info;
-  mc_object_info_t binary_info;
-  mc_object_info_t* object_infos;
-  size_t object_infos_size;
+  // TODO, make private (first, objectify simgrid::mc::ObjectInformation*)
+  std::vector<std::shared_ptr<simgrid::mc::ObjectInformation>> object_infos;
+  std::shared_ptr<simgrid::mc::ObjectInformation> libsimgrid_info;
+  std::shared_ptr<simgrid::mc::ObjectInformation> binary_info;
 
 public: // Copies of MCed SMX data structures
   /** Copy of `simix_global->process_list`
@@ -199,7 +219,8 @@ public: // Libunwind-data
   /** Full-featured MC-aware libunwind address space for the process
    *
    *  This address space is using a mc_unw_context_t
-   *  (with mc_process_t/mc_address_space_t and unw_context_t).
+   *  (with simgrid::mc::Process* / simgrid::mc::AddressSpace*
+   *  and unw_context_t).
    */
   unw_addr_space_t unw_addr_space;
 
@@ -218,14 +239,14 @@ public: // Libunwind-data
 
 /** Open a FD to a remote process memory (`/dev/$pid/mem`)
  */
-int open_vm(pid_t pid, int flags);
+XBT_PRIVATE int open_vm(pid_t pid, int flags);
 
 }
 }
 
 SG_BEGIN_DECL()
 
-XBT_INTERNAL void MC_invalidate_cache(void);
+XBT_PRIVATE void MC_invalidate_cache(void);
 
 SG_END_DECL()