A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model-checker : new comparison of region (program data and libsimgrid data)
[simgrid.git]
/
src
/
mc
/
mc_global.c
diff --git
a/src/mc/mc_global.c
b/src/mc/mc_global.c
index
68f11cd
..
9190600
100644
(file)
--- a/
src/mc/mc_global.c
+++ b/
src/mc/mc_global.c
@@
-1,14
+1,19
@@
+/* Copyright (c) 2008-2012 Da 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. */
+
#include <unistd.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/time.h>
#include "../surf/surf_private.h"
#include <unistd.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/time.h>
#include "../surf/surf_private.h"
-#include "../simix/private.h"
+#include "../simix/
smx_
private.h"
#include "xbt/fifo.h"
#include "xbt/fifo.h"
-#include "private.h"
-
+#include "mc_private.h"
+XBT_LOG_NEW_CATEGORY(mc, "All MC categories");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc,
"Logging specific to MC (global)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc,
"Logging specific to MC (global)");
@@
-185,7
+190,7
@@
void MC_wait_for_requests(void)
SIMIX_process_runall();
xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
req = &process->simcall;
SIMIX_process_runall();
xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
req = &process->simcall;
- if (req->call !=
REQ_NO_REQ
&& !MC_request_is_visible(req))
+ if (req->call !=
SIMCALL_NONE
&& !MC_request_is_visible(req))
SIMIX_simcall_pre(req, 0);
}
}
SIMIX_simcall_pre(req, 0);
}
}
@@
-198,7
+203,7
@@
int MC_deadlock_check()
if(xbt_swag_size(simix_global->process_list)){
deadlock = TRUE;
xbt_swag_foreach(process, simix_global->process_list){
if(xbt_swag_size(simix_global->process_list)){
deadlock = TRUE;
xbt_swag_foreach(process, simix_global->process_list){
- if(process->simcall.call !=
REQ_NO_REQ
+ if(process->simcall.call !=
SIMCALL_NONE
&& MC_request_is_enabled(&process->simcall)){
deadlock = FALSE;
break;
&& MC_request_is_enabled(&process->simcall)){
deadlock = FALSE;
break;
@@
-580,7
+585,7
@@
void MC_diff(void){
int i;
int i;
- XBT_INFO("Number of regions : %
d
", sn->num_reg);
+ XBT_INFO("Number of regions : %
u
", sn->num_reg);
for(i=0; i<sn->num_reg; i++){
for(i=0; i<sn->num_reg; i++){