#include "xbt/dict.h"
#include "xbt/ex.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(emul,gras,"Emulation support");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_virtu_emul,gras_virtu,"Emulation support");
/*** Timing macros ***/
static xbt_os_timer_t timer;
static int benchmarking = 0;
static xbt_dict_t benchmark_set = NULL;
-static double reference = .00523066250047108838; /* FIXME: we should benchmark host machine to set this */
+static double reference = .00000000523066250047108838; /* FIXME: we should benchmark host machine to set this; unit=s/flop */
static double duration = 0.0;
static char* locbuf = NULL;
static void store_in_dict(xbt_dict_t dict, const char *key, double value)
{
double *ir;
- xbt_ex_t e;
-
- TRY {
- ir = xbt_dict_get(dict, key);
- } CATCH(e) {
- if (e.category == mismatch_error) {
- ir = NULL;
- xbt_ex_free(e);
- } else {
- RETHROW;
- }
- }
+
+ ir = xbt_dict_get_or_null(dict, key);
if (!ir) {
ir = xbt_new0(double,1);
xbt_dict_set(dict, key, ir, free);
int gras_bench_once_begin(const char *location,int line) {
double *ir = NULL;
- xbt_ex_t e;
xbt_assert0(!benchmarking,"Already benchmarking");
benchmarking = 1;
}
sprintf(locbuf,"%s:%d",location, line);
- TRY {
- ir = xbt_dict_get(benchmark_set, locbuf);
- } CATCH(e) {
- if (e.category == mismatch_error) {
- xbt_ex_free(e);
- ir = NULL;
- } else {
- RETHROW;
- }
- }
+ ir = xbt_dict_get_or_null(benchmark_set, locbuf);
if(!ir) {
DEBUG1("%s",locbuf);
duration = 1;