diff --git a/src/apex/perftool_implementation.cpp b/src/apex/perftool_implementation.cpp index 8db2bb15..f30deb66 100644 --- a/src/apex/perftool_implementation.cpp +++ b/src/apex/perftool_implementation.cpp @@ -15,59 +15,73 @@ std::mutex my_mutex; extern "C" { // library function declarations - void ps_initialize(void) { + void ps_tool_initialize(void) { apex_init("PerfStubs API", 0, 1); } - void ps_register_thread(void) { + void ps_tool_register_thread(void) { apex_register_thread("PerfStubs Thread"); } - void ps_finalize(void) { + void ps_tool_finalize(void) { apex_exit_thread(); } - void ps_dump_data(void) { + void ps_tool_dump_data(void) { apex_dump(false); } // measurement function declarations - void* ps_timer_create(const char *timer_name) { + void* ps_tool_timer_create(const char *timer_name) { return strdup(timer_name); } - void ps_timer_start(const void *timer) { + void ps_tool_timer_start(const void *timer) { apex_start(APEX_NAME_STRING, const_cast(timer)); } - void ps_timer_stop(const void *timer) { + void ps_tool_timer_stop(const void *timer) { APEX_UNUSED(timer); apex_stop(apex::thread_instance::instance().get_current_profiler()); } - void ps_dynamic_phase_start(const char *iteration_prefix, + void ps_tool_start_string(const char *timer) { + apex_start(APEX_NAME_STRING, const_cast(timer)); + } + void ps_tool_stop_string(const char *timer) { + APEX_UNUSED(timer); + apex_stop(apex::thread_instance::instance().get_current_profiler()); + } + void ps_tool_stop_current(void) { + apex_stop(apex::thread_instance::instance().get_current_profiler()); + } + void ps_tool_set_parameter(const char * name, int64_t value) { + APEX_UNUSED(name); + APEX_UNUSED(value); + } + void ps_tool_dynamic_phase_start(const char *iteration_prefix, int iteration_number) { std::stringstream ss; ss << iteration_prefix << " " << iteration_number; apex_start(APEX_NAME_STRING, (void*)const_cast(ss.str().c_str())); } - void ps_dynamic_phase_stop(const char *iteration_prefix, + void ps_tool_dynamic_phase_stop(const char *iteration_prefix, int iteration_number) { APEX_UNUSED(iteration_prefix); APEX_UNUSED(iteration_number); apex_stop(apex::thread_instance::instance().get_current_profiler()); } - void* ps_create_counter(const char *counter_name) { + void* ps_tool_create_counter(const char *counter_name) { return (void*)(strdup(counter_name)); } - void ps_sample_counter(const void *counter, double value) { + void ps_tool_sample_counter(const void *counter, double value) { apex_sample_value((const char *)(counter), value); } - void ps_set_metadata(const char *name, const char *value) { + void ps_tool_set_metadata(const char *name, const char *value) { APEX_UNUSED(name); APEX_UNUSED(value); // do nothing } // data query function declarations - void ps_get_timer_data(ps_tool_timer_data_t *timer_data) { + void ps_tool_get_timer_data(ps_tool_timer_data_t *timer_data) { memset(timer_data, 0, sizeof(ps_tool_timer_data_t)); } - void ps_free_timer_data(ps_tool_timer_data_t *timer_data) { + void ps_tool_free_timer_data(ps_tool_timer_data_t *timer_data) { if (timer_data == nullptr) { return; @@ -88,10 +102,10 @@ extern "C" { timer_data->values = nullptr; } } - void ps_get_counter_data(ps_tool_counter_data_t *counter_data) { + void ps_tool_get_counter_data(ps_tool_counter_data_t *counter_data) { memset(counter_data, 0, sizeof(ps_tool_counter_data_t)); } - void ps_free_counter_data(ps_tool_counter_data_t *counter_data) { + void ps_tool_free_counter_data(ps_tool_counter_data_t *counter_data) { if (counter_data == nullptr) { return; @@ -127,10 +141,10 @@ extern "C" { counter_data->value_sumsqr = nullptr; } } - void ps_get_metadata(ps_tool_metadata_t *metadata) { + void ps_tool_get_metadata(ps_tool_metadata_t *metadata) { memset(metadata, 0, sizeof(ps_tool_metadata_t)); } - void ps_free_metadata(ps_tool_metadata_t *metadata) { + void ps_tool_free_metadata(ps_tool_metadata_t *metadata) { if (metadata == nullptr) { return;