Commit 1c96b263 authored by Mathieu Faverge's avatar Mathieu Faverge

Fix issue #5 Thanks @jjazeix

parent a6f2c4cf
...@@ -381,7 +381,7 @@ int OTFTraceBuilderThread::handler_marker(OTF_Trace_builder_struct* tb_struct) { ...@@ -381,7 +381,7 @@ int OTFTraceBuilderThread::handler_marker(OTF_Trace_builder_struct* tb_struct) {
//Error::set(Error::VITE_ERR_UNKNOWN_CONTAINER + temp_counter_group._name, Error::VITE_ERRCODE_ERROR); //Error::set(Error::VITE_ERR_UNKNOWN_CONTAINER + temp_counter_group._name, Error::VITE_ERRCODE_ERROR);
} }
t->new_event(d, event_type, temp_container, extra_fields); t->new_event(d, event_type, temp_container, str_event, extra_fields);
return OTF_RETURN_OK; return OTF_RETURN_OK;
} }
......
...@@ -860,7 +860,7 @@ int ParserEventOTF::handler_Marker(void *trace, ...@@ -860,7 +860,7 @@ int ParserEventOTF::handler_Marker(void *trace,
//Error::set(Error::VITE_ERR_UNKNOWN_CONTAINER + temp_counter_group._name, Error::VITE_ERRCODE_ERROR); //Error::set(Error::VITE_ERR_UNKNOWN_CONTAINER + temp_counter_group._name, Error::VITE_ERRCODE_ERROR);
} }
t->new_event(d, event_type, temp_container, extra_fields); t->new_event(d, event_type, temp_container, str_event, extra_fields);
return OTF_RETURN_OK; return OTF_RETURN_OK;
} }
......
...@@ -499,7 +499,7 @@ void ParserEventPaje::store_event(const PajeLine *line, ...@@ -499,7 +499,7 @@ void ParserEventPaje::store_event(const PajeLine *line,
Error::set(Error::VITE_ERR_UNKNOWN_CONTAINER + container.to_string(), line->_id, Error::VITE_ERRCODE_ERROR); Error::set(Error::VITE_ERR_UNKNOWN_CONTAINER + container.to_string(), line->_id, Error::VITE_ERRCODE_ERROR);
} }
else{ else{
trace.new_event(time, temp_event_type, temp_container, extra_fields); trace.new_event(time, temp_event_type, temp_container, value_string, extra_fields);
} }
} }
break; break;
......
...@@ -323,7 +323,7 @@ int ParserTau::event_triggered(void *trace, double time, unsigned int nodeToken, ...@@ -323,7 +323,7 @@ int ParserTau::event_triggered(void *trace, double time, unsigned int nodeToken,
} }
t->new_event(d, event_type, current_container, opt); t->new_event(d, event_type, current_container, value_string, opt);
//printf("EventTrigger: time %g, nid %d tid %d event id %d triggered value %lld \n", time, nodeToken, threadToken, userEventToken, userEventValue); //printf("EventTrigger: time %g, nid %d tid %d event id %d triggered value %lld \n", time, nodeToken, threadToken, userEventToken, userEventValue);
return 0; return 0;
......
...@@ -334,9 +334,9 @@ void Trace::reset_state(Date &time, StateType *type, Container *container, map<s ...@@ -334,9 +334,9 @@ void Trace::reset_state(Date &time, StateType *type, Container *container, map<s
delete_opt(opt); delete_opt(opt);
} }
void Trace::new_event(Date &time, EventType *type, Container *container, map<string, Value *> &opt) { void Trace::new_event(Date &time, EventType *type, Container *container, const String &value, map<string, Value *> &opt) {
if (container && type) { if (container && type) {
EntityValue *EV = search_entity_value( type->get_alias(), type ); EntityValue *EV = search_entity_value( value.to_string(), type, true );
assert(EV); assert(EV);
container->new_event(time, type, EV, opt); container->new_event(time, type, EV, opt);
} }
......
...@@ -245,7 +245,7 @@ public : ...@@ -245,7 +245,7 @@ public :
* \param value Value of the event * \param value Value of the event
* \param opt Extra fields * \param opt Extra fields
*/ */
void new_event(Date &time, EventType *type, Container *container, std::map<std::string, Value *> &opt); void new_event(Date &time, EventType *type, Container *container, const String &value, std::map<std::string, Value *> &opt);
/*! /*!
* \brief Set the value of a variable * \brief Set the value of a variable
......
...@@ -311,7 +311,8 @@ void TraceBuilderThread::new_event(Trace_builder_struct* tb_struct){ ...@@ -311,7 +311,8 @@ void TraceBuilderThread::new_event(Trace_builder_struct* tb_struct){
} }
else{ else{
tb_struct->_trace->new_event( tb_struct->time, temp_event_type, tb_struct->_trace->new_event( tb_struct->time, temp_event_type,
temp_container, tb_struct->extra_fields ); temp_container, tb_struct->value_string,
tb_struct->extra_fields );
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment