/*
* Copyright 2013 Samsung Electronics Co., Ltd
*
- * Licensed under the Flora License, Version 1.0 (the "License");
+ * Licensed under the Flora License, Version 1.1 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.tizenopensource.org/license
+ * http://floralicense.org/license/
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
#include <errno.h>
#include <string.h>
#include <stdlib.h>
+#include <pthread.h>
#include <dlog.h>
#include <glib.h>
+#include <vconf.h>
+#include <vconf-keys.h>
+
#include <packet.h>
#include <com-core.h>
#include <com-core_packet.h>
#include <livebox-errno.h>
+#include <livebox-service.h>
+#include <secure_socket.h>
#include "debug.h"
#include "client.h"
#include "util.h"
#include "master_rpc.h"
#include "conf.h"
-#include "critical_log.h"
+#include "file_service.h"
-static inline void make_connection(void);
+int errno;
static struct info {
int fd;
- guint reconnector;
+ guint timer_id;
+ char *client_addr;
} s_info = {
.fd = -1,
- .reconnector = 0,
+ .timer_id = 0,
+ .client_addr = NULL,
};
static struct packet *master_fault_package(pid_t pid, int handle, const struct packet *packet)
master_rpc_clear_fault_package(pkgname);
lb_invoke_fault_handler(LB_FAULT_DEACTIVATED, pkgname, id, function);
- DbgPrint("%s(%s) is deactivated\n", pkgname, id);
return NULL;
}
goto out;
}
- DbgPrint("[HOLD] %s %d\n", id, seize);
+ DbgPrint("HOLD: %s %d\n", id, seize);
lb_invoke_event_handler(handler, seize ? LB_EVENT_HOLD_SCROLL : LB_EVENT_RELEASE_SCROLL);
out:
struct livebox *handler;
char *new_content;
int ret;
+ int status;
int pinup;
- ret = packet_get(packet, "iisss", &ret, &pinup, &pkgname, &id, &content);
+ ret = packet_get(packet, "iisss", &status, &pinup, &pkgname, &id, &content);
if (ret != 5) {
ErrPrint("Invalid argument\n");
goto out;
goto out;
}
- if (ret == 0) {
+ if (status == 0) {
new_content = strdup(content);
if (new_content) {
free(handler->content);
handler->is_pinned_up = pinup;
} else {
ErrPrint("Heap: %s\n", strerror(errno));
- ret = LB_STATUS_ERROR_MEMORY;
+ status = LB_STATUS_ERROR_MEMORY;
}
}
if (handler->pinup_cb) {
- handler->pinup_cb(handler, ret, handler->pinup_cbdata);
+ ret_cb_t cb;
+ void *cbdata;
- handler->pinup_cb = NULL; /*!< Reset pinup cb */
+ /* Make sure that user can call pinup API in its result callback */
+ cb = handler->pinup_cb;
+ cbdata = handler->pinup_cbdata;
+
+ handler->pinup_cb = NULL;
handler->pinup_cbdata = NULL;
- } else if (ret == 0) {
+
+ cb(handler, status, cbdata);
+ } else if (status == 0) {
lb_invoke_event_handler(handler, LB_EVENT_PINUP_CHANGED);
}
const char *id;
double timestamp;
struct livebox *handler;
+ int reason;
- if (packet_get(packet, "ssd", &pkgname, &id, ×tamp) != 3) {
+ if (packet_get(packet, "ssdi", &pkgname, &id, ×tamp, &reason) != 4) {
ErrPrint("Invalid arguemnt\n");
goto out;
}
* \note
* This is not possible
*/
- CRITICAL_LOG("Already deleted handler (%s - %s)\n", pkgname, id);
+ ErrPrint("Already deleted handler (%s - %s)\n", pkgname, id);
return NULL;
}
}
if (handler->created_cb) {
+ ret_cb_t cb;
+ void *cbdata;
/*!
* \note
*
- * "if (handler->id == NULL)"
+ * "if (handler->id == NULL) {"
*
* The instance is not created yet.
* But the master forcely destroy it and send destroyed event to this
* before creating an instance successfully.
*/
if (handler->created_cb == handler->deleted_cb) {
- if (handler->created_cbdata != handler->deleted_cbdata)
+ if (handler->created_cbdata != handler->deleted_cbdata) {
DbgPrint("cb is same but cbdata is different (%s - %s)\n", pkgname, id);
+ }
handler->deleted_cb = NULL;
handler->deleted_cbdata = NULL;
}
- DbgPrint("Call the created cb with LB_STATUS_ERROR_CANCEL\n");
- handler->created_cb(handler, LB_STATUS_ERROR_CANCEL, handler->created_cbdata);
+ cb = handler->created_cb;
+ cbdata = handler->created_cbdata;
+
handler->created_cb = NULL;
handler->created_cbdata = NULL;
+
+ if (reason == LB_STATUS_SUCCESS) {
+ reason = LB_STATUS_ERROR_CANCEL;
+ }
+ cb(handler, reason, cbdata);
} else if (handler->id) {
if (handler->deleted_cb) {
- DbgPrint("Call the deleted cb\n");
- handler->deleted_cb(handler, LB_STATUS_SUCCESS, handler->deleted_cbdata);
+ ret_cb_t cb;
+ void *cbdata;
+
+ cb = handler->deleted_cb;
+ cbdata = handler->deleted_cbdata;
handler->deleted_cb = NULL;
handler->deleted_cbdata = NULL;
+
+ cb(handler, reason, cbdata);
} else {
- DbgPrint("Call the lb,deleted\n");
lb_invoke_event_handler(handler, LB_EVENT_DELETED);
}
}
- DbgPrint("[%p] %s(%s) is deleted\n", handler, pkgname, id);
+ /*!
+ * \note
+ * Lock file should be deleted after all callbacks are processed.
+ */
+ lb_destroy_lock_file(handler, 0);
/* Just try to delete it, if a user didn't remove it from the live box list */
lb_unref(handler);
}
if (handler->state != CREATE) {
- DbgPrint("(%s) is not created\n", id);
+ ErrPrint("(%s) is not created\n", id);
goto out;
}
* And then begin updating again after change its size.
*/
if (lb_get_lb_fb(handler)) {
- lb_set_lb_fb(handler, fbfile);
+ (void)lb_set_lb_fb(handler, fbfile);
- ret = fb_sync(lb_get_lb_fb(handler));
- if (ret != LB_STATUS_SUCCESS)
+ ret = livebox_sync_lb_fb(handler);
+ if (ret != LB_STATUS_SUCCESS) {
ErrPrint("Failed to do sync FB (%s - %s) (%d)\n", pkgname, fbfile, ret);
- else
+ } else {
lb_invoke_event_handler(handler, LB_EVENT_LB_UPDATE_BEGIN);
+ }
} else {
ErrPrint("Invalid request[%s], %s\n", id, fbfile);
}
}
if (handler->state != CREATE) {
- DbgPrint("[%s] is not created\n", id);
+ ErrPrint("[%s] is not created\n", id);
goto out;
}
if (lb_get_pd_fb(handler)) {
- lb_set_lb_fb(handler, fbfile);
+ (void)lb_set_lb_fb(handler, fbfile);
- ret = fb_sync(lb_get_lb_fb(handler));
- if (ret != LB_STATUS_SUCCESS)
+ ret = livebox_sync_lb_fb(handler);
+ if (ret != LB_STATUS_SUCCESS) {
ErrPrint("Failed to do sync FB (%s - %s) (%d)\n", pkgname, fbfile, ret);
- else
+ } else {
lb_invoke_event_handler(handler, LB_EVENT_PD_UPDATE_BEGIN);
+ }
} else {
ErrPrint("Invalid request[%s], %s\n", id, fbfile);
}
}
if (handler->state != CREATE) {
- DbgPrint("[%s] is not created\n", id);
+ ErrPrint("[%s] is not created\n", id);
goto out;
}
return NULL;
}
-static struct packet *master_access_status(pid_t pid, int handle, const struct packet *packet)
+static struct packet *master_key_status(pid_t pid, int handle, const struct packet *packet)
{
struct livebox *handler;
const char *pkgname;
}
if (handler->state != CREATE) {
- DbgPrint("[%s] is not created\n", id);
+ ErrPrint("[%s] is not created\n", id);
goto out;
}
- DbgPrint("Access status: %d\n", status);
+ if (handler->key_event_cb) {
+ ret_cb_t cb;
+ void *cbdata;
+
+ cb = handler->key_event_cb;
+ cbdata = handler->key_event_cbdata;
+
+ handler->key_event_cb = NULL;
+ handler->key_event_cbdata = NULL;
+
+ cb(handler, status, cbdata);
+ } else {
+ ErrPrint("Invalid event[%s]\n", id);
+ }
+out:
+ return NULL;
+}
+
+static struct packet *master_request_close_pd(pid_t pid, int handle, const struct packet *packet)
+{
+ struct livebox *handler;
+ const char *pkgname;
+ const char *id;
+ int ret;
+ int reason;
+
+ ret = packet_get(packet, "ssi", &pkgname, &id, &reason);
+ if (ret != 3) {
+ ErrPrint("Invalid argument\n");
+ goto out;
+ }
+
+ handler = lb_find_livebox(pkgname, id);
+ if (!handler) {
+ ErrPrint("Instance[%s] is not exists\n", id);
+ goto out;
+ }
+
+ if (handler->state != CREATE) {
+ ErrPrint("[%s] is not created\n", id);
+ goto out;
+ }
+
+ DbgPrint("Reason: %d\n", reason);
+ lb_invoke_event_handler(handler, LB_EVENT_REQUEST_CLOSE_PD);
+out:
+ return NULL;
+}
+
+static struct packet *master_access_status(pid_t pid, int handle, const struct packet *packet)
+{
+ struct livebox *handler;
+ const char *pkgname;
+ const char *id;
+ int ret;
+ int status;
+
+ ret = packet_get(packet, "ssi", &pkgname, &id, &status);
+ if (ret != 3) {
+ ErrPrint("Invalid argument\n");
+ goto out;
+ }
+
+ handler = lb_find_livebox(pkgname, id);
+ if (!handler) {
+ ErrPrint("Instance[%s] is not exists\n", id);
+ goto out;
+ }
+
+ if (handler->state != CREATE) {
+ ErrPrint("[%s] is not created\n", id);
+ goto out;
+ }
if (handler->access_event_cb) {
- handler->access_event_cb(handler, status, handler->access_event_cbdata);
+ ret_cb_t cb;
+ void *cbdata;
+
+ cb = handler->access_event_cb;
+ cbdata = handler->access_event_cbdata;
+
handler->access_event_cb = NULL;
handler->access_event_cbdata = NULL;
+
+ cb(handler, status, cbdata);
} else {
ErrPrint("Invalid event[%s]\n", id);
}
}
if (handler->state != CREATE) {
- DbgPrint("[%s] is not created\n", id);
+ ErrPrint("[%s] is not created\n", id);
goto out;
}
const char *fbfile;
const char *content;
const char *title;
+ const char *safe_file;
+ const char *icon;
+ const char *name;
struct livebox *handler;
int lb_w;
int lb_h;
double priority;
int ret;
- ret = packet_get(packet, "sssiidss",
+ ret = packet_get(packet, "sssiidsssss",
&pkgname, &id,
&fbfile, &lb_w, &lb_h,
- &priority, &content, &title);
- if (ret != 8) {
+ &priority, &content, &title,
+ &safe_file, &icon, &name);
+ if (ret != 11) {
ErrPrint("Invalid argument\n");
goto out;
}
* Don't try to notice anything with this, Just ignore all events
* Beacuse the user doesn't wants know about this anymore
*/
- DbgPrint("(%s) is not exists, but updated\n", id);
+ ErrPrint("(%s) is not exists, but updated\n", id);
goto out;
}
lb_set_content(handler, content);
lb_set_title(handler, title);
lb_set_size(handler, lb_w, lb_h);
+ lb_set_filename(handler, safe_file);
if (lb_text_lb(handler)) {
(void)parse_desc(handler, livebox_filename(handler), 0);
*/
goto out;
} else if (lb_get_lb_fb(handler)) {
- lb_set_lb_fb(handler, fbfile);
- ret = fb_sync(lb_get_lb_fb(handler));
- if (ret != LB_STATUS_SUCCESS)
- ErrPrint("Failed to do sync FB (%s - %s) (%d)\n", pkgname, util_basename(util_uri_to_path(id)), ret);
+ if (conf_frame_drop_for_resizing() && handler->size_changed_cb) {
+ /* Just for skipping the update event callback call, After request to resize buffer, update event will be discarded */
+ DbgPrint("Discards obsoloted update event\n");
+ ret = LB_STATUS_ERROR_BUSY;
+ } else {
+ (void)lb_set_lb_fb(handler, fbfile);
+
+ if (!conf_manual_sync()) {
+ ret = livebox_sync_lb_fb(handler);
+ if (ret != LB_STATUS_SUCCESS) {
+ ErrPrint("Failed to do sync FB (%s - %s) (%d)\n", pkgname, util_basename(util_uri_to_path(id)), ret);
+ }
+ } else {
+ ret = LB_STATUS_SUCCESS;
+ }
+ }
} else {
ret = LB_STATUS_SUCCESS;
}
- if (ret == LB_STATUS_SUCCESS)
+ if (ret == LB_STATUS_SUCCESS) {
lb_invoke_event_handler(handler, LB_EVENT_LB_UPDATED);
+ }
out:
return NULL;
DbgPrint("Text TYPE does not need to handle this\n");
} else {
(void)lb_set_pd_fb(handler, buf_id);
- ret = fb_sync(lb_get_pd_fb(handler));
- if (ret < 0)
+ ret = livebox_sync_pd_fb(handler);
+ if (ret < 0) {
ErrPrint("Failed to do sync FB (%s - %s)\n", pkgname, util_basename(util_uri_to_path(id)));
+ }
}
handler->is_pd_created = (status == 0);
+ switch (handler->pd.type) {
+ case _PD_TYPE_SCRIPT:
+ case _PD_TYPE_BUFFER:
+ switch (fb_type(lb_get_pd_fb(handler))) {
+ case BUFFER_TYPE_FILE:
+ case BUFFER_TYPE_SHM:
+ lb_create_lock_file(handler, 1);
+ break;
+ case BUFFER_TYPE_PIXMAP:
+ case BUFFER_TYPE_ERROR:
+ default:
+ break;
+ }
+ break;
+ case _PD_TYPE_TEXT:
+ default:
+ break;
+ }
+
if (handler->pd_created_cb) {
- DbgPrint("pd_created_cb (%s) - %d\n", buf_id, status);
- handler->pd_created_cb(handler, status, handler->pd_created_cbdata);
+ ret_cb_t cb;
+ void *cbdata;
+
+ cb = handler->pd_created_cb;
+ cbdata = handler->pd_created_cbdata;
handler->pd_created_cb = NULL;
handler->pd_created_cbdata = NULL;
- } else if (status == 0) {
- DbgPrint("LB_EVENT_PD_CREATED (%s) - %d\n", buf_id, status);
+
+ /*!
+ * Before call the Callback function,
+ * pd_create_cb must be reset.
+ * Because, in the create callback, user can call create_pd function again.
+ */
+ DbgPrint("PERF_DBOX\n");
+ cb(handler, status, cbdata);
+ } else if (handler->is_pd_created) {
lb_invoke_event_handler(handler, LB_EVENT_PD_CREATED);
}
handler->is_pd_created = 0;
if (handler->pd_destroyed_cb) {
- DbgPrint("Invoke the PD Destroyed CB\n");
- handler->pd_destroyed_cb(handler, status, handler->pd_destroyed_cbdata);
+ ret_cb_t cb;
+ void *cbdata;
+
+ cb = handler->pd_destroyed_cb;
+ cbdata = handler->pd_destroyed_cbdata;
handler->pd_destroyed_cb = NULL;
handler->pd_destroyed_cbdata = NULL;
+
+ /*!
+ * Before call the Callback function,
+ * pd_destroyed_cb must be reset.
+ * Because, in the create callback, user can call destroy_pd function again.
+ */
+ cb(handler, status, cbdata);
} else if (status == 0) {
- DbgPrint("Invoke the LB_EVENT_PD_DESTROYED event\n");
lb_invoke_event_handler(handler, LB_EVENT_PD_DESTROYED);
}
+ /*!
+ * \note
+ * Lock file should be deleted after all callbacks are processed.
+ */
+ switch (handler->pd.type) {
+ case _PD_TYPE_SCRIPT:
+ case _PD_TYPE_BUFFER:
+ switch (fb_type(lb_get_pd_fb(handler))) {
+ case BUFFER_TYPE_FILE:
+ case BUFFER_TYPE_SHM:
+ lb_destroy_lock_file(handler, 1);
+ break;
+ case BUFFER_TYPE_PIXMAP:
+ case BUFFER_TYPE_ERROR:
+ default:
+ break;
+ }
+ break;
+ case _PD_TYPE_TEXT:
+ default:
+ break;
+ }
+
out:
return NULL;
}
if (lb_text_pd(handler)) {
(void)parse_desc(handler, descfile, 1);
} else {
- (void)lb_set_pd_fb(handler, fbfile);
-
- ret = fb_sync(lb_get_pd_fb(handler));
- if (ret < 0)
- ErrPrint("Failed to do sync FB (%s - %s)\n", pkgname, util_basename(util_uri_to_path(id)));
- else
- lb_invoke_event_handler(handler, LB_EVENT_PD_UPDATED);
+ if (conf_frame_drop_for_resizing() && handler->size_changed_cb) {
+ /* Just for skipping the update event callback call, After request to resize buffer, update event will be discarded */
+ DbgPrint("Discards obsoloted update event\n");
+ } else {
+ (void)lb_set_pd_fb(handler, fbfile);
+
+ if (!conf_manual_sync()) {
+ ret = livebox_sync_pd_fb(handler);
+ if (ret < 0) {
+ ErrPrint("Failed to do sync FB (%s - %s), %d\n", pkgname, util_basename(util_uri_to_path(id)), ret);
+ } else {
+ lb_invoke_event_handler(handler, LB_EVENT_PD_UPDATED);
+ }
+ } else {
+ lb_invoke_event_handler(handler, LB_EVENT_PD_UPDATED);
+ }
+ }
}
out:
goto out;
}
- DbgPrint("Update mode is changed: %d, %d, %s\n", status, active_mode, id);
-
handler = lb_find_livebox(pkgname, id);
if (!handler) {
ErrPrint("Livebox(%s) is not found\n", id);
goto out;
}
- if (status == LB_STATUS_SUCCESS)
+ if (status == LB_STATUS_SUCCESS) {
lb_set_update_mode(handler, active_mode);
+ }
if (handler->update_mode_cb) {
- handler->update_mode_cb(handler, status, handler->update_mode_cbdata);
+ ret_cb_t cb;
+ void *cbdata;
+
+ cb = handler->update_mode_cb;
+ cbdata = handler->update_mode_cbdata;
handler->update_mode_cb = NULL;
handler->update_mode_cbdata = NULL;
+
+ cb(handler, status, cbdata);
} else {
lb_invoke_event_handler(handler, LB_EVENT_UPDATE_MODE_CHANGED);
}
goto out;
}
- DbgPrint("Size is changed: %dx%d (%s), fb: [%s]\n", w, h, id, fbfile);
-
handler = lb_find_livebox(pkgname, id);
if (!handler) {
ErrPrint("Livebox(%s) is not found\n", id);
}
if (is_pd) {
- DbgPrint("PD is resized\n");
/*!
* \NOTE
* PD is not able to resized by the client.
}
} else {
if (status == 0) {
- DbgPrint("LB is successfully resized (%dx%d)\n", w, h);
lb_set_size(handler, w, h);
/*!
* Update it too.
*/
if (lb_get_lb_fb(handler)) {
- lb_set_lb_fb(handler, fbfile);
+ (void)lb_set_lb_fb(handler, fbfile);
- ret = fb_sync(lb_get_lb_fb(handler));
- if (ret < 0)
+ ret = livebox_sync_lb_fb(handler);
+ if (ret < 0) {
ErrPrint("Failed to do sync FB (%s - %s)\n", pkgname, util_basename(util_uri_to_path(id)));
+ }
/* Just update the size info only. */
}
* So I added some log before & after call the user callback.
*/
if (handler->size_changed_cb) {
- handler->size_changed_cb(handler, status, handler->size_cbdata);
+ ret_cb_t cb;
+ void *cbdata;
+
+ cb = handler->size_changed_cb;
+ cbdata = handler->size_cbdata;
handler->size_changed_cb = NULL;
handler->size_cbdata = NULL;
+
+ cb(handler, status, cbdata);
} else {
lb_invoke_event_handler(handler, LB_EVENT_LB_SIZE_CHANGED);
}
} else {
- DbgPrint("LB is not resized: %dx%d (%d)\n", w, h, status);
if (handler->size_changed_cb) {
- handler->size_changed_cb(handler, status, handler->size_cbdata);
+ ret_cb_t cb;
+ void *cbdata;
+
+ cb = handler->size_changed_cb;
+ cbdata = handler->size_cbdata;
handler->size_changed_cb = NULL;
handler->size_cbdata = NULL;
+
+ cb(handler, status, cbdata);
}
}
}
goto out;
}
- DbgPrint("Update period is changed? %lf (%d)\n", period, status);
- if (status == 0)
+ if (status == 0) {
lb_set_period(handler, period);
+ }
if (handler->period_changed_cb) {
- handler->period_changed_cb(handler, status, handler->group_cbdata);
+ ret_cb_t cb;
+ void *cbdata;
+
+ cb = handler->period_changed_cb;
+ cbdata = handler->period_cbdata;
handler->period_changed_cb = NULL;
handler->period_cbdata = NULL;
+
+ cb(handler, status, cbdata);
} else if (status == 0) {
lb_invoke_event_handler(handler, LB_EVENT_PERIOD_CHANGED);
}
goto out;
}
- DbgPrint("Group is changed? [%s] / [%s] (%d)\n", cluster, category, status);
- if (status == 0)
+ if (status == 0) {
(void)lb_set_group(handler, cluster, category);
+ }
if (handler->group_changed_cb) {
- handler->group_changed_cb(handler, status, handler->group_cbdata);
+ ret_cb_t cb;
+ void *cbdata;
+
+ cb = handler->group_changed_cb;
+ cbdata = handler->group_cbdata;
handler->group_changed_cb = NULL;
handler->group_cbdata = NULL;
+
+ cb(handler, status, cbdata);
} else if (status == 0) {
lb_invoke_event_handler(handler, LB_EVENT_GROUP_CHANGED);
}
break;
case _LB_TYPE_SCRIPT:
case _LB_TYPE_BUFFER:
- if (!strlen(lb_fname))
+ if (!strlen(lb_fname)) {
+ break;
+ }
+ (void)lb_set_lb_fb(handler, lb_fname);
+
+ /*!
+ * \note
+ * Livebox should create the lock file from here.
+ * Even if the old_state == DELETE,
+ * the lock file will be deleted from deleted event callback.
+ */
+ switch (fb_type(lb_get_lb_fb(handler))) {
+ case BUFFER_TYPE_FILE:
+ case BUFFER_TYPE_SHM:
+ lb_create_lock_file(handler, 0);
+ break;
+ case BUFFER_TYPE_PIXMAP:
+ case BUFFER_TYPE_ERROR:
+ default:
break;
- lb_set_lb_fb(handler, lb_fname);
- ret = fb_sync(lb_get_lb_fb(handler));
- if (ret < 0)
+ }
+
+ ret = livebox_sync_lb_fb(handler);
+ if (ret < 0) {
ErrPrint("Failed to do sync FB (%s - %s)\n", pkgname, util_basename(util_uri_to_path(id)));
+ }
break;
case _LB_TYPE_TEXT:
lb_set_text_lb(handler);
switch (pd_type) {
case _PD_TYPE_SCRIPT:
case _PD_TYPE_BUFFER:
- if (!strlen(pd_fname))
+ if (!strlen(pd_fname)) {
break;
+ }
lb_set_pd_fb(handler, pd_fname);
- ret = fb_sync(lb_get_pd_fb(handler));
- if (ret < 0)
+ ret = livebox_sync_pd_fb(handler);
+ if (ret < 0) {
ErrPrint("Failed to do sync FB (%s - %s)\n", pkgname, util_basename(util_uri_to_path(id)));
+ }
+
+ /*!
+ * \brief
+ * PD doesn't need to create the lock file from here.
+ * Just create it from PD_CREATED event.
+ */
+
break;
case _PD_TYPE_TEXT:
lb_set_text_pd(handler);
*/
if (handler->created_cb) {
- DbgPrint("Invoke the created_cb\n");
- handler->created_cb(handler, ret, handler->created_cbdata);
+ ret_cb_t cb;
+ void *cbdata;
+
+ cb = handler->created_cb;
+ cbdata = handler->created_cbdata;
handler->created_cb = NULL;
handler->created_cbdata = NULL;
+
+ cb(handler, ret, cbdata);
} else {
- DbgPrint("Invoke the lb,created\n");
lb_invoke_event_handler(handler, LB_EVENT_CREATED);
}
}
out:
if (ret == 0 && old_state == DELETE) {
- DbgPrint("Send the delete request\n");
- lb_send_delete(handler, handler->created_cb, handler->created_cbdata);
+ lb_send_delete(handler, handler->delete_type, handler->created_cb, handler->created_cbdata);
/*!
* \note
.cmd = "access_status",
.handler = master_access_status,
},
+ {
+ .cmd = "key_status",
+ .handler = master_key_status,
+ },
+ {
+ .cmd = "close_pd",
+ .handler = master_request_close_pd,
+ },
{
.cmd = NULL,
} else {
int ret;
- if (packet_get(result, "i", &ret) != 1)
+ if (packet_get(result, "i", &ret) != 1) {
ErrPrint("Invalid argument\n");
- else
+ } else {
DbgPrint("Acquire returns: %d\n", ret);
+ }
}
return;
}
-static gboolean connector_cb(gpointer user_data)
-{
- s_info.reconnector = 0;
-
- if (s_info.fd > 0) {
- DbgPrint("Connection is already made\n");
- return FALSE;
- }
-
- make_connection();
- return FALSE;
-}
-
-static inline void make_connection(void)
+static inline int make_connection(void)
{
struct packet *packet;
int ret;
DbgPrint("Let's making connection!\n");
- s_info.fd = com_core_packet_client_init(CLIENT_SOCKET, 0, s_table);
+ s_info.fd = com_core_packet_client_init(client_addr(), 0, s_table);
if (s_info.fd < 0) {
- /*!< After 10 secs later, try to connect again */
- s_info.reconnector = g_timeout_add(RECONNECT_PERIOD, connector_cb, NULL);
- if (s_info.reconnector == 0)
- ErrPrint("Failed to fire the reconnector\n");
-
- ErrPrint("Try this again A sec later\n");
- return;
+ ErrPrint("Try this again later\n");
+ return LB_STATUS_ERROR_IO;
}
packet = packet_create("acquire", "d", util_timestamp());
if (!packet) {
com_core_packet_client_fini(s_info.fd);
s_info.fd = -1;
- return;
+ return LB_STATUS_ERROR_FAULT;
}
ret = master_rpc_async_request(NULL, packet, 1, acquire_cb, NULL);
ErrPrint("Master RPC returns %d\n", ret);
com_core_packet_client_fini(s_info.fd);
s_info.fd = -1;
+ return LB_STATUS_ERROR_IO;
}
+ return LB_STATUS_SUCCESS;
}
static int connected_cb(int handle, void *data)
return 0;
}
+static void master_started_cb(keynode_t *node, void *data)
+{
+ int state = 0;
+
+ if (vconf_get_bool(VCONFKEY_MASTER_STARTED, &state) < 0) {
+ ErrPrint("Unable to get [%s]\n", VCONFKEY_MASTER_STARTED);
+ }
+
+ DbgPrint("Master state: %d\n", state);
+ if (state == 1 && make_connection() == LB_STATUS_SUCCESS) {
+ int ret;
+ ret = vconf_ignore_key_changed(VCONFKEY_MASTER_STARTED, master_started_cb);
+ DbgPrint("master_started vconf key de-registered [%d]\n", ret);
+ }
+}
+
+static gboolean timeout_cb(gpointer data)
+{
+ if (vconf_notify_key_changed(VCONFKEY_MASTER_STARTED, master_started_cb, NULL) < 0) {
+ ErrPrint("Failed to add vconf for monitoring service state\n");
+ } else {
+ DbgPrint("vconf event callback is registered\n");
+ }
+
+ master_started_cb(NULL, NULL);
+
+ s_info.timer_id = 0;
+ return FALSE;
+}
+
static int disconnected_cb(int handle, void *data)
{
if (s_info.fd != handle) {
s_info.fd = -1; /*!< Disconnected */
- if (s_info.reconnector > 0) {
- DbgPrint("Reconnector already fired\n");
- return 0;
- }
-
- /*!< After 10 secs later, try to connect again */
- s_info.reconnector = g_timeout_add(RECONNECT_PERIOD, connector_cb, NULL);
- if (s_info.reconnector == 0) {
- ErrPrint("Failed to fire the reconnector\n");
- make_connection();
- }
-
master_rpc_clear_all_request();
lb_invoke_fault_handler(LB_FAULT_PROVIDER_DISCONNECTED, MASTER_PKGNAME, "default", "disconnected");
lb_delete_all();
+
+ /* Try to reconnect after 1 sec later */
+ if (!s_info.timer_id) {
+ DbgPrint("Reconnecting timer is added\n");
+ s_info.timer_id = g_timeout_add(1000, timeout_cb, NULL);
+ if (s_info.timer_id == 0) {
+ ErrPrint("Unable to add reconnecting timer\n");
+ return 0;
+ }
+ } else {
+ ErrPrint("Reconnecting timer is already exists\n");
+ }
+
return 0;
}
-int client_init(void)
+int client_init(int use_thread)
{
+ com_core_packet_use_thread(use_thread);
+
+ s_info.client_addr = vconf_get_str(VCONFKEY_MASTER_CLIENT_ADDR);
+ if (!s_info.client_addr) {
+ s_info.client_addr = strdup(CLIENT_SOCKET);
+ if (!s_info.client_addr) {
+ ErrPrint("Heap: %s\n", strerror(errno));
+ return -ENOMEM;
+ }
+ }
+
+ (void)file_service_init();
+
+ DbgPrint("Server Address: %s\n", s_info.client_addr);
+
com_core_add_event_callback(CONNECTOR_DISCONNECTED, disconnected_cb, NULL);
com_core_add_event_callback(CONNECTOR_CONNECTED, connected_cb, NULL);
- make_connection();
+ if (vconf_notify_key_changed(VCONFKEY_MASTER_STARTED, master_started_cb, NULL) < 0) {
+ ErrPrint("Failed to add vconf for service state\n");
+ } else {
+ DbgPrint("vconf event callback is registered\n");
+ }
+
+ master_started_cb(NULL, NULL);
return 0;
}
const char *client_addr(void)
{
- return CLIENT_SOCKET;
+ return s_info.client_addr;
}
int client_fini(void)
{
- com_core_packet_client_fini(s_info.fd);
+ int ret;
+
+ (void)file_service_fini();
+
+ ret = vconf_ignore_key_changed(VCONFKEY_MASTER_STARTED, master_started_cb);
+ if (ret < 0) {
+ DbgPrint("Ignore vconf key: %d\n", ret);
+ }
+
com_core_del_event_callback(CONNECTOR_DISCONNECTED, disconnected_cb, NULL);
com_core_del_event_callback(CONNECTOR_CONNECTED, connected_cb, NULL);
+ com_core_packet_client_fini(s_info.fd);
s_info.fd = -1;
- return 0;
+ free(s_info.client_addr);
+ s_info.client_addr = NULL;
+ return LB_STATUS_SUCCESS;
}
/* End of a file */