From e0c8a97ef8b283365635197b99ae5e67e80e52cf Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Thu, 31 Dec 2015 19:32:57 +0100
Subject: [PATCH] initialize fields at declaration, to improve readability

---
 src/surf/surf_interface.cpp | 11 -----------
 src/surf/surf_interface.hpp | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 5abc5ca995..fe54219dcf 100644
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -687,22 +687,11 @@ namespace surf {
 void Action::initialize(simgrid::surf::Model *model, double cost, bool failed,
                         lmm_variable_t var)
 {
-  m_priority = 1.0;
-  m_refcount = 1;
   m_remains = cost;
-  m_maxDuration = NO_MAX_DURATION;
-  m_finish = -1.0;
   m_start = surf_get_clock();
   m_cost = cost;
   p_model = model;
-  p_data = NULL;
   p_variable = var;
-  m_lastValue = 0;
-  m_lastUpdate = 0;
-  m_hat = NOTSET;
-  p_category = NULL;
-  p_stateHookup.prev = 0;
-  p_stateHookup.next = 0;
   if (failed)
     p_stateSet = getModel()->getFailedActionSet();
   else
diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index 0d322d8106..f175f4c534 100644
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -251,28 +251,28 @@ public:
   /** @brief Get the state set in which the action is */
   ActionList* getStateSet() {return p_stateSet;};
 
-  s_xbt_swag_hookup_t p_stateHookup;
+  s_xbt_swag_hookup_t p_stateHookup = {NULL,NULL};
 
   simgrid::surf::Model *getModel() {return p_model;}
 
 protected:
   ActionList* p_stateSet;
-  double m_priority; /**< priority (1.0 by default) */
-  int    m_refcount;
+  double m_priority = 1.0; /**< priority (1.0 by default) */
+  int    m_refcount = 1;
   double m_remains; /**< How much of that cost remains to be done in the currently running task */
-  double m_maxDuration; /*< max_duration (may fluctuate until the task is completed) */
-  double m_finish; /**< finish time : this is modified during the run and fluctuates until the task is completed */
+  double m_maxDuration = NO_MAX_DURATION; /*< max_duration (may fluctuate until the task is completed) */
+  double m_finish = -1; /**< finish time : this is modified during the run and fluctuates until the task is completed */
 
 private:
   double m_start; /**< start time  */
-  char *p_category;               /**< tracing category for categorized resource utilization monitoring */
+  char *p_category = NULL;            /**< tracing category for categorized resource utilization monitoring */
 
   #ifdef HAVE_LATENCY_BOUND_TRACKING
   int m_latencyLimited;               /**< Set to 1 if is limited by latency, 0 otherwise */
   #endif
   double    m_cost;
   simgrid::surf::Model *p_model;
-  void *p_data; /**< for your convenience */
+  void *p_data = NULL; /**< for your convenience */
 
   /* LMM */
 public:
@@ -290,11 +290,11 @@ public:
 
 protected:
   lmm_variable_t p_variable;
-  double m_lastValue;
-  double m_lastUpdate;
+  double m_lastValue = 0;
+  double m_lastUpdate = 0;
   int m_suspended = 0;
   int m_indexHeap;
-  enum heap_action_type m_hat;
+  enum heap_action_type m_hat = NOTSET;
 };
 
 typedef Action::ActionList ActionList;
-- 
2.20.1