class Link;
}
namespace trace_mgr {
+ class trace;
class future_evt_set;
}
}
typedef simgrid::surf::NetCard surf_NetCard;
typedef simgrid::surf::Link Link;
typedef simgrid::surf::Resource surf_Resource;
+typedef simgrid::trace_mgr::trace tmgr_Trace;
#else
typedef struct surf_NetCard surf_NetCard;
typedef struct surf_Resource surf_Resource;
typedef struct Link Link;
+typedef struct Trace tmgr_Trace;
#endif
typedef simgrid_Host* sg_host_t;
// Types which are in fact dictelmt:
typedef struct s_xbt_dictelm *sg_storage_t;
-typedef struct tmgr_trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */
+typedef tmgr_Trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */
typedef enum {
SURF_LINK_FULLDUPLEX = 2,
static xbt_dict_t trace_list = NULL;
+simgrid::trace_mgr::trace::trace()
+{
+}
+
+simgrid::trace_mgr::trace::~trace()
+{
+ xbt_dynar_free(&event_list);
+}
simgrid::trace_mgr::future_evt_set::future_evt_set()
{
}
xbt_assert(periodicity >= 0,
"Invalid periodicity %g (must be positive)", periodicity);
- trace = xbt_new0(s_tmgr_trace_t, 1);
+ trace = new simgrid::trace_mgr::trace();
trace->event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), NULL);
list = xbt_str_split(input, "\n\r");
tmgr_trace_t trace = NULL;
s_tmgr_event_t event;
- trace = xbt_new0(s_tmgr_trace_t, 1);
+ trace = new simgrid::trace_mgr::trace();
trace->event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), NULL);
event.delta = 0.0;
void tmgr_trace_free(tmgr_trace_t trace)
{
- if (!trace)
- return;
-
- xbt_dynar_free(&(trace->event_list));
- free(trace);
+ delete trace;
}
/** @brief Registers a new trace into the future event set, and get an iterator over the integrated trace */
} s_tmgr_event_t, *tmgr_event_t;
typedef struct tmgr_trace {
- xbt_dynar_t event_list;
+
} s_tmgr_trace_t;
/* Iterator within a trace */
XBT_PUBLIC_CLASS trace {
public:
/** Creates an empty trace */
- trace() {}
- virtual ~trace() {}
+ trace();
+ virtual ~trace();
+//private:
+ xbt_dynar_t event_list;
};
/** @brief Future Event Set (collection of iterators over the traces)