From f2c3f7af6f29c9534c66782fa25cc75d41a49f99 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Thu, 16 Feb 2017 02:53:45 +0100
Subject: [PATCH] simplify code by using default values for the fields

---
 src/simix/ActorImpl.cpp | 13 +------------
 src/simix/ActorImpl.hpp |  6 +++---
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp
index 81b03ef834..8f372df05e 100644
--- a/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@ -178,7 +178,6 @@ void create_maestro(std::function<void()> code)
   /* Create maestro process and initialize it */
   maestro = new simgrid::simix::ActorImpl();
   maestro->pid = simix_process_maxpid++;
-  maestro->ppid = -1;
   maestro->name = "";
   maestro->data = nullptr;
 
@@ -237,10 +236,7 @@ smx_actor_t SIMIX_process_create(
   process->name           = simgrid::xbt::string(name);
   process->host           = host;
   process->data           = data;
-  process->comms          = xbt_fifo_new();
   process->simcall.issuer = process;
-  /* Initiliaze data segment to default value */
-  SIMIX_segment_index_set(process, -1);
 
   if (parent_process != nullptr) {
     process->ppid = parent_process->pid;
@@ -254,11 +250,8 @@ smx_actor_t SIMIX_process_create(
       }
     }
 #endif
-  } else {
-    process->ppid = -1;
   }
 
-  process->auto_restart = false;
   process->code         = code;
 
   XBT_VERB("Create context %s", process->name.c_str());
@@ -304,11 +297,8 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn
   process->name = std::string(name);
   process->host = host;
   process->data = data;
-  process->comms = xbt_fifo_new();
   process->simcall.issuer = process;
-  process->ppid = -1;
-  /* Initiliaze data segment to default value */
-  SIMIX_segment_index_set(process, -1);
+
   if (parent_process != nullptr) {
     process->ppid = parent_process->pid;
     /* SMPI process have their own data segment and each other inherit from their father */
@@ -324,7 +314,6 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn
   }
 
   /* Process data for auto-restart */
-  process->auto_restart = false;
   process->code = nullptr;
 
   XBT_VERB("Create context %s", process->name.c_str());
diff --git a/src/simix/ActorImpl.hpp b/src/simix/ActorImpl.hpp
index 5c40a41841..aa24068b89 100644
--- a/src/simix/ActorImpl.hpp
+++ b/src/simix/ActorImpl.hpp
@@ -41,7 +41,7 @@ public:
   s_xbt_swag_hookup_t destroy_hookup   = { nullptr, nullptr }; /* simix_global->process_to_destroy */
 
   unsigned long pid  = 0;
-  unsigned long ppid = 0;
+  unsigned long ppid = -1;
   simgrid::xbt::string name;
   const char* cname() { return name.c_str(); }
   sg_host_t host        = nullptr; /* the host on which the process is running */
@@ -56,7 +56,7 @@ public:
 
   sg_host_t new_host            = nullptr; /* if not null, the host on which the process must migrate to */
   smx_activity_t waiting_synchro = nullptr; /* the current blocking synchro if any */
-  xbt_fifo_t comms              = nullptr; /* the current non-blocking communication synchros */
+  xbt_fifo_t comms               = xbt_fifo_new(); /* the current non-blocking communication synchros */
   xbt_dict_t properties         = nullptr;
   s_smx_simcall_t simcall;
   void *data          = nullptr; /* kept for compatibility, it should be replaced with moddata */
@@ -64,7 +64,7 @@ public:
 
   std::function<void()> code;
   smx_timer_t kill_timer = nullptr;
-  int segment_index      = 0; /* Reference to an SMPI process' data segment. Default value is -1 if not in SMPI context*/
+  int segment_index = -1; /* Reference to an SMPI process' data segment. Default value is -1 if not in SMPI context*/
 
   friend void intrusive_ptr_add_ref(ActorImpl* process)
   {
-- 
2.20.1