/* methods for implementation of automaton from promela description */
-/* Copyright (c) 2011-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2011-2017. 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. */
#if HAVE_UNISTD_H
# include <unistd.h> /* isatty */
#endif
+#include <xbt/log.h>
+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_automaton);
static xbt_automaton_t parsed_automaton;
char* state_id_src;
static void new_state(char* id, int src){
-
+ char* saveptr = NULL; // for strtok_r()
char* id_copy = xbt_strdup(id);
- char* first_part = strtok(id_copy,"_");
+ char* first_part = strtok_r(id_copy, "_", &saveptr);
int type = 0 ; // -1=initial state; 0=intermediate state; 1=final state
if(strcmp(first_part,"accept")==0){
type = 1;
}else{
- char* second_part = strtok(NULL,"_");
+ char* second_part = strtok_r(NULL, "_", &saveptr);
if(strcmp(second_part,"init")==0){
type = -1;
}
}
free(id_copy);
- xbt_automaton_state_t state = NULL;
- state = xbt_automaton_state_exists(parsed_automaton, id);
+ xbt_automaton_state_t state = xbt_automaton_state_exists(parsed_automaton, id);
if(state == NULL){
state = xbt_automaton_state_new(parsed_automaton, type, id);
}
case 4 :
label = xbt_automaton_exp_label_new(type);
break;
+ default:
+ XBT_DEBUG("Invalid type: %d", type);
+ break;
}
va_end(ap);
return label;