From dc25cfe49dee05989cf7564d8e88e84ed0d6296f Mon Sep 17 00:00:00 2001 From: Masayuki Sasaki Date: Thu, 26 Dec 2013 15:08:08 +0900 Subject: [PATCH] Revise: add manifest file for SMACK label setting. Log output level correction.(performance). Modular start/end log addition. Change-Id: I08920630139ff1db53f897816df8c9e21e3fd3fb Signed-off-by: Masayuki Sasaki --- ico-app-soundsample/src/soundsample.c | 37 ++++++++++------------ .../src/soundsample_pulse_async_test.cpp | 10 +++--- ico-app-vicsample/src/vicsample.c | 29 +++++++++-------- ico-uxf-homescreen-sample-apps.manifest | 5 +++ packaging/ico-uxf-homescreen-sample-apps.changes | 10 ++++++ packaging/ico-uxf-homescreen-sample-apps.spec | 5 +-- 6 files changed, 54 insertions(+), 42 deletions(-) create mode 100644 ico-uxf-homescreen-sample-apps.manifest diff --git a/ico-app-soundsample/src/soundsample.c b/ico-app-soundsample/src/soundsample.c index c46a56d..836ce0d 100644 --- a/ico-app-soundsample/src/soundsample.c +++ b/ico-app-soundsample/src/soundsample.c @@ -13,14 +13,6 @@ * @date Mar-04-2013 */ -#ifdef HAVE_CONFIG_H - -#include "config.h" -#define __UNUSED__ -#else -#define __UNUSED__ -#endif - #include #include #include @@ -44,7 +36,9 @@ #define WIDTH (1080) /* Base Background width */ #define HEIGHT (1920 - STATUS_BAR_HEIGHT - CTRL_BAR_HEIGHT) /* Base Background height */ -#define PACKAG "ico-app-soundsample" +/* Module name */ +#define MODULE_NAME "org.tizen.ico.app-soundsample" + #define CONFIG_FILE "/usr/apps/org.tizen.ico.app-soundsample/res/soundsample_config.txt" #define BG_IMAGE_FILE "/usr/apps/org.tizen.ico.app-soundsample/res/images/sound_bg.png" @@ -228,32 +222,32 @@ static char SsndType[32]; /*============================================================================*/ static void _on_mousedown1(void *data, Evas_Object *obj, void *event_info) { - ICO_DBG("TOUCH_EVENT _on_mousedown1: Enter"); - ICO_DBG("TOUCH_EVENT Input event : START"); + ICO_PRF("TOUCH_EVENT _on_mousedown1: Enter"); + ICO_PRF("TOUCH_EVENT Input event : START"); rcv_event(START_REQ); - ICO_DBG("TOUCH_EVENT _on_mousedown1: Leave"); + ICO_PRF("TOUCH_EVENT _on_mousedown1: Leave"); } static void _on_mousedown2(void *data, Evas_Object *obj, void *event_info) { - ICO_DBG("TOUCH_EVENT _on_mousedown2: Enter"); - ICO_DBG("TOUCH_EVENT Input event : STOP"); + ICO_PRF("TOUCH_EVENT _on_mousedown2: Enter"); + ICO_PRF("TOUCH_EVENT Input event : STOP"); rcv_event(STOP_REQ); - ICO_DBG("TOUCH_EVENT _on_mousedown2: Leave"); + ICO_PRF("TOUCH_EVENT _on_mousedown2: Leave"); } static void _on_mousedown3(void *data, Evas_Object *obj, void *event_info) { - ICO_DBG("TOUCH_EVENT _on_mousedown3: Enter"); - ICO_DBG("TOUCH_EVENT Input event : PAUSE"); + ICO_PRF("TOUCH_EVENT _on_mousedown3: Enter"); + ICO_PRF("TOUCH_EVENT Input event : PAUSE"); rcv_event(PAUSE_REQ); - ICO_DBG("TOUCH_EVENT _on_mousedown3: Leave"); + ICO_PRF("TOUCH_EVENT _on_mousedown3: Leave"); } static int start_audio(void) @@ -842,7 +836,7 @@ static bool app_create(void *data) ICO_DBG("W_mag =%f,H_mag=%f", W_mag, H_mag); /* main widnow */ - Ad.win = _create_win(PACKAGE); + Ad.win = _create_win(MODULE_NAME); if (Ad.win == NULL) { return FALSE; } @@ -948,9 +942,10 @@ int main(int argc, char *argv[]) ico_log_open(appid); } else { - ico_log_open("org.tizen.ico.app-soundsample"); + ico_log_open(MODULE_NAME); } + ICO_INF("START_MODULE %s", MODULE_NAME); ICO_DBG("ENTER main"); if (pipe(Filedes) == -1) { @@ -1012,6 +1007,6 @@ int main(int argc, char *argv[]) ICO_DBG("END Process ChPid = [%d]", ChPid); } ICO_DBG("main: Leave"); - + ICO_INF("END_MODULE %s", MODULE_NAME); return result; } diff --git a/ico-app-soundsample/src/soundsample_pulse_async_test.cpp b/ico-app-soundsample/src/soundsample_pulse_async_test.cpp index dc968f2..7967fd3 100644 --- a/ico-app-soundsample/src/soundsample_pulse_async_test.cpp +++ b/ico-app-soundsample/src/soundsample_pulse_async_test.cpp @@ -73,7 +73,7 @@ static void event_input_callback(pa_mainloop_api *a, pa_io_event *e, int fd, switch (atoi(buff)) { case STOP_REQ: - ICO_DBG("STOP_SOUND Stop directions reception"); + ICO_PRF("STOP_SOUND Stop directions reception"); ExitFlg = 1; break; @@ -83,12 +83,12 @@ static void event_input_callback(pa_mainloop_api *a, pa_io_event *e, int fd, if (0 == pa_stream_is_corked((pa_stream *) userdata)) { pa_stream_cork((pa_stream *) userdata, ICO_PA_STREAM_PAUSE, NULL, NULL); - ICO_DBG("STOP_SOUND pa_stream_cork(PAUSE)"); + ICO_PRF("STOP_SOUND pa_stream_cork(PAUSE)"); } else { pa_stream_cork((pa_stream *) userdata, ICO_PA_STREAM_RESUME, NULL, NULL); - ICO_DBG("START_SOUND pa_stream_cork(RESUME)"); + ICO_PRF("START_SOUND pa_stream_cork(RESUME)"); } break; @@ -312,7 +312,7 @@ int pulse_main(struct audio_config_t *audio_config, int filedes) pa_stream_write(paStream, wavFile.DataPointer() + playBackPtr, writeSize, NULL, 0, PA_SEEK_RELATIVE); playBackPtr += writeSize; - ICO_DBG("START_SOUND pa_stream_write()_%d", (int) writeSize); + ICO_PRF("START_SOUND pa_stream_write()_%d", (int) writeSize); } } @@ -334,7 +334,7 @@ int pulse_main(struct audio_config_t *audio_config, int filedes) ICO_DBG("STREAM is END."); pa_stream_disconnect(paStream); - ICO_DBG("STOP_SOUND pa_stream_disconnect()"); + ICO_PRF("STOP_SOUND pa_stream_disconnect()"); pa_stream_unref(paStream); ICO_DBG("pa_stream_unref()"); diff --git a/ico-app-vicsample/src/vicsample.c b/ico-app-vicsample/src/vicsample.c index 94e3085..5338f97 100644 --- a/ico-app-vicsample/src/vicsample.c +++ b/ico-app-vicsample/src/vicsample.c @@ -99,8 +99,8 @@ #define CONFIG_FILE BASE_DIR"/res/vicsample_config.txt" #define BG_IMAGE_FILE IMAGE_DIR"/vicinfo_bg.png" -/* Package name */ -#define PACKAGE "org.tizen.ico.app-vicsample" +/* Module name */ +#define MODULE_NAME "org.tizen.ico.app-vicsample" #define DMY_DATA "000000000000000" #define DIGIT_NUM_OVER_DATA "############" @@ -305,7 +305,7 @@ static void amb_subscribe_property_cb(const char *objectname, */ static void set_vic_text_data(Evas_Object *obj, const char *text) { - ICO_DBG("CHG_VIC_INF set_vic_text_data Enter"); + ICO_PRF("CHG_VIC_INF set_vic_text_data Enter"); if (obj == NULL) { ICO_ERR("Parameter NG obj NULL"); @@ -324,7 +324,7 @@ static void set_vic_text_data(Evas_Object *obj, const char *text) elm_object_text_set(obj, DIGIT_NUM_OVER_DATA); } - ICO_DBG("CHG_VIC_INF set_vic_text_data Leave"); + ICO_PRF("CHG_VIC_INF set_vic_text_data Leave"); return; } @@ -333,7 +333,7 @@ static void set_vic_text_data(Evas_Object *obj, const char *text) */ static void set_vic_data(union dbus_value_variant value, void *user_data) { - ICO_DBG("CHG_VIC_INF set_vic_data Enter"); + ICO_PRF("CHG_VIC_INF set_vic_data Enter"); int idx = -1; char vic_str[256]; @@ -356,7 +356,7 @@ static void set_vic_data(union dbus_value_variant value, void *user_data) case MODE: case TURNSIGNAL: case ENGINECOOLANTTEMPERATURE: - ICO_DBG("CHG_VIC_INF %s(D-bus I/F Result) = %d", vic_data[idx].name, + ICO_PRF("CHG_VIC_INF %s(D-bus I/F Result) = %d", vic_data[idx].name, value.i32val); sprintf(vic_str, "%d", value.i32val); set_vic_text_data(Ad.vic_val_text[idx], vic_str); @@ -371,14 +371,14 @@ static void set_vic_data(union dbus_value_variant value, void *user_data) case WHEELBRAKEPRESSURE: case EXTERIORBRIGHTNESS: case STEERINGWHEELANGLE: - ICO_DBG("CHG_VIC_INF %s(D-bus I/F Result) = %d", vic_data[idx].name, + ICO_PRF("CHG_VIC_INF %s(D-bus I/F Result) = %d", vic_data[idx].name, value.ui16val); sprintf(vic_str, "%d", value.ui16val); set_vic_text_data(Ad.vic_val_text[idx], vic_str); break; // case XXXXXXXX: -// ICO_DBG("CHG_VIC_INF %s(D-bus I/F Result) = %d", vic_data[idx].name, +// ICO_PRF("CHG_VIC_INF %s(D-bus I/F Result) = %d", vic_data[idx].name, // value.yval); // sprintf(vic_str, "%d", value.yval); // set_vic_text_data(Ad.vic_val_text[idx], vic_str); @@ -387,7 +387,7 @@ static void set_vic_data(union dbus_value_variant value, void *user_data) case LATITUDE: case ALTITUDE: case LONGITUDE: - ICO_DBG("CHG_VIC_INF %s(D-bus I/F Result) = %f", vic_data[idx].name, + ICO_PRF("CHG_VIC_INF %s(D-bus I/F Result) = %f", vic_data[idx].name, value.dval); sprintf(vic_str, "%f", value.dval); set_vic_text_data(Ad.vic_val_text[idx], vic_str); @@ -398,7 +398,7 @@ static void set_vic_data(union dbus_value_variant value, void *user_data) case RIGHTTURNLIGHT: case PARKINGLIGHT: case BRAKESIGNAL: - ICO_DBG("CHG_VIC_INF %s(D-bus I/F Result) = %d", vic_data[idx].name, + ICO_PRF("CHG_VIC_INF %s(D-bus I/F Result) = %d", vic_data[idx].name, value.bval); if (value.bval == TRUE) { sprintf(vic_str, "%s", "true"); @@ -415,7 +415,7 @@ static void set_vic_data(union dbus_value_variant value, void *user_data) break; } - ICO_DBG("CHG_VIC_INF set_vic_data Leave"); + ICO_PRF("CHG_VIC_INF set_vic_data Leave"); return; } @@ -818,7 +818,7 @@ static bool app_create(void *data) ICO_DBG("app_create Enter"); /* main widnow */ - Ad.win = create_win(PACKAGE); + Ad.win = create_win(MODULE_NAME); if (Ad.win == NULL) { ICO_ERR("main window is un-creating."); return FALSE; @@ -866,9 +866,9 @@ int main(int argc, char *argv[]) ico_log_open(appid); } else { - ico_log_open(PACKAGE); + ico_log_open(MODULE_NAME); } - + ICO_INF("START_MODULE %s", MODULE_NAME); ICO_DBG("main Enter"); /* Read configuration file */ @@ -900,5 +900,6 @@ int main(int argc, char *argv[]) result = app_efl_main(&argc, &argv, &event_callback, &Ad); ICO_DBG("main Leave"); + ICO_INF("END_MODULE %s", MODULE_NAME); return result; } diff --git a/ico-uxf-homescreen-sample-apps.manifest b/ico-uxf-homescreen-sample-apps.manifest new file mode 100644 index 0000000..017d22d --- /dev/null +++ b/ico-uxf-homescreen-sample-apps.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/ico-uxf-homescreen-sample-apps.changes b/packaging/ico-uxf-homescreen-sample-apps.changes index e55d1d0..2f00a4f 100644 --- a/packaging/ico-uxf-homescreen-sample-apps.changes +++ b/packaging/ico-uxf-homescreen-sample-apps.changes @@ -1,3 +1,13 @@ +* Thu Dec 26 2013 Shibata Makoto submit/tizen/20131219.041820@49b6060 +- 0.9.6 release +-- revise: add manifest file for SMACK label setting +- ico-app-vicsample +-- Log output level correction.(performance) +-- Modular start/end log addition. +- ico-app-soundsample +-- Log output level correction.(performance) +-- Modular start/end log addition. + * Fri Nov 29 2013 Shibata Makoto accepted/tizen_ivi_stable/20131116.012229@90e4561 - 0.9.5 release - ico-app-vicsample diff --git a/packaging/ico-uxf-homescreen-sample-apps.spec b/packaging/ico-uxf-homescreen-sample-apps.spec index 43c82d1..37427cd 100644 --- a/packaging/ico-uxf-homescreen-sample-apps.spec +++ b/packaging/ico-uxf-homescreen-sample-apps.spec @@ -1,7 +1,7 @@ Name: ico-uxf-homescreen-sample-apps Summary: HomeScreen sample application -Version: 0.9.5 -Release: 1.1 +Version: 0.9.6 +Release: 2.1 Group: System/GUI License: Apache License, Version 2.0 URL: http://www.toyota.com @@ -106,6 +106,7 @@ install -m 0644 ico-app-vicsample/org.tizen.ico.app-vicsample.png %{buildroot}%{ install -m 0644 ico-app-vicsample/org.tizen.ico.app-vicsample.xml %{buildroot}/usr/share/packages/ %files +%manifest %{name}.manifest %defattr(-,root,root,-) # files(ico-app-soundsample) %{sound_PREFIX}/bin/ico-app-soundsample -- 2.7.4