summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSung-jae Park <nicesj.park@samsung.com>2013-06-27 05:09:44 (GMT)
committerSung-jae Park <nicesj.park@samsung.com>2013-06-27 05:09:44 (GMT)
commit75e938b7e9cb434b4dfcd1ac0b51b9492b39babe (patch)
tree36f70a590fc0cb15371a6dc7f54e0c3a8c859fee
parent958f3c4da5540838c0e92856f46d7ea1b76eee67 (diff)
downloaddata-provider-master-75e938b7e9cb434b4dfcd1ac0b51b9492b39babe.zip
data-provider-master-75e938b7e9cb434b4dfcd1ac0b51b9492b39babe.tar.gz
data-provider-master-75e938b7e9cb434b4dfcd1ac0b51b9492b39babe.tar.bz2
Update Log
Change-Id: Idf8b8e615e654089fe392319b4693ddfb0d93891
-rw-r--r--include/debug.h4
-rw-r--r--src/buffer_handler.c15
-rw-r--r--src/instance.c2
-rw-r--r--src/server.c2
4 files changed, 8 insertions, 15 deletions
diff --git a/include/debug.h b/include/debug.h
index 0929bf0..858dad4 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -27,8 +27,8 @@
#endif
#if !defined(FLOG)
-#define DbgPrint(format, arg...) SECURE_LOGD("[%s/%s:%d] " format, util_basename(__FILE__), __func__, __LINE__, ##arg)
-#define ErrPrint(format, arg...) SECURE_LOGE("[%s/%s:%d] " format, util_basename(__FILE__), __func__, __LINE__, ##arg)
+#define DbgPrint(format, arg...) SECURE_LOGD(format, ##arg)
+#define ErrPrint(format, arg...) SECURE_LOGE(format, ##arg)
#else
extern FILE *__file_log_fp;
#define DbgPrint(format, arg...) do { fprintf(__file_log_fp, "[LOG] [%s/%s:%d] " format, util_basename(__FILE__), __func__, __LINE__, ##arg); fflush(__file_log_fp); } while (0)
diff --git a/src/buffer_handler.c b/src/buffer_handler.c
index e3d431d..35dcd98 100644
--- a/src/buffer_handler.c
+++ b/src/buffer_handler.c
@@ -571,22 +571,19 @@ static inline int load_pixmap_buffer(struct buffer_info *info)
len = strlen(SCHEMA_PIXMAP) + 30; /* strlen("pixmap://") + 30 */
new_id = malloc(len);
if (!new_id) {
- info->is_loaded = 0;
ErrPrint("Heap: %s\n", strerror(errno));
+ info->is_loaded = 0;
buffer_handler_pixmap_unref(buffer);
return LB_STATUS_ERROR_MEMORY;
}
- DbgPrint("Releaseo old id (%s)\n", info->id);
DbgFree(info->id);
info->id = new_id;
gem = (struct gem_data *)buffer->data;
- DbgPrint("gem pointer: %p\n", gem);
snprintf(info->id, len, SCHEMA_PIXMAP "%d", (int)gem->pixmap);
- DbgPrint("info->id: %s\n", info->id);
-
+ DbgPrint("Loaded pixmap(info->id): %s\n", info->id);
return LB_STATUS_SUCCESS;
}
@@ -912,16 +909,12 @@ HAPI void *buffer_handler_pixmap_ref(struct buffer_info *info)
if (instance_lb_buffer(info->inst) == info) {
pkg = instance_package(info->inst);
- if (package_lb_type(pkg) == LB_TYPE_BUFFER) {
- DbgPrint("Doesn't need to create gem for LB\n");
+ if (package_lb_type(pkg) == LB_TYPE_BUFFER)
need_gem = 0;
- }
} else if (instance_pd_buffer(info->inst) == info) {
pkg = instance_package(info->inst);
- if (package_pd_type(pkg) == PD_TYPE_BUFFER) {
- DbgPrint("Doesn't need to create gem for PD\n");
+ if (package_pd_type(pkg) == PD_TYPE_BUFFER)
need_gem = 0;
- }
}
}
diff --git a/src/instance.c b/src/instance.c
index bab59ef..bd77e00 100644
--- a/src/instance.c
+++ b/src/instance.c
@@ -2830,7 +2830,7 @@ HAPI int instance_slave_open_pd(struct inst_info *inst, struct client_node *clie
*/
(void)slave_freeze_ttl(slave);
- DbgPrint("CREATE_PD\n");
+ DbgPrint("PERF_DBOX\n");
ret = slave_rpc_request_only(slave, pkgname, packet, 0);
if (ret < 0) {
ErrPrint("Unable to send request to slave\n");
diff --git a/src/server.c b/src/server.c
index 5acc524..2e00ffe 100644
--- a/src/server.c
+++ b/src/server.c
@@ -4649,7 +4649,7 @@ static struct packet *client_create_pd(pid_t pid, int handle, const struct packe
double x;
double y;
- DbgPrint("CREATE_PD\n");
+ DbgPrint("PERF_DBOX\n");
client = client_find_by_pid(pid);
if (!client) {