nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Add a flag for a profiling"

main
satok 2011-07-12 23:27:51 -07:00 committed by Android (Google) Code Review
parent 0adf7ae299 20d9fdae3a
commit 3e41c071e6
2 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
native/Android.mk
View File

@ -19,6 +19,7 @@ LOCAL_SRC_FILES := \
src/unigram_dictionary.cpp src/unigram_dictionary.cpp
#FLAG_DBG := true #FLAG_DBG := true
#FLAG_DO_PROFILE := true
TARGETING_UNBUNDLED_FROYO := true TARGETING_UNBUNDLED_FROYO := true
@ -39,10 +40,15 @@ LOCAL_MODULE := libjni_latinime
LOCAL_MODULE_TAGS := user LOCAL_MODULE_TAGS := user
ifeq ($(FLAG_DO_PROFILE), true)
$(warning Making profiling version of native library)
LOCAL_CFLAGS += -DFLAG_DO_PROFILE
else # FLAG_DO_PROFILE
ifeq ($(FLAG_DBG), true) ifeq ($(FLAG_DBG), true)
$(warning Making debug version of native library) $(warning Making debug version of native library)
LOCAL_CFLAGS += -DFLAG_DBG LOCAL_CFLAGS += -DFLAG_DBG
LOCAL_SHARED_LIBRARIES := libcutils libutils LOCAL_SHARED_LIBRARIES := libcutils libutils
endif endif # FLAG_DBG
endif # FLAG_DO_PROFILE
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

48
native/src/defines.h
View File

@ -18,18 +18,7 @@
#ifndef LATINIME_DEFINES_H #ifndef LATINIME_DEFINES_H
#define LATINIME_DEFINES_H #define LATINIME_DEFINES_H
#ifdef FLAG_DBG #ifdef FLAG_DO_PROFILE
#include <cutils/log.h>
#ifndef LOG_TAG
#define LOG_TAG "LatinIME: "
#endif
#define DEBUG_DICT true
#define DEBUG_DICT_FULL false
#define DEBUG_SHOW_FOUND_WORD DEBUG_DICT_FULL
#define DEBUG_NODE DEBUG_DICT_FULL
#define DEBUG_TRACE DEBUG_DICT_FULL
#define DEBUG_PROXIMITY_INFO true
// Profiler // Profiler
#include <time.h> #include <time.h>
#define PROF_BUF_SIZE 100 #define PROF_BUF_SIZE 100
@ -76,16 +65,7 @@ static void prof_out(void) {
} }
} }
#else // FLAG_DBG #else // FLAG_DO_PROFILE
#define LOGE(fmt, ...)
#define LOGI(fmt, ...)
#define DEBUG_DICT false
#define DEBUG_DICT_FULL false
#define DEBUG_SHOW_FOUND_WORD false
#define DEBUG_NODE false
#define DEBUG_TRACE false
#define DEBUG_PROXIMITY_INFO false
#define PROF_BUF_SIZE 0 #define PROF_BUF_SIZE 0
#define PROF_RESET #define PROF_RESET
#define PROF_COUNT(prof_buf_id) #define PROF_COUNT(prof_buf_id)
@ -97,6 +77,30 @@ static void prof_out(void) {
#define PROF_CLOCKOUT(prof_buf_id) #define PROF_CLOCKOUT(prof_buf_id)
#define PROF_OUTALL #define PROF_OUTALL
#endif // FLAG_DO_PROFILE
#ifdef FLAG_DBG
#include <cutils/log.h>
#ifndef LOG_TAG
#define LOG_TAG "LatinIME: "
#endif
#define DEBUG_DICT true
#define DEBUG_DICT_FULL false
#define DEBUG_SHOW_FOUND_WORD DEBUG_DICT_FULL
#define DEBUG_NODE DEBUG_DICT_FULL
#define DEBUG_TRACE DEBUG_DICT_FULL
#define DEBUG_PROXIMITY_INFO true
#else // FLAG_DBG
#define LOGE(fmt, ...)
#define LOGI(fmt, ...)
#define DEBUG_DICT false
#define DEBUG_DICT_FULL false
#define DEBUG_SHOW_FOUND_WORD false
#define DEBUG_NODE false
#define DEBUG_TRACE false
#define DEBUG_PROXIMITY_INFO false
#endif // FLAG_DBG #endif // FLAG_DBG
#ifndef U_SHORT_MAX #ifndef U_SHORT_MAX