X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/20725839bfdac54bf58497e0c34705ba37f19265..cf71783d4bf34090b9ba489365fcf85b22b04e50:/src/mc/mc_global.cpp

diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index 6b9b8e7126..da49931e86 100644
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -47,24 +47,24 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc,
 
 e_mc_mode_t mc_mode;
 
-double *mc_time = NULL;
+double *mc_time = nullptr;
 
 #ifdef HAVE_MC
 int user_max_depth_reached = 0;
 
 /* MC global data structures */
-mc_state_t mc_current_state = NULL;
+mc_state_t mc_current_state = nullptr;
 char mc_replay_mode = FALSE;
 
-mc_stats_t mc_stats = NULL;
-mc_global_t initial_global_state = NULL;
-xbt_fifo_t mc_stack = NULL;
+mc_stats_t mc_stats = nullptr;
+mc_global_t initial_global_state = nullptr;
+xbt_fifo_t mc_stack = nullptr;
 
 /* Liveness */
-xbt_automaton_t _mc_property_automaton = NULL;
+xbt_automaton_t _mc_property_automaton = nullptr;
 
 /* Dot output */
-FILE *dot_output = NULL;
+FILE *dot_output = nullptr;
 const char *colors[13];
 
 
@@ -90,7 +90,7 @@ void MC_init_dot_output()
 
   dot_output = fopen(_sg_mc_dot_output_file, "w");
 
-  if (dot_output == NULL) {
+  if (dot_output == nullptr) {
     perror("Error open dot output file");
     xbt_abort();
   }
@@ -186,7 +186,7 @@ void MC_replay(xbt_fifo_t stack)
 {
   int value, count = 1;
   char *req_str;
-  smx_simcall_t req = NULL, saved_req = NULL;
+  smx_simcall_t req = nullptr, saved_req = NULL;
   xbt_fifo_item_t item, start_item;
   mc_state_t state;
   
@@ -253,7 +253,7 @@ void MC_replay(xbt_fifo_t stack)
       MC_simcall_handle(req, value);
 
       if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
-        MC_handle_comm_pattern(call, req, value, NULL, 1);
+        MC_handle_comm_pattern(call, req, value, nullptr, 1);
 
       mc_model_checker->wait_for_requests();
 
@@ -272,9 +272,9 @@ void MC_replay(xbt_fifo_t stack)
 void MC_replay_liveness(xbt_fifo_t stack)
 {
   xbt_fifo_item_t item;
-  mc_pair_t pair = NULL;
-  mc_state_t state = NULL;
-  smx_simcall_t req = NULL, saved_req = NULL;
+  mc_pair_t pair = nullptr;
+  mc_state_t state = nullptr;
+  smx_simcall_t req = nullptr, saved_req = NULL;
   int value, depth = 1;
   char *req_str;
 
@@ -306,7 +306,7 @@ void MC_replay_liveness(xbt_fifo_t stack)
 
         saved_req = MC_state_get_executed_request(state, &value);
 
-        if (saved_req != NULL) {
+        if (saved_req != nullptr) {
           /* because we got a copy of the executed request, we have to fetch the
              real one, pointed by the request field of the issuer process */
           const smx_process_t issuer = MC_smx_simcall_get_issuer(saved_req);
@@ -347,7 +347,7 @@ void MC_dump_stack_safety(xbt_fifo_t stack)
   
   mc_state_t state;
 
-  while ((state = (mc_state_t) xbt_fifo_pop(stack)) != NULL)
+  while ((state = (mc_state_t) xbt_fifo_pop(stack)) != nullptr)
     MC_state_delete(state, !state->in_visited_states ? 1 : 0);
 }
 
@@ -358,7 +358,7 @@ void MC_show_stack_safety(xbt_fifo_t stack)
   mc_state_t state;
   xbt_fifo_item_t item;
   smx_simcall_t req;
-  char *req_str = NULL;
+  char *req_str = nullptr;
 
   for (item = xbt_fifo_get_last_item(stack);
        item; item = xbt_fifo_get_prev_item(item)) {
@@ -374,7 +374,7 @@ void MC_show_stack_safety(xbt_fifo_t stack)
 
 void MC_show_deadlock(smx_simcall_t req)
 {
-  /*char *req_str = NULL; */
+  /*char *req_str = nullptr; */
   XBT_INFO("**************************");
   XBT_INFO("*** DEAD-LOCK DETECTED ***");
   XBT_INFO("**************************");
@@ -403,7 +403,7 @@ void MC_show_stack_liveness(xbt_fifo_t stack)
   mc_pair_t pair;
   xbt_fifo_item_t item;
   smx_simcall_t req;
-  char *req_str = NULL;
+  char *req_str = nullptr;
 
   for (item = xbt_fifo_get_last_item(stack);
        item; item = xbt_fifo_get_prev_item(item)) {
@@ -421,7 +421,7 @@ void MC_show_stack_liveness(xbt_fifo_t stack)
 void MC_dump_stack_liveness(xbt_fifo_t stack)
 {
   mc_pair_t pair;
-  while ((pair = (mc_pair_t) xbt_fifo_pop(stack)) != NULL)
+  while ((pair = (mc_pair_t) xbt_fifo_pop(stack)) != nullptr)
     MC_pair_delete(pair);
 }
 
@@ -449,11 +449,11 @@ void MC_print_statistics(mc_stats_t stats)
     XBT_INFO("Visited pairs = %lu", stats->visited_pairs);
   }
   XBT_INFO("Executed transitions = %lu", stats->executed_transitions);
-  if ((_sg_mc_dot_output_file != NULL) && (_sg_mc_dot_output_file[0] != '\0')) {
+  if ((_sg_mc_dot_output_file != nullptr) && (_sg_mc_dot_output_file[0] != '\0')) {
     fprintf(dot_output, "}\n");
     fclose(dot_output);
   }
-  if (initial_global_state != NULL && (_sg_mc_comms_determinism || _sg_mc_send_determinism)) {
+  if (initial_global_state != nullptr && (_sg_mc_comms_determinism || _sg_mc_send_determinism)) {
     XBT_INFO("Send-deterministic : %s", !initial_global_state->send_deterministic ? "No" : "Yes");
     if (_sg_mc_comms_determinism)
       XBT_INFO("Recv-deterministic : %s", !initial_global_state->recv_deterministic ? "No" : "Yes");
@@ -466,7 +466,7 @@ void MC_print_statistics(mc_stats_t stats)
 
 void MC_automaton_load(const char *file)
 {
-  if (_mc_property_automaton == NULL)
+  if (_mc_property_automaton == nullptr)
     _mc_property_automaton = xbt_automaton_new();
 
   xbt_automaton_load(_mc_property_automaton, file);
@@ -510,7 +510,7 @@ static void MC_dump_stacks(FILE* file)
 double MC_process_clock_get(smx_process_t process)
 {
   if (mc_time) {
-    if (process != NULL)
+    if (process != nullptr)
       return mc_time[process->pid];
     else
       return -1;