bms.c | bms.c | |||
---|---|---|---|---|
skipping to change at line 222 | skipping to change at line 222 | |||
adaptor->p = p; | adaptor->p = p; | |||
adaptor->is_used = QB_TRUE; | adaptor->is_used = QB_TRUE; | |||
g_io_add_watch(channel, evts, gio_read_socket, adaptor); | g_io_add_watch(channel, evts, gio_read_socket, adaptor); | |||
return 0; | return 0; | |||
} | } | |||
static int32_t my_g_dispatch_mod(enum qb_loop_priority p, int32_t fd, int32 _t evts, | static int32_t my_g_dispatch_mod(enum qb_loop_priority p, int32_t fd, int32 _t evts, | |||
void *data, qb_ipcs_dispatch_fn_t fn) | void *data, qb_ipcs_dispatch_fn_t fn) | |||
{ | { | |||
//return qb_loop_poll_mod(bms_loop, p, fd, evts, data, fn); | ||||
return 0; | return 0; | |||
} | } | |||
static int32_t my_g_dispatch_del(int32_t fd) | static int32_t my_g_dispatch_del(int32_t fd) | |||
{ | { | |||
struct gio_to_qb_poll *adaptor; | struct gio_to_qb_poll *adaptor; | |||
if (qb_array_index(gio_map, fd, (void**)&adaptor) == 0) { | if (qb_array_index(gio_map, fd, (void**)&adaptor) == 0) { | |||
g_io_channel_unref(adaptor->channel); | g_io_channel_unref(adaptor->channel); | |||
adaptor->is_used = QB_FALSE; | adaptor->is_used = QB_FALSE; | |||
} | } | |||
skipping to change at line 280 | skipping to change at line 279 | |||
.connection_closed = s1_connection_closed_fn, | .connection_closed = s1_connection_closed_fn, | |||
}; | }; | |||
struct qb_ipcs_poll_handlers ph = { | struct qb_ipcs_poll_handlers ph = { | |||
.job_add = my_job_add, | .job_add = my_job_add, | |||
.dispatch_add = my_dispatch_add, | .dispatch_add = my_dispatch_add, | |||
.dispatch_mod = my_dispatch_mod, | .dispatch_mod = my_dispatch_mod, | |||
.dispatch_del = my_dispatch_del, | .dispatch_del = my_dispatch_del, | |||
}; | }; | |||
#ifdef HAVE_GLIB | #ifdef HAVE_GLIB | |||
struct qb_ipcs_poll_handlers glib_ph = { | struct qb_ipcs_poll_handlers glib_ph = { | |||
.job_add = NULL, // FIXME | .job_add = NULL, /* FIXME */ | |||
.dispatch_add = my_g_dispatch_add, | .dispatch_add = my_g_dispatch_add, | |||
.dispatch_mod = my_g_dispatch_mod, | .dispatch_mod = my_g_dispatch_mod, | |||
.dispatch_del = my_g_dispatch_del, | .dispatch_del = my_g_dispatch_del, | |||
}; | }; | |||
#endif /* HAVE_GLIB */ | #endif /* HAVE_GLIB */ | |||
while ((opt = getopt(argc, argv, options)) != -1) { | while ((opt = getopt(argc, argv, options)) != -1) { | |||
switch (opt) { | switch (opt) { | |||
case 'm': | case 'm': | |||
ipc_type = QB_IPC_SHM; | ipc_type = QB_IPC_SHM; | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 1 lines changed or added | |||
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/ |