*/
static void _handler_insert_badge(struct tcb *tcb, struct packet *packet, void *data)
{
- int ret = 0;
+ int ret = 0, ret_p = 0;
struct packet *packet_reply = NULL;
struct packet *packet_service = NULL;
char *pkgname = NULL;
packet_reply = packet_create_reply(packet, "i", ret);
if (packet_reply) {
- service_common_unicast_packet(tcb, packet_reply);
+ if ((ret_p = service_common_unicast_packet(tcb, packet_reply)) < 0) {
+ ErrPrint("Failed to send a reply packet:%d", ret_p);
+ }
packet_destroy(packet_reply);
+ } else {
+ ErrPrint("Failed to create a reply packet");
}
if (ret == BADGE_ERROR_NONE) {
packet_service = packet_create("insert_badge", "is", ret, pkgname);
if (packet_service != NULL) {
- service_common_multicast_packet(tcb, packet_service, TCB_CLIENT_TYPE_SERVICE);
+ if ((ret_p = service_common_multicast_packet(tcb, packet_service, TCB_CLIENT_TYPE_SERVICE)) < 0) {
+ ErrPrint("Failed to send a muticast packet:%d", ret_p);
+ }
packet_destroy(packet_service);
+ } else {
+ ErrPrint("Failed to create a multicast packet");
}
+ } else {
+ ErrPrint("Failed to insert a badge:%d", ret);
}
} else {
ErrPrint("Failed to get data from the packet");
static void _handler_delete_badge(struct tcb *tcb, struct packet *packet, void *data)
{
- int ret = 0;
+ int ret = 0, ret_p = 0;
struct packet *packet_reply = NULL;
struct packet *packet_service = NULL;
char *pkgname = NULL;
packet_reply = packet_create_reply(packet, "i", ret);
if (packet_reply) {
- service_common_unicast_packet(tcb, packet_reply);
+ if ((ret_p = service_common_unicast_packet(tcb, packet_reply)) < 0) {
+ ErrPrint("Failed to send a reply packet:%d", ret_p);
+ }
packet_destroy(packet_reply);
+ } else {
+ ErrPrint("Failed to create a reply packet");
}
if (ret == BADGE_ERROR_NONE) {
packet_service = packet_create("delete_badge", "is", ret, pkgname);
if (packet_service != NULL) {
- service_common_multicast_packet(tcb, packet_service, TCB_CLIENT_TYPE_SERVICE);
+ if ((ret_p = service_common_multicast_packet(tcb, packet_service, TCB_CLIENT_TYPE_SERVICE)) < 0) {
+ ErrPrint("Failed to send a muticast packet:%d", ret_p);
+ }
packet_destroy(packet_service);
+ } else {
+ ErrPrint("Failed to create a multicast packet");
}
+ } else {
+ ErrPrint("Failed to delete a badge:%d", ret);
}
} else {
ErrPrint("Failed to get data from the packet");
static void _handler_set_badge_count(struct tcb *tcb, struct packet *packet, void *data)
{
- int ret = 0;
+ int ret = 0, ret_p = 0;
struct packet *packet_reply = NULL;
struct packet *packet_service = NULL;
char *pkgname = NULL;
packet_reply = packet_create_reply(packet, "i", ret);
if (packet_reply) {
- service_common_unicast_packet(tcb, packet_reply);
+ if ((ret_p = service_common_unicast_packet(tcb, packet_reply)) < 0) {
+ ErrPrint("Failed to send a reply packet:%d", ret_p);
+ }
packet_destroy(packet_reply);
+ } else {
+ ErrPrint("Failed to create a reply packet");
}
if (ret == BADGE_ERROR_NONE) {
packet_service = packet_create("set_badge_count", "isi", ret, pkgname, count);
if (packet_service != NULL) {
- service_common_multicast_packet(tcb, packet_service, TCB_CLIENT_TYPE_SERVICE);
+ if ((ret_p = service_common_multicast_packet(tcb, packet_service, TCB_CLIENT_TYPE_SERVICE)) < 0) {
+ ErrPrint("Failed to send a muticast packet:%d", ret_p);
+ }
packet_destroy(packet_service);
+ } else {
+ ErrPrint("Failed to create a multicast packet");
}
+ } else {
+ ErrPrint("Failed to set count of badge:%d", ret);
}
} else {
ErrPrint("Failed to get data from the packet");
static void _handler_set_display_option(struct tcb *tcb, struct packet *packet, void *data)
{
- int ret = 0;
+ int ret = 0, ret_p = 0;
struct packet *packet_reply = NULL;
struct packet *packet_service = NULL;
char *pkgname = NULL;
packet_reply = packet_create_reply(packet, "i", ret);
if (packet_reply) {
- service_common_unicast_packet(tcb, packet_reply);
+ if ((ret_p = service_common_unicast_packet(tcb, packet_reply)) < 0) {
+ ErrPrint("Failed to send a reply packet:%d", ret_p);
+ }
packet_destroy(packet_reply);
+ } else {
+ ErrPrint("Failed to create a reply packet");
}
if (ret == BADGE_ERROR_NONE) {
packet_service = packet_create("set_disp_option", "isi", ret, pkgname, is_display);
if (packet_service != NULL) {
- service_common_multicast_packet(tcb, packet_service, TCB_CLIENT_TYPE_SERVICE);
+ if ((ret_p = service_common_multicast_packet(tcb, packet_service, TCB_CLIENT_TYPE_SERVICE)) < 0) {
+ ErrPrint("Failed to send a muticast packet:%d", ret_p);
+ }
packet_destroy(packet_service);
+ } else {
+ ErrPrint("Failed to create a multicast packet");
}
+ } else {
+ ErrPrint("Failed to set display option of badge:%d", ret);
}
} else {
ErrPrint("Failed to get data from the packet");
static void _handler_service_register(struct tcb *tcb, struct packet *packet, void *data)
{
+ int ret = 0;
struct packet *packet_reply;
- int ret;
ret = tcb_client_type_set(tcb, TCB_CLIENT_TYPE_SERVICE);
+ if (ret < 0) {
+ ErrPrint("Failed to set the type of client:%d", ret);
+ }
packet_reply = packet_create_reply(packet, "i", ret);
if (packet_reply) {
- service_common_unicast_packet(tcb, packet_reply);
+ if ((ret = service_common_unicast_packet(tcb, packet_reply)) < 0) {
+ ErrPrint("Failed to send a reply packet:%d", ret);
+ }
packet_destroy(packet_reply);
+ } else {
+ ErrPrint("Failed to create a reply packet");
}
}
},
};
- DbgPrint("TCB: %p, Packet: %p\n", tcb, packet);
if (!packet) {
- DbgPrint("TCB: %p is terminated\n", tcb);
+ DbgPrint("TCB: %p is terminated (NIL packet)\n", tcb);
return 0;
}
ErrPrint("Invalid command\n");
return -EINVAL;
}
- DbgPrint("Command: %s, Packet type[%d]\n", command, packet_type(packet));
+ DbgPrint("Command: [%s], Packet type[%d]\n", command, packet_type(packet));
switch (packet_type(packet)) {
case PACKET_REQ:
/* Need to send reply packet */
- DbgPrint("REQ: Command: [%s]\n", command);
-
for (i = 0; service_req_table[i].cmd; i++) {
if (strcmp(service_req_table[i].cmd, command))
continue;
return LB_STATUS_ERROR_INVALID;
service_common_destroy(s_info.svc_ctx);
- DbgPrint("Successfully Finalized\n");
+ DbgPrint("Successfully finalized\n");
return LB_STATUS_SUCCESS;
}
*/
static void _handler_insert(struct tcb *tcb, struct packet *packet, void *data)
{
- int ret = 0;
+ int ret = 0, ret_p = 0;
int priv_id = 0;
struct packet *packet_reply = NULL;
struct packet *packet_service = NULL;
if (noti != NULL) {
if (notification_ipc_make_noti_from_packet(noti, packet) == NOTIFICATION_ERROR_NONE) {
ret = notification_noti_insert(noti);
- if (ret != NOTIFICATION_ERROR_NONE) {
- ErrPrint("failed to insert a notification\n");
- notification_free(noti);
- return ;
- }
-
notification_get_id(noti, NULL, &priv_id);
DbgPrint("priv_id: [%d]\n", priv_id);
packet_reply = packet_create_reply(packet, "ii", ret, priv_id);
if (packet_reply) {
- service_common_unicast_packet(tcb, packet_reply);
+ if ((ret_p = service_common_unicast_packet(tcb, packet_reply)) < 0) {
+ ErrPrint("failed to send reply packet: %d\n", ret_p);
+ }
packet_destroy(packet_reply);
+ } else {
+ ErrPrint("failed to create a reply packet\n");
+ }
+
+ if (ret != NOTIFICATION_ERROR_NONE) {
+ ErrPrint("failed to insert a notification: %d\n", ret);
+ notification_free(noti);
+ return ;
}
packet_service = notification_ipc_make_packet_from_noti(noti, "add_noti", 2);
if (packet_service != NULL) {
- service_common_multicast_packet(tcb, packet_service, TCB_CLIENT_TYPE_SERVICE);
+ if ((ret_p = service_common_multicast_packet(tcb, packet_service, TCB_CLIENT_TYPE_SERVICE)) < 0) {
+ ErrPrint("failed to send a multicast packet: %d\n", ret_p);
+ }
packet_destroy(packet_service);
+ } else {
+ ErrPrint("failed to create a multicats packet\n");
}
} else {
ErrPrint("Failed to create the packet");
static void _handler_update(struct tcb *tcb, struct packet *packet, void *data)
{
- int ret = 0;
+ int ret = 0, ret_p = 0;
int priv_id = 0;
struct packet *packet_reply = NULL;
struct packet *packet_service = NULL;
if (noti != NULL) {
if (notification_ipc_make_noti_from_packet(noti, packet) == NOTIFICATION_ERROR_NONE) {
ret = notification_noti_update(noti);
- if (ret != NOTIFICATION_ERROR_NONE) {
- ErrPrint("failed to update a notification\n");
- notification_free(noti);
- return ;
- }
notification_get_id(noti, NULL, &priv_id);
DbgPrint("priv_id: [%d]\n", priv_id);
packet_reply = packet_create_reply(packet, "ii", ret, priv_id);
if (packet_reply) {
- service_common_unicast_packet(tcb, packet_reply);
+ if ((ret_p = service_common_unicast_packet(tcb, packet_reply)) < 0) {
+ ErrPrint("failed to send reply packet:%d\n", ret_p);
+ }
packet_destroy(packet_reply);
+ } else {
+ ErrPrint("failed to create a reply packet\n");
+ }
+
+ if (ret != NOTIFICATION_ERROR_NONE) {
+ ErrPrint("failed to update a notification:%d\n", ret);
+ notification_free(noti);
+ return ;
}
packet_service = notification_ipc_make_packet_from_noti(noti, "update_noti", 2);
if (packet_service != NULL) {
- service_common_multicast_packet(tcb, packet_service, TCB_CLIENT_TYPE_SERVICE);
+ if ((ret_p = service_common_multicast_packet(tcb, packet_service, TCB_CLIENT_TYPE_SERVICE)) < 0) {
+ ErrPrint("failed to send a multicast packet: %d\n", ret_p);
+ }
packet_destroy(packet_service);
}
} else {
static void _handler_refresh(struct tcb *tcb, struct packet *packet, void *data)
{
- int ret = NOTIFICATION_ERROR_NONE;
+ int ret = 0;
struct packet *packet_reply = NULL;
packet_reply = packet_create_reply(packet, "i", ret);
if (packet_reply) {
- service_common_unicast_packet(tcb, packet_reply);
+ if ((ret = service_common_unicast_packet(tcb, packet_reply)) < 0) {
+ ErrPrint("failed to send reply packet:%d\n", ret);
+ }
packet_destroy(packet_reply);
+ } else {
+ ErrPrint("failed to create a reply packet\n");
}
- service_common_multicast_packet(tcb, packet, TCB_CLIENT_TYPE_SERVICE);
+ if ((ret = service_common_multicast_packet(tcb, packet, TCB_CLIENT_TYPE_SERVICE)) < 0) {
+ ErrPrint("failed to send a multicast packet:%d\n", ret);
+ }
}
static void _handler_delete_single(struct tcb *tcb, struct packet *packet, void *data)
{
- int ret = 0;
+ int ret = 0, ret_p = 0;
int priv_id = 0;
struct packet *packet_reply = NULL;
struct packet *packet_service = NULL;
DbgPrint("priv_id: [%d]\n", priv_id);
packet_reply = packet_create_reply(packet, "ii", ret, priv_id);
if (packet_reply) {
- service_common_unicast_packet(tcb, packet_reply);
+ if ((ret_p = service_common_unicast_packet(tcb, packet_reply)) < 0) {
+ ErrPrint("failed to send reply packet:%d\n", ret_p);
+ }
packet_destroy(packet_reply);
+ } else {
+ ErrPrint("failed to create a reply packet\n");
+ }
+
+ if (ret != NOTIFICATION_ERROR_NONE) {
+ ErrPrint("failed to delete a notification:%d\n", ret);
+ return ;
}
packet_service = packet_create("del_noti_single", "ii", 1, priv_id);
if (packet_service != NULL) {
- service_common_multicast_packet(tcb, packet_service, TCB_CLIENT_TYPE_SERVICE);
+ if ((ret_p = service_common_multicast_packet(tcb, packet_service, TCB_CLIENT_TYPE_SERVICE)) < 0) {
+ ErrPrint("failed to send a multicast packet: %d\n", ret_p);
+ }
packet_destroy(packet_service);
}
} else {
static void _handler_delete_multiple(struct tcb *tcb, struct packet *packet, void *data)
{
- int ret = 0;
+ int ret = 0, ret_p = 0;
struct packet *packet_reply = NULL;
struct packet *packet_service = NULL;
char *pkgname = NULL;
packet_reply = packet_create_reply(packet, "ii", ret, num_deleted);
if (packet_reply) {
- service_common_unicast_packet(tcb, packet_reply);
+ if ((ret_p = service_common_unicast_packet(tcb, packet_reply)) < 0) {
+ ErrPrint("failed to send reply packet:%d\n", ret_p);
+ }
packet_destroy(packet_reply);
+ } else {
+ ErrPrint("failed to create a reply packet\n");
+ }
+
+ if (ret != NOTIFICATION_ERROR_NONE) {
+ ErrPrint("failed to delete notifications:%d\n", ret);
+ if (list_deleted != NULL) {
+ free(list_deleted);
+ }
+ return ;
}
if (num_deleted > 0) {
packet_service = create_packet_from_deleted_list(num_deleted, list_deleted, 0);
if (packet_service) {
- service_common_multicast_packet(tcb, packet_service, TCB_CLIENT_TYPE_SERVICE);
+ if ((ret_p = service_common_multicast_packet(tcb, packet_service, TCB_CLIENT_TYPE_SERVICE)) < 0) {
+ ErrPrint("failed to send a multicast packet: %d\n", ret_p);
+ }
packet_destroy(packet_service);
+ } else {
+ ErrPrint("failed to create a multicast packet\n");
}
} else {
int set = 0;
list_deleted, set * NOTIFICATION_DEL_PACKET_UNIT);
if (packet_service) {
- service_common_multicast_packet(tcb, packet_service, TCB_CLIENT_TYPE_SERVICE);
+ if ((ret_p = service_common_multicast_packet(tcb, packet_service, TCB_CLIENT_TYPE_SERVICE)) < 0) {
+ ErrPrint("failed to send a multicast packet:%d\n", ret_p);
+ }
packet_destroy(packet_service);
+ } else {
+ ErrPrint("failed to create a multicast packet\n");
}
}
}
static void _handler_service_register(struct tcb *tcb, struct packet *packet, void *data)
{
+ int ret = 0;
struct packet *packet_reply;
- int ret;
ret = tcb_client_type_set(tcb, TCB_CLIENT_TYPE_SERVICE);
packet_reply = packet_create_reply(packet, "i", ret);
if (packet_reply) {
- service_common_unicast_packet(tcb, packet_reply);
+ if ((ret = service_common_unicast_packet(tcb, packet_reply)) < 0) {
+ ErrPrint("failed to send reply packet:%d\n", ret);
+ }
packet_destroy(packet_reply);
+ } else {
+ ErrPrint("failed to create a reply packet\n");
}
}
if (!slave)
return LB_STATUS_ERROR_INVALID;
- DbgPrint("Event: %dx%d\n", event_info->x, event_info->y);
switch (state) {
case EVENT_STATE_ACTIVATE:
cmdstr = "pd_mouse_down";
if (!e)
return LB_STATUS_ERROR_FAULT;
- DbgPrint("Event: %dx%d\n", event_info->x, event_info->y);
timestamp = util_timestamp();
switch (state) {
goto out;
}
- DbgPrint("pid[%d] pkgname[%s] id[%s] event[%s] timestamp[%lf] x[%lf] y[%lf]\n", pid, pkgname, id, event, timestamp, x, y);
+ DbgPrint("pid[%d] pkgname[%s]\n", pid, pkgname);
/*!
* \NOTE:
goto out;
}
- DbgPrint("pid[%d] pkgname[%s] id[%s] emission[%s] source[%s] sx[%lf] sy[%lf] ex[%lf] ey[%lf]\n", pid, pkgname, id, emission, source, sx, sy, ex, ey);
+ DbgPrint("pid[%d] pkgname[%s] emission[%s] source[%s]\n", pid, pkgname, emission, source);
/*!
* \NOTE:
goto out;
}
- DbgPrint("pid[%d] pkgname[%s] id[%s]\n", pid, pkgname, id);
+ DbgPrint("pid[%d] pkgname[%s]\n", pid, pkgname);
/*!
* \NOTE:
goto out;
}
- DbgPrint("pid[%d] pkgname[%s] id[%s] w[%d] h[%d]\n", pid, pkgname, id, w, h);
- DbgPrint("RESIZE: INSTANCE[%s] Client request resize to %dx%d\n", id, w, h);
+ DbgPrint("RESIZE: Client request resize to %dx%d (pid: %d, pkgname: %s)\n", w, h, pid, pkgname);
/*!
* \NOTE:
goto out;
}
- DbgPrint("pid[%d] pkgname[%s] id[%s] state[%d]\n", pid, pkgname, id, state);
+ DbgPrint("pid[%d] pkgname[%s] state[%d]\n", pid, pkgname, state);
/*!
* \NOTE:
goto out;
}
- DbgPrint("pid[%d] pkgname[%s] id[%s] period[%lf]\n", pid, pkgname, id, period);
+ DbgPrint("pid[%d] pkgname[%s] period[%lf]\n", pid, pkgname, period);
/*!
* \NOTE:
goto out;
}
- DbgPrint("pid[%d] pkgname[%s] id[%s] cluster[%s] category[%s]\n", pid, pkgname, id, cluster, category);
+ DbgPrint("pid[%d] pkgname[%s] cluster[%s] category[%s]\n", pid, pkgname, cluster, category);
/*!
* \NOTE:
} else if (package_pd_type(pkg) == PD_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- // struct packet *packet;
buffer = instance_pd_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("pd_mouse_enter", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_pd_type(pkg) == PD_TYPE_SCRIPT) {
} else if (package_pd_type(pkg) == PD_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- // struct packet *packet;
buffer = instance_pd_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("pd_mouse_leave", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_pd_type(pkg) == PD_TYPE_SCRIPT) {
goto out;
}
- DbgPrint("(%dx%d)\n", x, y);
-
/*!
* \NOTE:
* Trust the package name which are sent by the client.
} else if (package_pd_type(pkg) == PD_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- // struct packet *packet;
buffer = instance_pd_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("pd_mouse_down", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_pd_type(pkg) == PD_TYPE_SCRIPT) {
goto out;
}
- DbgPrint("(%dx%d)\n", x, y);
/*!
* \NOTE:
* Trust the package name which are sent by the client.
} else if (package_pd_type(pkg) == PD_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- //struct packet *packet;
buffer = instance_pd_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("pd_mouse_up", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_pd_type(pkg) == PD_TYPE_SCRIPT) {
goto out;
}
- DbgPrint("(%dx%d)\n", x, y);
/*!
* \NOTE:
* Trust the package name which are sent by the client.
} else if (package_pd_type(pkg) == PD_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- //struct packet *packet;
buffer = instance_pd_buffer(inst);
if (!buffer) {
goto out;
}
- /*!
- * Reuse the packet.
- packet = packet_create_noack("pd_mouse_move", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_pd_type(pkg) == PD_TYPE_SCRIPT) {
} else if (package_lb_type(pkg) == LB_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- //struct packet *packet;
buffer = instance_lb_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("lb_mouse_move", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_lb_type(pkg) == LB_TYPE_SCRIPT) {
} else if (package_lb_type(pkg) == LB_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- //struct packet *packet;
buffer = instance_lb_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("lb_mouse_enter", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_lb_type(pkg) == LB_TYPE_SCRIPT) {
} else if (package_lb_type(pkg) == LB_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- //struct packet *packet;
buffer = instance_lb_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("lb_mouse_leave", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_lb_type(pkg) == LB_TYPE_SCRIPT) {
} else if (package_lb_type(pkg) == LB_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- // struct packet *packet;
buffer = instance_lb_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("lb_mouse_down", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_lb_type(pkg) == LB_TYPE_SCRIPT) {
} else if (package_lb_type(pkg) == LB_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- //struct packet *packet;
buffer = instance_lb_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("lb_mouse_up", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_lb_type(pkg) == LB_TYPE_SCRIPT) {
} else if (package_pd_type(pkg) == PD_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- // struct packet *packet;
buffer = instance_pd_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("pd_mouse_enter", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_pd_type(pkg) == PD_TYPE_SCRIPT) {
} else if (package_pd_type(pkg) == PD_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- // struct packet *packet;
buffer = instance_pd_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("pd_mouse_enter", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_pd_type(pkg) == PD_TYPE_SCRIPT) {
} else if (package_pd_type(pkg) == PD_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- // struct packet *packet;
buffer = instance_pd_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("pd_mouse_enter", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_pd_type(pkg) == PD_TYPE_SCRIPT) {
} else if (package_pd_type(pkg) == PD_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- // struct packet *packet;
buffer = instance_pd_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("pd_mouse_enter", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_pd_type(pkg) == PD_TYPE_SCRIPT) {
} else if (package_pd_type(pkg) == PD_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- // struct packet *packet;
buffer = instance_pd_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("pd_mouse_enter", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_pd_type(pkg) == PD_TYPE_SCRIPT) {
} else if (package_pd_type(pkg) == PD_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- // struct packet *packet;
buffer = instance_pd_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("pd_mouse_enter", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_pd_type(pkg) == PD_TYPE_SCRIPT) {
} else if (package_pd_type(pkg) == PD_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- // struct packet *packet;
buffer = instance_pd_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("pd_mouse_enter", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_pd_type(pkg) == PD_TYPE_SCRIPT) {
} else if (package_pd_type(pkg) == PD_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- // struct packet *packet;
buffer = instance_pd_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("pd_mouse_enter", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_pd_type(pkg) == PD_TYPE_SCRIPT) {
} else if (package_pd_type(pkg) == PD_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- // struct packet *packet;
buffer = instance_pd_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("pd_mouse_enter", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
DbgPrint("Buffer type PD\n");
packet_ref((struct packet *)packet);
} else if (package_pd_type(pkg) == PD_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- // struct packet *packet;
buffer = instance_pd_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("pd_mouse_enter", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_pd_type(pkg) == PD_TYPE_SCRIPT) {
} else if (package_pd_type(pkg) == PD_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- // struct packet *packet;
buffer = instance_pd_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("pd_mouse_enter", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_pd_type(pkg) == PD_TYPE_SCRIPT) {
} else if (package_pd_type(pkg) == PD_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- // struct packet *packet;
buffer = instance_pd_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("pd_mouse_enter", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_pd_type(pkg) == PD_TYPE_SCRIPT) {
} else if (package_lb_type(pkg) == LB_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- //struct packet *packet;
buffer = instance_lb_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("lb_mouse_leave", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_lb_type(pkg) == LB_TYPE_SCRIPT) {
} else if (package_lb_type(pkg) == LB_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- //struct packet *packet;
buffer = instance_lb_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("lb_mouse_leave", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_lb_type(pkg) == LB_TYPE_SCRIPT) {
} else if (package_lb_type(pkg) == LB_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- //struct packet *packet;
buffer = instance_lb_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("lb_mouse_leave", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_lb_type(pkg) == LB_TYPE_SCRIPT) {
} else if (package_lb_type(pkg) == LB_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- //struct packet *packet;
buffer = instance_lb_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("lb_mouse_leave", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_lb_type(pkg) == LB_TYPE_SCRIPT) {
} else if (package_lb_type(pkg) == LB_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- //struct packet *packet;
buffer = instance_lb_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("lb_mouse_leave", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_lb_type(pkg) == LB_TYPE_SCRIPT) {
} else if (package_lb_type(pkg) == LB_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- //struct packet *packet;
buffer = instance_lb_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("lb_mouse_leave", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_lb_type(pkg) == LB_TYPE_SCRIPT) {
} else if (package_lb_type(pkg) == LB_TYPE_BUFFER) {
struct buffer_info *buffer;
struct slave_node *slave;
- //struct packet *packet;
buffer = instance_lb_buffer(inst);
if (!buffer) {
goto out;
}
- /*
- packet = packet_create_noack("lb_mouse_leave", "ssiiddd", pkgname, id, w, h, timestamp, x, y);
- if (!packet) {
- ErrPrint("Failed to create a packet[%s]\n", pkgname);
- ret = LB_STATUS_ERROR_FAULT;
- goto out;
- }
- */
-
packet_ref((struct packet *)packet);
ret = slave_rpc_request_only(slave, pkgname, (struct packet *)packet, 0);
} else if (package_lb_type(pkg) == LB_TYPE_SCRIPT) {
goto out;
}
- DbgPrint("pid[%d] pkgname[%s] id[%s]\n", pid, pkgname, id);
+ DbgPrint("pid[%d] pkgname[%s]\n", pid, pkgname);
buffer = instance_lb_buffer(inst);
if (!buffer) {
ErrPrint("Unable to get LB buffer: %s\n", id);
ErrPrint("Parameter is not matched\n");
goto out;
}
- DbgPrint("pid[%d] pkgname[%s] id[%s] Pixmap[0x%X]\n", pid, pkgname, id, pixmap);
+ DbgPrint("pid[%d] pkgname[%s] Pixmap[0x%X]\n", pid, pkgname, pixmap);
/*!
* \NOTE:
goto out;
}
- DbgPrint("pid[%d] pkgname[%s] id[%s]\n", pid, pkgname, id);
+ DbgPrint("pid[%d] pkgname[%s]\n", pid, pkgname);
buffer = instance_pd_buffer(inst);
if (!buffer) {
ErrPrint("Unable to get PD buffer (%s)\n", id);
ErrPrint("Parameter is not matched\n");
goto out;
}
- DbgPrint("pid[%d] pkgname[%s] id[%s]\n", pid, pkgname, id);
+ DbgPrint("pid[%d] pkgname[%s]\n", pid, pkgname);
/*!
* \NOTE:
goto out;
}
- DbgPrint("pid[%d] pkgname[%s] id[%s] pinup[%d]\n", pid, pkgname, id, pinup);
+ DbgPrint("pid[%d] pkgname[%s] pinup[%d]\n", pid, pkgname, pinup);
/*!
* \NOTE:
goto out;
}
- DbgPrint("pid[%d] pkgname[%s] id[%s] %lfx%lf\n", pid, pkgname, id, x, y);
+ DbgPrint("pid[%d] pkgname[%s]\n", pid, pkgname);
inst = package_find_instance_by_id(pkgname, id);
if (!inst)
ret = LB_STATUS_ERROR_INVALID;
}
out:
- DbgPrint("Update PD position: %lfx%lf (%d)\n", x, y, ret);
+ DbgPrint("Update PD position: %d\n", ret);
return NULL;
}
goto out;
}
- DbgPrint("pid[%d] pkgname[%s] id[%s]\n", pid, pkgname, id);
+ DbgPrint("pid[%d] pkgname[%s]\n", pid, pkgname);
/*!
* \NOTE:
goto out;
}
- DbgPrint("pid[%d] pkgname[%s] id[%s]\n", pid, pkgname, id);
+ DbgPrint("pid[%d] pkgname[%s]\n", pid, pkgname);
/*!
* \NOTE:
ErrPrint("Instance(%s) is already destroyed\n", id);
} else {
ret = instance_destroy(inst);
- DbgPrint("Destroy instance(%s) %d\n", id, ret);
}
out:
} else {
switch (package_pd_type(instance_package(inst))) {
case PD_TYPE_SCRIPT:
- DbgPrint("Script (%s)\n", id);
if (script_handler_is_loaded(instance_pd_script(inst))) {
(void)script_handler_parse_desc(pkgname, id,
descfile, 1);
instance_pd_updated(pkgname, id, descfile);
break;
default:
- DbgPrint("Ignore updated DESC(%s - %s - %s)\n",
- pkgname, id, descfile);
+ DbgPrint("Ignore updated DESC(%s)\n", pkgname);
break;
}
}
} else if (package_is_fault(instance_package(inst))) {
} else {
ret = instance_destroyed(inst);
- DbgPrint("Destroy instance %d\n", ret);
}
out:
/* TODO: */
inst = package_find_instance_by_id(pkgname, id);
if (!inst) {
- DbgPrint("Package[%s] Id[%s] is not found\n", pkgname, id);
+ DbgPrint("Package[%s] instance is not found\n", pkgname);
ret = LB_STATUS_ERROR_INVALID;
id = "";
goto out;
}
ret = buffer_handler_resize(info, w, h);
- DbgPrint("Buffer resize returns %d\n", ret);
-
ret = buffer_handler_load(info);
if (ret == 0) {
instance_set_lb_size(inst, w, h);
instance_set_lb_info(inst, PRIORITY_NO_CHANGE, CONTENT_NO_CHANGE, TITLE_NO_CHANGE);
id = buffer_handler_id(info);
- DbgPrint("Buffer handler ID: %s\n", id);
} else {
- DbgPrint("Failed to load a buffer(%d)\n", ret);
+ ErrPrint("Failed to load a buffer(%d)\n", ret);
}
}
} else if (target == TYPE_PD) {
if (package_pd_type(pkg) == PD_TYPE_BUFFER) {
struct buffer_info *info;
- DbgPrint("Slave acquire buffer for PD\n");
-
info = instance_pd_buffer(inst);
if (!info) {
if (!instance_create_pd_buffer(inst)) {
}
ret = buffer_handler_resize(info, w, h);
- DbgPrint("Buffer resize returns %d\n", ret);
-
ret = buffer_handler_load(info);
if (ret == 0) {
instance_set_pd_size(inst, w, h);
id = buffer_handler_id(info);
- DbgPrint("Buffer handler ID: %s\n", id);
} else {
- DbgPrint("Failed to load a buffer (%d)\n", ret);
+ ErrPrint("Failed to load a buffer (%d)\n", ret);
}
/*!
inst = package_find_instance_by_id(pkgname, id);
if (!inst) {
- DbgPrint("Instance is not found[%s] [%s]\n", pkgname, id);
+ DbgPrint("Instance is not found[%s]\n", pkgname);
ret = LB_STATUS_ERROR_NOT_EXIST;
id = "";
goto out;
} else if (type == TYPE_PD) {
struct buffer_info *info;
- DbgPrint("Slave release buffer for PD\n");
-
info = instance_pd_buffer(inst);
ret = buffer_handler_unload(info);
EINA_LIST_FOREACH(inst_list, l, inst) {
ret = instance_set_period(inst, period);
if (ret < 0)
- DbgPrint("Failed to change the period of %s to (%lf)\n", instance_id(inst), period);
+ ErrPrint("Failed to change the period of %s to (%lf)\n", pkgname, period);
}
}
} else {
ret = instance_set_period(inst, period);
}
- DbgPrint("Change the update period: %s(%s), %lf : %d\n", pkgname, id, period, ret);
+ DbgPrint("Change the update period: %s, %lf : %d\n", pkgname, period, ret);
out:
result = packet_create_reply(packet, "i", ret);
if (!result)
xmonitor_add_event_callback(XMONITOR_RESUMED, xmonitor_resume_cb, slave);
s_info.slave_list = eina_list_append(s_info.slave_list, slave);
- DbgPrint("slave data is created %p\n", slave);
return slave;
}
struct event *event;
struct priv_data *priv;
- if (slave->pid != (pid_t)-1) {
+ if (slave_pid(slave) != (pid_t)-1) {
ErrPrint("Slave is not deactivated\n");
return;
}
- DbgPrint("Slave data is destroyed %p\n", slave);
-
xmonitor_del_event_callback(XMONITOR_PAUSED, xmonitor_pause_cb, slave);
xmonitor_del_event_callback(XMONITOR_RESUMED, xmonitor_resume_cb, slave);
slave_set_reactivate_instances(slave, 0);
slave->activate_timer = NULL;
- if (slave->pid > 0) {
+ if (slave_pid(slave) > 0) {
int ret;
- DbgPrint("Try to terminate PID: %d\n", slave->pid);
- ret = aul_terminate_pid(slave->pid);
+ DbgPrint("Try to terminate PID: %d\n", slave_pid(slave));
+ ret = aul_terminate_pid(slave_pid(slave));
if (ret < 0)
- ErrPrint("Terminate failed, pid %d\n", slave->pid);
+ ErrPrint("Terminate failed, pid %d (reason: %d)\n", slave_pid(slave), ret);
}
+ ErrPrint("Slave is not activated in %lf sec (slave: %s)\n", SLAVE_ACTIVATE_TIME, slave_name(slave));
slave = slave_deactivated(slave);
- ErrPrint("Slave is not activated in %lf sec (slave: %p)\n", SLAVE_ACTIVATE_TIME, slave);
return ECORE_CALLBACK_CANCEL;
}
* So we can use this simple code for checking the slave's last state.
* about it is alive? or not.
*/
- if (slave->pid != (pid_t)-1)
+ if (slave_pid(slave) != (pid_t)-1)
return LB_STATUS_ERROR_ALREADY;
if (DEBUG_MODE) {
- DbgPrint("Debug Mode enabled. name[%s] secured[%d] abi[%s]\n", slave->name, slave->secured, slave->abi);
+ DbgPrint("Debug Mode enabled. name[%s] secured[%d] abi[%s]\n", slave_name(slave), slave->secured, slave->abi);
} else {
bundle *param;
param = bundle_create();
return LB_STATUS_ERROR_FAULT;
}
- bundle_add(param, BUNDLE_SLAVE_NAME, slave->name);
+ bundle_add(param, BUNDLE_SLAVE_NAME, slave_name(slave));
bundle_add(param, BUNDLE_SLAVE_SECURED, slave->secured ? "true" : "false");
bundle_add(param, BUNDLE_SLAVE_ABI, slave->abi);
- DbgPrint("Launch the slave package: %s\n", slave->pkgname);
- slave->pid = (pid_t)aul_launch_app(slave->pkgname, param);
+ slave->pid = (pid_t)aul_launch_app(slave_pkgname(slave), param);
bundle_free(param);
if (slave->pid < 0) {
- ErrPrint("Failed to launch a new slave %s (%d)\n", slave->name, slave->pid);
+ ErrPrint("Failed to launch a new slave %s (%d)\n", slave_name(slave), slave->pid);
slave->pid = (pid_t)-1;
return LB_STATUS_ERROR_FAULT;
}
- DbgPrint("Slave launched %d for %s\n", slave->pid, slave->name);
+ DbgPrint("Slave %s is launched with %d as %s\n", slave_pkgname(slave), slave->pid, slave_name(slave));
slave->activate_timer = ecore_timer_add(SLAVE_ACTIVATE_TIME, activate_timer_cb, slave);
if (!slave->activate_timer)
* Increase the refcnt of a slave,
* To prevent from making an orphan(slave).
*/
- slave_ref(slave);
+ (void)slave_ref(slave);
return LB_STATUS_SUCCESS;
}
slave_pause(slave);
if (slave->secured == 1) {
- DbgPrint("Slave deactivation timer is added (%s - %lf)\n", slave->name, SLAVE_TTL);
+ DbgPrint("Slave deactivation timer is added (%s - %lf)\n", slave_name(slave), SLAVE_TTL);
slave->ttl_timer = ecore_timer_add(SLAVE_TTL, slave_ttl_cb, slave);
if (!slave->ttl_timer)
ErrPrint("Failed to create a TTL timer\n");
return slave;
}
- DbgPrint("Deactivate a slave: %d\n", slave->pid);
/*!
* \todo
* check the return value of the aul_terminate_pid
*/
slave->state = SLAVE_REQUEST_TO_TERMINATE;
- DbgPrint("Terminate PID: %d\n", slave->pid);
- if (slave->pid > 0) {
+ if (slave_pid(slave) > 0) {
+ DbgPrint("Terminate slave: %d (%s)\n", slave_pid(slave), slave_name(slave));
ret = aul_terminate_pid(slave->pid);
if (ret < 0) {
- ErrPrint("Terminate failed. pid %d (%d)\n", slave->pid, ret);
+ ErrPrint("Terminate slave(%s) failed. pid %d (%d)\n", slave_name(slave), slave_pid(slave), ret);
slave = slave_deactivated(slave);
}
}
(void)fault_check_pkgs(slave);
- if (slave->pid > 0) {
- DbgPrint("Try to terminate PID: %d\n", slave->pid);
- ret = aul_terminate_pid(slave->pid);
+ if (slave_pid(slave) > 0) {
+ DbgPrint("Try to terminate PID: %d\n", slave_pid(slave));
+ ret = aul_terminate_pid(slave_pid(slave));
if (ret < 0) {
- ErrPrint("Terminate failed, pid %d\n", slave->pid);
+ ErrPrint("Terminate failed, pid %d\n", slave_pid(slave));
}
}
struct slave_node *slave;
EINA_LIST_FOREACH(s_info.slave_list, l, slave) {
- if (slave->pid == pid)
+ if (slave_pid(slave) == pid)
return slave;
}
struct slave_node *slave;
EINA_LIST_FOREACH(s_info.slave_list, l, slave) {
- if (!strcmp(slave->name, name))
+ if (!strcmp(slave_name(slave), name))
return slave;
}
continue;
if (slave->secured) {
- DbgPrint("Found secured slave - has no instances (%s)\n", slave_name(slave));
- if (slave->loaded_package == 0)
+ if (slave->loaded_package == 0) {
+ DbgPrint("Found secured slave - has no instances (%s)\n", slave_name(slave));
return slave;
+ }
} else if (slave->network == network) {
- DbgPrint("slave[%s] %d (net: %d)\n", slave_name(slave), slave->loaded_package, slave->network);
+ DbgPrint("slave[%s] loaded_package[%d] net: [%d]\n", slave_name(slave), slave->loaded_package, slave->network);
if (!strcasecmp(abi, DEFAULT_ABI)) {
if (slave->loaded_package < SLAVE_MAX_LOAD)
return slave;
struct slave_node *slave;
EINA_LIST_FOREACH(s_info.slave_list, l, slave) {
- if (!strcmp(slave->pkgname, pkgname)) {
- if (slave->pid == (pid_t)-1) {
+ if (!strcmp(slave_pkgname(slave), pkgname)) {
+ if (slave_pid(slave) == (pid_t)-1) {
return slave;
}
}
HAPI void slave_load_instance(struct slave_node *slave)
{
slave->loaded_instance++;
- DbgPrint("Instance: (%d)%d\n", slave->pid, slave->loaded_instance);
+ DbgPrint("Instance: (%d)%d\n", slave_pid(slave), slave->loaded_instance);
}
HAPI int const slave_loaded_instance(struct slave_node *slave)
}
slave->loaded_instance--;
- DbgPrint("Instance: (%d)%d\n", slave->pid, slave->loaded_instance);
+ DbgPrint("Instance: (%d)%d\n", slave_pid(slave), slave->loaded_instance);
if (slave->loaded_instance == 0 && slave_is_activated(slave)) {
slave_set_reactivation(slave, 0);
slave_set_reactivate_instances(slave, 0);
if (!slave)
return LB_STATUS_ERROR_INVALID;
- DbgPrint("Slave PID is updated to %d from %d\n", pid, slave->pid);
+ DbgPrint("Slave PID is updated to %d from %d\n", pid, slave_pid(slave));
slave->pid = pid;
return LB_STATUS_SUCCESS;