diff options
Diffstat (limited to 'src/fault_manager.c')
| -rw-r--r-- | src/fault_manager.c | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/src/fault_manager.c b/src/fault_manager.c index 1ec4398..4029229 100644 --- a/src/fault_manager.c +++ b/src/fault_manager.c @@ -23,8 +23,10 @@ #include <Eina.h> #include <packet.h> #include <dlog.h> -#include <livebox-errno.h> -#include <livebox-service.h> +#include <dynamicbox_errno.h> +#include <dynamicbox_service.h> +#include <dynamicbox_conf.h> +#include <dynamicbox_cmd_list.h> #include "util.h" #include "debug.h" @@ -63,7 +65,7 @@ static void clear_log_file(struct slave_node *slave) char filename[BUFSIZ]; int ret; - ret = snprintf(filename, sizeof(filename) - 1, "%s/slave.%d", SLAVE_LOG_PATH, slave_pid(slave)); + ret = snprintf(filename, sizeof(filename) - 1, "%s/slave.%d", DYNAMICBOX_CONF_LOG_PATH, slave_pid(slave)); if (ret == sizeof(filename) - 1) { filename[sizeof(filename) - 1] = '\0'; ErrPrint("filename buffer is overflowed\n"); @@ -81,7 +83,7 @@ static char *check_log_file(struct slave_node *slave) FILE *fp; char filename[BUFSIZ]; - snprintf(filename, sizeof(filename), "%s/slave.%d", SLAVE_LOG_PATH, slave_pid(slave)); + snprintf(filename, sizeof(filename), "%s/slave.%d", DYNAMICBOX_CONF_LOG_PATH, slave_pid(slave)); fp = fopen(filename, "rt"); if (!fp) { ErrPrint("No log file found [%s]\n", strerror(errno)); @@ -102,7 +104,7 @@ static char *check_log_file(struct slave_node *slave) ErrPrint("Failed to unlink %s\n", filename); } - ptr = livebox_service_pkgname_by_libexec(libexec); + ptr = dynamicbox_service_dbox_id_by_libexec(libexec); if (!ptr) { ErrPrint("Failed to find the faulted package\n"); } @@ -114,12 +116,13 @@ static char *check_log_file(struct slave_node *slave) HAPI void fault_unicast_info(struct client_node *client, const char *pkgname, const char *filename, const char *func) { struct packet *packet; + unsigned int cmd = CMD_FAULT_PACKAGE; if (!client || !pkgname || !filename || !func) { return; } - packet = packet_create_noack("fault_package", "sss", pkgname, filename, func); + packet = packet_create_noack((const char *)&cmd, "sss", pkgname, filename, func); if (!packet) { return; } @@ -130,8 +133,9 @@ HAPI void fault_unicast_info(struct client_node *client, const char *pkgname, co HAPI void fault_broadcast_info(const char *pkgname, const char *filename, const char *func) { struct packet *packet; + unsigned int cmd = CMD_FAULT_PACKAGE; - packet = packet_create_noack("fault_package", "sss", pkgname, filename, func); + packet = packet_create_noack((const char *)&cmd, "sss", pkgname, filename, func); if (!packet) { ErrPrint("Failed to create a param\n"); return; @@ -155,12 +159,12 @@ HAPI int fault_info_set(struct slave_node *slave, const char *pkgname, const cha pkg = package_find(pkgname); if (!pkg) { - return LB_STATUS_ERROR_NOT_EXIST; + return DBOX_STATUS_ERROR_NOT_EXIST; } ret = package_set_fault_info(pkg, util_timestamp(), id, func); if (ret < 0) { - return LB_STATUS_ERROR_FAULT; + return DBOX_STATUS_ERROR_FAULT; } dump_fault_info(slave_name(slave), slave_pid(slave), pkgname, id, func); @@ -172,7 +176,7 @@ HAPI int fault_info_set(struct slave_node *slave, const char *pkgname, const cha * Update statistics */ s_info.fault_mark_count++; - return LB_STATUS_SUCCESS; + return DBOX_STATUS_ERROR_NONE; } HAPI int fault_check_pkgs(struct slave_node *slave) @@ -273,7 +277,7 @@ HAPI int fault_check_pkgs(struct slave_node *slave) } else { DbgPrint("Treated as a false log\n"); dump_fault_info( - slave_name(info->slave), slave_pid(info->slave), info->pkgname, filename, func); + slave_name(info->slave), slave_pid(info->slave), info->pkgname, filename, func); } s_info.call_list = eina_list_remove_list(s_info.call_list, l); @@ -297,7 +301,7 @@ HAPI int fault_func_call(struct slave_node *slave, const char *pkgname, const ch info = malloc(sizeof(*info)); if (!info) { - return LB_STATUS_ERROR_MEMORY; + return DBOX_STATUS_ERROR_OUT_OF_MEMORY; } info->slave = slave; @@ -305,14 +309,14 @@ HAPI int fault_func_call(struct slave_node *slave, const char *pkgname, const ch info->pkgname = strdup(pkgname); if (!info->pkgname) { DbgFree(info); - return LB_STATUS_ERROR_MEMORY; + return DBOX_STATUS_ERROR_OUT_OF_MEMORY; } info->filename = strdup(filename); if (!info->filename) { DbgFree(info->pkgname); DbgFree(info); - return LB_STATUS_ERROR_MEMORY; + return DBOX_STATUS_ERROR_OUT_OF_MEMORY; } info->func = strdup(func); @@ -320,7 +324,7 @@ HAPI int fault_func_call(struct slave_node *slave, const char *pkgname, const ch DbgFree(info->filename); DbgFree(info->pkgname); DbgFree(info); - return LB_STATUS_ERROR_MEMORY; + return DBOX_STATUS_ERROR_OUT_OF_MEMORY; } info->timestamp = util_timestamp(); @@ -328,7 +332,7 @@ HAPI int fault_func_call(struct slave_node *slave, const char *pkgname, const ch s_info.call_list = eina_list_append(s_info.call_list, info); s_info.fault_mark_count++; - return LB_STATUS_SUCCESS; + return DBOX_STATUS_ERROR_NONE; } HAPI int fault_func_ret(struct slave_node *slave, const char *pkgname, const char *filename, const char *func) @@ -363,7 +367,7 @@ HAPI int fault_func_ret(struct slave_node *slave, const char *pkgname, const cha return 0; } - return LB_STATUS_ERROR_NOT_EXIST; + return DBOX_STATUS_ERROR_NOT_EXIST; } /* End of a file */ |