Adapt opcodes registration for Windows

This commit is contained in:
Daniel Zaoui 2017-06-03 22:28:06 +03:00
parent fbf83cc256
commit 1fc93e92ae
4 changed files with 18 additions and 19 deletions

View File

@ -119,13 +119,12 @@ static int _selected_port = -1;
static Eina_Bool _clients_info_added_cb(Eina_Debug_Session *, int, void *, int);
static Eina_Bool _clients_info_deleted_cb(Eina_Debug_Session *, int, void *, int);
static const Eina_Debug_Opcode _ops[] =
{
EINA_DEBUG_OPCODES_ARRAY_DEFINE(_ops,
{"Daemon/Client/register_observer", &_cl_stat_reg_op, NULL},
{"Daemon/Client/added", NULL, _clients_info_added_cb},
{"Daemon/Client/deleted", NULL, _clients_info_deleted_cb},
{NULL, NULL, NULL}
};
);
static Eina_Bool
_mkdir(const char *dir)
@ -541,7 +540,7 @@ _connection_type_change(Connection_Type conn_type)
}
default: return;
}
if (_session) eina_debug_opcodes_register(_session, _ops, _post_register_handle, NULL);
if (_session) eina_debug_opcodes_register(_session, _ops(), _post_register_handle, NULL);
elm_object_item_text_set(_main_widgets->conn_selector, _conn_strs[conn_type]);
_conn_type = conn_type;
_session_populate();

View File

@ -825,8 +825,7 @@ end:
WRAPPER_TO_XFER_MAIN_LOOP(_win_screenshot_cb)
static const Eina_Debug_Opcode _debug_ops[] =
{
EINA_DEBUG_OPCODES_ARRAY_DEFINE(_debug_ops,
{"Clouseau/Object_Introspection/snapshot_start", &_snapshot_start_op, &_snapshot_start_cb},
{"Clouseau/Object_Introspection/snapshot_done", &_snapshot_done_op, NULL},
{"Clouseau/Eo/classes_ids_get", &_klids_get_op, NULL},
@ -835,7 +834,7 @@ static const Eina_Debug_Opcode _debug_ops[] =
{"Clouseau/Evas/object/highlight", &_obj_highlight_op, &_obj_highlight_cb},
{"Clouseau/Evas/window/screenshot", &_win_screenshot_op, &_win_screenshot_cb},
{NULL, NULL, NULL}
};
);
EAPI Eina_Bool
clouseau_debug_init(void)
@ -846,7 +845,7 @@ clouseau_debug_init(void)
eolian_system_directory_scan();
eina_debug_opcodes_register(NULL, _debug_ops, NULL, NULL);
eina_debug_opcodes_register(NULL, _debug_ops(), NULL, NULL);
printf("%s - In\n", __FUNCTION__);
return EINA_TRUE;

View File

@ -124,12 +124,12 @@ static int _record_get_op = EINA_DEBUG_OPCODE_INVALID;
static Eina_Bool _record_get_cb(Eina_Debug_Session *, int, void *, int);
static const Eina_Debug_Opcode _ops[] = {
EINA_DEBUG_OPCODES_ARRAY_DEFINE(_ops,
{"CPU/Freq/on", &_record_on_op, NULL},
{"CPU/Freq/off", &_record_off_op, NULL},
{"EvLog/get", &_record_get_op, &_record_get_cb},
{NULL, NULL, NULL}
};
);
static void
_evlog_state_event_register(Evlog *evlog, Evlog_Event *ev)
@ -1563,16 +1563,17 @@ _session_changed(Clouseau_Extension *ext)
{
int i = 0;
Inf *inf = ext->data;
Eina_Debug_Opcode *ops = _ops();
_app_changed(ext);
while (_ops[i].opcode_name)
while (ops[i].opcode_name)
{
if (_ops[i].opcode_id) *(_ops[i].opcode_id) = EINA_DEBUG_OPCODE_INVALID;
if (ops[i].opcode_id) *(ops[i].opcode_id) = EINA_DEBUG_OPCODE_INVALID;
i++;
}
if (ext->session)
{
eina_debug_session_data_set(ext->session, ext);
eina_debug_opcodes_register(ext->session, _ops, NULL, NULL);
eina_debug_opcodes_register(ext->session, ops, NULL, NULL);
}
elm_object_disabled_set(inf->record_button, EINA_TRUE);
}

View File

@ -90,8 +90,7 @@ static Eina_Bool _obj_info_get(Eina_Debug_Session *, int, void *, int);
static Eina_Bool _snapshot_done_cb(Eina_Debug_Session *, int, void *, int);
static Eina_Bool _win_screenshot_get(Eina_Debug_Session *, int, void *, int);
static const Eina_Debug_Opcode _ops[] =
{
EINA_DEBUG_OPCODES_ARRAY_DEFINE(_ops,
{"Clouseau/Eo/objects_ids_get", &_eoids_get_op, &_eoids_get},
{"Clouseau/Eo/classes_ids_get", &_klids_get_op, &_klids_get},
{"Clouseau/Evas/object/highlight", &_obj_highlight_op, NULL},
@ -100,7 +99,7 @@ static const Eina_Debug_Opcode _ops[] =
{"Clouseau/Object_Introspection/snapshot_start",&_snapshot_do_op, NULL},
{"Clouseau/Object_Introspection/snapshot_done", &_snapshot_done_op, &_snapshot_done_cb},
{NULL, NULL, NULL}
};
);
static Clouseau_Extension *
_ext_get(Eo *obj)
@ -270,10 +269,11 @@ _session_changed(Clouseau_Extension *ext)
{
int i = 0;
Instance *inst = ext->data;
Eina_Debug_Opcode *ops = _ops();
_app_changed(ext);
while (_ops[i].opcode_name)
while (ops[i].opcode_name)
{
if (_ops[i].opcode_id) *(_ops[i].opcode_id) = EINA_DEBUG_OPCODE_INVALID;
if (ops[i].opcode_id) *(ops[i].opcode_id) = EINA_DEBUG_OPCODE_INVALID;
i++;
}
if (ext->session)
@ -281,7 +281,7 @@ _session_changed(Clouseau_Extension *ext)
eina_debug_session_data_set(ext->session, ext);
inst->old_disp_cb = eina_debug_session_dispatch_get(ext->session);
eina_debug_session_dispatch_override(ext->session, _disp_cb);
eina_debug_opcodes_register(ext->session, _ops, _post_register_handle, ext);
eina_debug_opcodes_register(ext->session, ops, _post_register_handle, ext);
}
elm_object_item_disabled_set(inst->wdgs->reload_button, EINA_TRUE);
}