/* 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. */
char* state_id_src;
static void new_state(char* id, int src){
-
+ char* saveptr; // 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);
}
static void new_transition(char* id, xbt_automaton_exp_label_t label)
{
- xbt_automaton_state_t state_dst = NULL;
new_state(id, 0);
- state_dst = xbt_automaton_state_exists(parsed_automaton, id);
+ xbt_automaton_state_t state_dst = xbt_automaton_state_exists(parsed_automaton, id);
xbt_automaton_state_t state_src = xbt_automaton_state_exists(parsed_automaton, state_id_src);
-
+
//xbt_transition_t trans = NULL;
xbt_automaton_transition_new(parsed_automaton, state_src, state_dst, label);