[PROTO] MSG_PROBE: replace return by return type, return value pair
authorAnastasia Lyupa <a.lyupa@samsung.com>
Thu, 31 Oct 2013 12:00:58 +0000 (16:00 +0400)
committerAnastasia Lyupa <a.lyupa@samsung.com>
Mon, 11 Nov 2013 13:18:28 +0000 (17:18 +0400)
It's a draft.
Now new packing function calls are commented.

TODO: add correct return type packing to
PACK_COMMON_END and PACK_RETURN_END calls
in probe_socket/ and probe_tizenapi/

Change-Id: I1238b2a22530620f53e16a18cebd379639f58463
Signed-off-by: Anastasia Lyupa <a.lyupa@samsung.com>
27 files changed:
custom_chart/da_chart.c
helper/dacapture.c
include/binproto.h
include/daprobe.h
probe_capi/capi_appfw.c
probe_event/da_event.c
probe_event/gesture.cpp
probe_event/keytouch.c
probe_file/da_io.h
probe_file/da_io_posix.c
probe_file/da_io_stdc.c
probe_graphics/da_gles20.cpp
probe_graphics/da_gles20.h
probe_memory/libdamemalloc.c
probe_memory/libdamemmanage.c
probe_memory/libdanew.cpp
probe_socket/da_socket.h
probe_thread/da_sync.h
probe_thread/da_thread.h
probe_thread/libdasync.c
probe_thread/libdathread.c
probe_tizenapi/tizen_controls.cpp
probe_tizenapi/tizen_file.cpp
probe_tizenapi/tizen_lifecycle.cpp
probe_tizenapi/tizen_sync.cpp
probe_tizenapi/tizen_thread.cpp
probe_ui/tizen_scenemanager.cpp

index 4cbf5f63f810c50722a23045ff9ea0744bd4f54a..801e0fc6f9dcccd7d9310f382a77b57aa6254434 100755 (executable)
@@ -137,7 +137,7 @@ void* _chart_timerThread(void* data)
                        PACK_COMMON_BEGIN(MSG_PROBE_CUSTOM,
                                          API_ID__chart_timerThread,
                                          "", 0);
-                       PACK_COMMON_END(0, 0, 2);
+                       PACK_COMMON_END('p', 0, 0, 2);
                        PACK_CUSTOM(cur->series_handle, 0, "", 0, value);
                        FLUSH_LOCAL_BUF();
 
@@ -450,7 +450,7 @@ void da_mark(chart_color color, char* mark_text)
        PACK_COMMON_BEGIN(MSG_PROBE_CUSTOM,
                          API_ID_da_mark,
                          "dp", color, voidp_to_uint64(mark_text));
-       PACK_COMMON_END(0, 0, 2);
+       PACK_COMMON_END('v', 0, 0, 2);
        PACK_CUSTOM(0, 0, mark_text, color, 0.0f);
        FLUSH_LOCAL_BUF();
 
@@ -478,7 +478,7 @@ da_handle da_create_chart(char* chart_name)
        PACK_COMMON_BEGIN(MSG_PROBE_CUSTOM,
                          API_ID_da_create_chart,
                          "p", voidp_to_uint64(chart_name));
-       PACK_COMMON_END(ret, 0, 2);
+       PACK_COMMON_END('d', ret, 0, 2);
        PACK_CUSTOM(0, 0, chart_name, 0, 0.0f);
        FLUSH_LOCAL_BUF();
 
@@ -515,7 +515,7 @@ da_handle da_create_series(da_handle charthandle, char* seriesname,
                          API_ID_da_create_series,
                          "dpdd",  charthandle, voidp_to_uint64(seriesname),
                          type, color);
-       PACK_COMMON_END(ret, 0, 2);
+       PACK_COMMON_END('d', ret, 0, 2);
        PACK_CUSTOM(charthandle, type, seriesname, color, 0.0f);
        FLUSH_LOCAL_BUF();
 
@@ -589,7 +589,7 @@ void da_log(da_handle series_handle, float uservalue)
        PACK_COMMON_BEGIN(MSG_PROBE_CUSTOM,
                          API_ID_da_log,
                          "df", series_handle, uservalue);
-       PACK_COMMON_END(0, 0, 2);
+       PACK_COMMON_END('v', 0, 0, 2);
        PACK_CUSTOM(series_handle, 0, "", 0, uservalue);
        FLUSH_LOCAL_BUF();
 
index 6d25d4cbe8166758fefc19471e32f680cc33a7a1..d91667af8ecb14129c33aa26f2e68d3d7a76b9a3 100755 (executable)
@@ -356,7 +356,7 @@ int captureScreen()
 
                                        PREPARE_LOCAL_BUF();
                                        PACK_COMMON_BEGIN(MSG_PROBE_SCREENSHOT, API_ID_captureScreen, "", 0);
-                                       PACK_COMMON_END(0, 0, 0);
+                                       PACK_COMMON_END('d', 0, 0, 0);
                                        PACK_SCREENSHOT(dstpath, getOrientation());
                                        FLUSH_LOCAL_BUF();
                                }
index eac11c1dc8d08e5df70a61a1a0ccfac5243ced99..5944e01ed5c4155a88a04e0da4b9e7d0366cfae6 100644 (file)
@@ -119,6 +119,69 @@ static inline char *pack_timestamp(char *to)
        return to;
 }
 
+static char __attribute__((used)) *pack_value_by_type(char *to, const char t, va_list *args)
+{
+       uint8_t c;
+       uint32_t d;
+       uint64_t x;
+       uint64_t p;
+       float f;
+       double w;
+       char *s;
+       int n;
+
+       *to++ = t;
+
+       switch (t) {
+       case 'c':
+               c = (uint8_t)va_arg(*args, uint32_t);
+               memcpy(to, &c, sizeof(c));
+               to += sizeof(c);
+               break;
+       case 'd':
+               d = va_arg(*args, uint32_t);
+               memcpy(to, &d, sizeof(d));
+               to += sizeof(d);
+               break;
+       case 'x':
+               x = 0; // real value may be less then uint64_t
+               x = (unsigned long)(uint64_t)va_arg(*args, uint64_t);
+               memcpy(to, &x, sizeof(x));
+               to += sizeof(x);
+               break;
+       case 'p':
+               p = 0; // real value may be less then uint64_t
+               p = (unsigned long)(uintptr_t)va_arg(*args, uint64_t);
+               memcpy(to, &p, sizeof(p));
+               to += sizeof(p);
+               break;
+       case 'f':
+               f = (float)va_arg(*args, double);
+               memcpy(to, &f, sizeof(f));
+               to += sizeof(f);
+               break;
+       case 'w':
+               w = va_arg(*args, double);
+               memcpy(to, &w, sizeof(w));
+               to += sizeof(w);
+               break;
+       case 's':
+               s = va_arg(*args, char *);
+               n = strlen(s) + 1;
+               strncpy(to, s, n);
+               to += n;
+               break;
+       case 'v':
+       case 'n':
+               break;
+       default:
+               to--;
+               break;
+       }
+
+       return to;
+}
+
 static char __attribute__((used)) *pack_args(char *to, const char *fmt, ...)
 {
        va_list args;
@@ -134,67 +197,20 @@ static char __attribute__((used)) *pack_args(char *to, const char *fmt, ...)
 
        va_start(args, fmt);
 
-       uint8_t c;
-       uint32_t d;
-       uint64_t x;
-       uint64_t p;
-       float f;
-       double w;
-       char *s;
-       int n;
+       for (t = fmt; *t != '\0'; t++)
+               to = pack_value_by_type(to, *t, &args);
 
-       for (t = fmt; *t != '\0'; t++) {
-               switch (*t) {
-               case 'c':
-                       c = (uint8_t)va_arg(args, uint32_t);
-                       *to++ = *t;
-                       memcpy(to, &c, sizeof(c));
-                       to += sizeof(c);
-                       break;
-               case 'd':
-                       d = va_arg(args, uint32_t);
-                       *to++ = *t;
-                       memcpy(to, &d, sizeof(d));
-                       to += sizeof(d);
-                       break;
-               case 'x':
-                       x = 0; // real value may be less then uint64_t
-                       x = (unsigned long)(uint64_t)va_arg(args, uint64_t);
-                       *to++ = *t;
-                       memcpy(to, &x, sizeof(x));
-                       to += sizeof(x);
-                       break;
-               case 'p':
-                       p = 0; // real value may be less then uint64_t
-                       p = (unsigned long)(uintptr_t)va_arg(args, uint64_t);
-                       *to++ = *t;
-                       memcpy(to, &p, sizeof(p));
-                       to += sizeof(p);
-                       break;
-               case 'f':
-                       f = (float)va_arg(args, double);
-                       *to++ = *t;
-                       memcpy(to, &f, sizeof(f));
-                       to += sizeof(f);
-                       break;
-               case 'w':
-                       w = va_arg(args, double);
-                       *to++ = *t;
-                       memcpy(to, &w, sizeof(w));
-                       to += sizeof(w);
-                       break;
-               case 's':
-                       s = va_arg(args, char *);
-                       *to++ = *t;
-                       n = strlen(s) + 1;
-                       strncpy(to, s, n);
-                       to += n;
-                       break;
-               default:
-                       break;
-               }
-       }
+       va_end(args);
 
+       return to;
+}
+
+static char __attribute__((used)) *pack_ret(char *to, char ret_type, ...)
+{
+       va_list args;
+
+       va_start(args, ret_type);
+       to = pack_value_by_type(to, ret_type, &args);
        va_end(args);
 
        return to;
@@ -222,17 +238,19 @@ static char __attribute__((used)) *pack_args(char *to, const char *fmt, ...)
                RET_PTR = BUF_PTR;              \
        } while (0)
 
-#define PACK_COMMON_END(ret, errn, intern_call)                \
-       do {                                                    \
-               BUF_PTR = pack_int64(BUF_PTR, (uintptr_t)(ret));        \
-               BUF_PTR = pack_int64(BUF_PTR, (uint64_t)errn);  \
-               BUF_PTR = pack_int32(BUF_PTR, (uint32_t)intern_call);   \
-               BUF_PTR = pack_int64(BUF_PTR, (uintptr_t)CALLER_ADDRESS); \
-               BUF_PTR = pack_int32(BUF_PTR, 0);               \
-               BUF_PTR = pack_int32(BUF_PTR, 0);               \
+#define PACK_COMMON_END(ret_type, ret, errn, intern_call)                      \
+       do {                                                                    \
+               /*BUF_PTR = pack_ret(BUF_PTR, ret_type, (uintptr_t)ret);*/      \
+               BUF_PTR = pack_int64(BUF_PTR, (uintptr_t)(ret));                \
+               BUF_PTR = pack_int64(BUF_PTR, (uint64_t)errn);                  \
+               BUF_PTR = pack_int32(BUF_PTR, (uint32_t)intern_call);           \
+               BUF_PTR = pack_int64(BUF_PTR, (uintptr_t)CALLER_ADDRESS);       \
+               BUF_PTR = pack_int32(BUF_PTR, 0);                               \
+               BUF_PTR = pack_int32(BUF_PTR, 0);                               \
        } while (0)
 
-#define PACK_RETURN_END(ret)                                                           \
+#define PACK_RETURN_END(ret_type, ret)                                         \
+               /*RET_PTR = pack_ret(RET_PTR, ret_type, (uintptr_t)ret);*/      \
                RET_PTR = pack_int64(RET_PTR, (uintptr_t)(ret));
 
 #define PACK_MEMORY(size, memory_api_type, addr)               \
@@ -383,7 +401,7 @@ static char __attribute__((used)) *pack_args(char *to, const char *fmt, ...)
 
 /*     p = PACK_COMMON_BEGIN(p, 42, "cdxpfws", 'a', 10, (uint64_t)80, */
 /*                           (uint64_t)0, 0.19, 0.33, "hello!"); */
-/*     p = PACK_COMMON_END(p, 0); */
+/*     p = PACK_COMMON_END('p', p, 0); */
 
 /*     int fd = creat("out.bin", 0644); */
 /*     if (fd == -1) { */
index 2e785d2fd4b0340559331a1b0b3b49d14b2bfe29..b51a40093fe0bc488394b02b0d18be9e3351b155 100644 (file)
@@ -273,7 +273,7 @@ typedef struct {
        if(postBlockBegin(blockresult)) {                                                                               \
                PREPARE_LOCAL_BUF(); \
                PACK_COMMON_BEGIN(MSG_PROBE_NETWORK, vAPI_ID, INPUTFORMAT, __VA_ARGS__);\
-               PACK_COMMON_END(RETVALUE, errno, blockresult);
+               PACK_COMMON_END('p', RETVALUE, errno, blockresult);
 
 #define POST_PROBEBLOCK_END()                                          \
                FLUSH_LOCAL_BUF();                                              \
index 26de9c7dce8b60e4390902dfc02fa053a4cb37a0..8e7a64454390a138dc61b63cd93ae48cb028f1cf 100644 (file)
@@ -42,13 +42,13 @@ void unregister_orientation_event_listener(Ecore_Event_Handler* handler);
 
 app_event_callback_s gAppCallback;
 
-#define PACK_ORIGINAL_APPFWCYCLE(API_ID, RVAL, INPUTFORMAT, ...)               \
+#define PACK_ORIGINAL_APPFWCYCLE(API_ID, RTYPE, RVAL, INPUTFORMAT, ...)                \
        newerrno = errno;                                                                                                                                               \
        do {                                                                                                                                                                    \
                if(postBlockBegin(blockresult)) {                                                                                                       \
                        PREPARE_LOCAL_BUF();                                                                                                                    \
                        PACK_COMMON_BEGIN(MSG_PROBE_LIFECYCLE, API_ID, INPUTFORMAT, __VA_ARGS__);       \
-                       PACK_COMMON_END(RVAL, newerrno, blockresult);                                                                   \
+                       PACK_COMMON_END(RTYPE, RVAL, newerrno, blockresult);                                                                    \
                        FLUSH_LOCAL_BUF();                                                                                                                              \
                        postBlockEnd();                                                                                                                                 \
                }                                                                                                                                                                       \
@@ -67,7 +67,7 @@ static bool _dalc_app_create(void* user_data)
 
        bret = gAppCallback.create(user_data);
 
-       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_create, bret, "p",
+       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_create, 'b', bret, "p",
                                 voidp_to_uint64(user_data));
 
        return bret;
@@ -82,7 +82,7 @@ static void _dalc_app_terminate(void* user_data)
 
        gAppCallback.terminate(user_data);
 
-       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_terminate, 0, "p",
+       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_terminate, 'v', 0, "p",
                                 voidp_to_uint64(user_data));
 }
 
@@ -95,7 +95,7 @@ static void _dalc_app_pause(void* user_data)
 
        gAppCallback.pause(user_data);
 
-       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_pause, 0, "p",
+       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_pause, 'v', 0, "p",
                                 voidp_to_uint64(user_data));
 }
 
@@ -108,7 +108,7 @@ static void _dalc_app_resume(void* user_data)
 
        gAppCallback.resume(user_data);
 
-       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_resume, 0, "p",
+       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_resume, 'v', 0, "p",
                                 voidp_to_uint64(user_data));
 }
 
@@ -121,7 +121,7 @@ static void _dalc_app_service(service_h service, void* user_data)
 
        gAppCallback.service(service, user_data);
 
-       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_service, 0, "dp",
+       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_service, 'v', 0, "dp",
                                 (unsigned int)service,
                                 voidp_to_uint64(user_data));
 }
index 5b9064ebf1917280478181e7194d73d8cfe44bfa..b62eef0e6174440869d1c4ab5ee1f693f1a0e9a1 100755 (executable)
@@ -101,7 +101,7 @@ void on_orientation_changed(int angle, bool capi)
                        PACK_COMMON_BEGIN(MSG_PROBE_UIEVENT,
                                          API_ID_on_orientation_changed,
                                          "dd", angle, (uint32_t)capi);
-                       PACK_COMMON_END(0, 0, 0);
+                       PACK_COMMON_END('v', 0, 0, 0);
                        PACK_UIEVENT(_EVENT_ORIENTATION, 0, 0, 0, "", convert_angle(external_angle));
                        FLUSH_LOCAL_BUF();
                }
index 208c10410c80eaec0fb778d7674aba9de71272c9..f7666ac1455917557ff9f3bb545604ac265af21c 100755 (executable)
@@ -45,7 +45,7 @@
                setProbePoint(&probeInfo);                                                                                              \
                PREPARE_LOCAL_BUF();                                                                                                    \
                PACK_COMMON_BEGIN(MSG_PROBE_UIEVENT, API_ID, "p", voidp_to_uint64(_ARGDETECTOR));       \
-               PACK_COMMON_END(0, 0, 0);                                                                                               \
+               PACK_COMMON_END('v', 0, 0, 0);                                                                                          \
                sprintf(info1_str, "%d", _INFO1);                                                                               \
                PACK_UIEVENT(_EVENT_GESTURE, _GESTURETYPE, _X, _Y, info1_str, _INFO2);  \
                FLUSH_LOCAL_BUF();                                                                                                              \
index da6c8a470060f022f6687de68b1cd82deefaf39e..4daee81ff47ddbfa77fb3846e08beae8096ed4c8 100755 (executable)
@@ -62,7 +62,7 @@ bool touch_pressed = false;
                PACK_COMMON_BEGIN(MSG_PROBE_UIEVENT, API_ID, "pdp",                                     \
                                  voidp_to_uint64(_ARGDATA), _ARGTYPE,  \
                                  voidp_to_uint64(_ARGEVENT));          \
-               PACK_COMMON_END(0, 0, 0);                                                                                               \
+               PACK_COMMON_END('c', 0, 0, 0);                                                                                          \
                PACK_UIEVENT(_EVENTTYPE, _DETAILTYPE, _X, _Y, _KEYCODE, _EXTRA);                \
                FLUSH_LOCAL_BUF();                                                                                                              \
        } while (0)
index bd10f0cb82450066a52c9527eae380e8fadf8646..2fe826429618f0bb5c60113f14240ab359610f34 100755 (executable)
  * only about regular files or sockets, so this logic implemented in macro.
  * Watch out when reusing it somewhere else
  */
-#define AFTER_PACK_ORIGINAL_FD(API_ID, RVAL, SIZE, FD, APITYPE, INPUTFORMAT, ...)              \
+#define AFTER_PACK_ORIGINAL_FD(API_ID, RTYPE, RVAL, SIZE, FD, APITYPE, INPUTFORMAT, ...)       \
        POST_PACK_PROBEBLOCK_BEGIN();                                                           \
        _fstatret = fstat(FD, &_statbuf);                                                       \
        if (stat_regular_or_socket_p(&_statbuf)) {                                              \
                PREPARE_LOCAL_BUF();                                                            \
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID, INPUTFORMAT, __VA_ARGS__);        \
-               PACK_COMMON_END(RVAL, newerrno, blockresult);                                   \
+               PACK_COMMON_END(RTYPE, RVAL, newerrno, blockresult);                            \
                POST_PACK_PROBEBLOCK_MIDDLE_FD(SIZE, FD, APITYPE);                              \
        }                                                                                       \
        POST_PACK_PROBEBLOCK_END()
 
-#define AFTER_PACK_ORIGINAL_NOFD(API_ID, RVAL, SIZE, APITYPE, INPUTFORMAT, ...)                \
+#define AFTER_PACK_ORIGINAL_NOFD(API_ID, RTYPE, RVAL, SIZE, APITYPE, INPUTFORMAT, ...) \
        POST_PACK_PROBEBLOCK_BEGIN();                                                   \
        PREPARE_LOCAL_BUF();                                                            \
        PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID, INPUTFORMAT, __VA_ARGS__);        \
-       PACK_COMMON_END(RVAL, newerrno, blockresult);                                   \
+       PACK_COMMON_END(RTYPE, RVAL, newerrno, blockresult);                            \
        POST_PACK_PROBEBLOCK_MIDDLE_NOFD(SIZE, APITYPE);                                \
        POST_PACK_PROBEBLOCK_END()
 
-#define AFTER_PACK_ORIGINAL_FILEP(API_ID, RVAL, SIZE, FILEP, APITYPE, INPUTFORMAT, ...) \
+#define AFTER_PACK_ORIGINAL_FILEP(API_ID, RTYPE, RVAL, SIZE, FILEP, APITYPE, INPUTFORMAT, ...) \
        POST_PACK_PROBEBLOCK_BEGIN();                                                   \
        GET_FD_FROM_FILEP(FILEP);                                                       \
        if(_fd != -1) {                                                                 \
        }                                                                               \
        PREPARE_LOCAL_BUF();                                                            \
        PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID, INPUTFORMAT, __VA_ARGS__);        \
-       PACK_COMMON_END(RVAL, newerrno, blockresult);                                   \
+       PACK_COMMON_END(RTYPE, RVAL, newerrno, blockresult);                            \
        POST_PACK_PROBEBLOCK_MIDDLE_FD(SIZE, _fd, APITYPE);                             \
        POST_PACK_PROBEBLOCK_END()
 
@@ -162,7 +162,7 @@ static inline bool stat_regular_or_socket_p(struct stat *buf)
 {
   return S_ISREG(buf->st_mode) || S_ISSOCK(buf->st_mode);
 }
-#define BEFORE_ORIGINAL_START_END_FD(API_ID, FUNCNAME, LIBNAME, FD, APITYPE, INPUTFORMAT, ...) \
+#define BEFORE_ORIGINAL_START_END_FD(API_ID, RTYPE, FUNCNAME, LIBNAME, FD, APITYPE, INPUTFORMAT, ...)  \
        DECLARE_VARIABLE_FD;                                                                    \
        GET_REAL_FUNC(FUNCNAME, LIBNAME);                                                       \
        PRE_PROBEBLOCK_BEGIN();                                                                 \
@@ -171,21 +171,21 @@ static inline bool stat_regular_or_socket_p(struct stat *buf)
                DEFINE_FILESIZE_FD(fd);                                                         \
                PREPARE_LOCAL_BUF();                                                            \
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID, INPUTFORMAT, __VA_ARGS__);        \
-               PACK_COMMON_END(0, 0, blockresult);                                             \
+               PACK_COMMON_END(RTYPE, 0, 0, blockresult);                                      \
                PACK_RESOURCE(0, FD, APITYPE, _filesize, _filepath);                            \
                FLUSH_LOCAL_BUF();                                                              \
        }                                                               \
        PRE_PROBEBLOCK_END();
 
 
-#define AFTER_ORIGINAL_START_END_FD(API_ID, RVAL, SIZE, FD, APITYPE, INPUTFORMAT, ...)         \
+#define AFTER_ORIGINAL_START_END_FD(API_ID, RTYPE, RVAL, SIZE, FD, APITYPE, INPUTFORMAT, ...)          \
        POST_PACK_PROBEBLOCK_BEGIN();                                   \
        setProbePoint(&probeInfo);                                      \
        _fstatret = fstat(FD, &_statbuf);                               \
        if (stat_regular_or_socket_p(&_statbuf)) {                      \
                PREPARE_LOCAL_BUF();                                                            \
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID, INPUTFORMAT, __VA_ARGS__); \
-               PACK_COMMON_END(RVAL, newerrno, blockresult);           \
+               PACK_COMMON_END(RTYPE, RVAL, newerrno, blockresult);            \
                PACK_RESOURCE(SIZE, FD, APITYPE, _filesize, _filepath); \
                FLUSH_LOCAL_BUF();                                                              \
        }                                                               \
@@ -193,18 +193,18 @@ static inline bool stat_regular_or_socket_p(struct stat *buf)
 
 
 
-#define BEFORE_ORIGINAL_START_END_NOFD(API_ID, FUNCNAME, LIBNAME, APITYPE, INPUTFORMAT, ...)   \
+#define BEFORE_ORIGINAL_START_END_NOFD(API_ID, RTYPE, FUNCNAME, LIBNAME, APITYPE, INPUTFORMAT, ...)    \
        DECLARE_VARIABLE_FD;                                                            \
        GET_REAL_FUNC(FUNCNAME, LIBNAME);                                               \
        PRE_PROBEBLOCK_BEGIN();                                                         \
        DEFINE_FILESIZE_0();                                                            \
        PREPARE_LOCAL_BUF();                                                            \
        PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID, INPUTFORMAT, __VA_ARGS__);        \
-       PACK_COMMON_END(0, 0, blockresult);                                             \
+       PACK_COMMON_END(RTYPE, 0, 0, blockresult);                                      \
        POST_PACK_PROBEBLOCK_MIDDLE_NOFD(0, APITYPE);                                   \
        PRE_PROBEBLOCK_END()
 
-#define BEFORE_ORIGINAL_START_END_FILEP(API_ID, FUNCNAME, LIBNAME, FILEP, APITYPE, INPUTFORMAT, ...)   \
+#define BEFORE_ORIGINAL_START_END_FILEP(API_ID, RTYPE, FUNCNAME, LIBNAME, FILEP, APITYPE, INPUTFORMAT, ...)    \
        DECLARE_VARIABLE_FD;                                                                    \
        GET_REAL_FUNC(FUNCNAME, LIBNAME);                                                       \
        PRE_PROBEBLOCK_BEGIN();                                                                 \
@@ -214,20 +214,20 @@ static inline bool stat_regular_or_socket_p(struct stat *buf)
        }                                                                                       \
        PREPARE_LOCAL_BUF();                                                                    \
        PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID, INPUTFORMAT, __VA_ARGS__);                \
-       PACK_COMMON_END(0, 0, blockresult);                                                     \
+       PACK_COMMON_END(RTYPE, 0, 0, blockresult);                                              \
        POST_PACK_PROBEBLOCK_MIDDLE_FD(0, _fd, APITYPE);                                        \
        PRE_PROBEBLOCK_END()
 
-#define AFTER_ORIGINAL_START_END_NOFD(API_ID, RVAL, SIZE, APITYPE, INPUTFORMAT, ...)           \
+#define AFTER_ORIGINAL_START_END_NOFD(API_ID, RTYPE, RVAL, SIZE, APITYPE, INPUTFORMAT, ...)    \
        POST_PACK_PROBEBLOCK_BEGIN();                                                           \
        setProbePoint(&probeInfo);                                                              \
        PREPARE_LOCAL_BUF();                                                                    \
        PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID, INPUTFORMAT, __VA_ARGS__);                \
-       PACK_COMMON_END(RVAL, newerrno, blockresult);                                           \
+       PACK_COMMON_END(RTYPE, RVAL, newerrno, blockresult);                                    \
        POST_PACK_PROBEBLOCK_MIDDLE_NOFD(SIZE, APITYPE);                                        \
        POST_PACK_PROBEBLOCK_END()
 
-#define AFTER_ORIGINAL_START_END_FILEP(API_ID, RVAL, SIZE, FILEP, APITYPE, INPUTFORMAT, ...)   \
+#define AFTER_ORIGINAL_START_END_FILEP(API_ID, RTYPE, RVAL, SIZE, FILEP, APITYPE, INPUTFORMAT, ...)    \
        POST_PACK_PROBEBLOCK_BEGIN();                                                           \
        setProbePoint(&probeInfo);                                                              \
        GET_FD_FROM_FILEP(FILEP);                                                               \
@@ -236,7 +236,7 @@ static inline bool stat_regular_or_socket_p(struct stat *buf)
        }                                                                                       \
        PREPARE_LOCAL_BUF();                                                                    \
        PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID, INPUTFORMAT, __VA_ARGS__);                \
-       PACK_COMMON_END(RVAL, newerrno, blockresult);                                           \
+       PACK_COMMON_END(RTYPE, RVAL, newerrno, blockresult);                                    \
        POST_PACK_PROBEBLOCK_MIDDLE_FD(SIZE, _fd, APITYPE);                                     \
        POST_PACK_PROBEBLOCK_END()
 
index f933ebda91206dcd38fbfba602b0e1b60843035f..9c45e6df7d9fa30e711e71d79ea0329dd0c95be9 100755 (executable)
@@ -73,7 +73,7 @@ int open(const char* path, int oflag, ...)
 
        ret = openp(path, oflag, mode);
 
-       AFTER_PACK_ORIGINAL_FD(API_ID_open, ret, 0, ret, FD_API_OPEN, "sdd",
+       AFTER_PACK_ORIGINAL_FD(API_ID_open, 'd', ret, 0, ret, FD_API_OPEN, "sdd",
                               absolutize_filepath(buffer, path), oflag, mode);
 
        return ret;
@@ -98,9 +98,9 @@ int openat(int fd, const char* path, int oflag, ...)
 
        ret = openatp(fd, path, oflag, mode);
 
-       AFTER_PACK_ORIGINAL_FD(API_ID_openat, ret, 0, ret, FD_API_OPEN, "dsdd",
-                              fd, absolutize_filepath(buffer, path), oflag,
-                              mode);
+       AFTER_PACK_ORIGINAL_FD(API_ID_openat, 'd', ret, 0, ret, FD_API_OPEN,
+                              "dsdd", fd, absolutize_filepath(buffer, path),
+                              oflag, mode);
 
        return ret;
 }
@@ -115,7 +115,7 @@ int creat(const char* path, mode_t mode)
 
        ret = creatp(path, mode);
 
-       AFTER_PACK_ORIGINAL_FD(API_ID_creat, ret, 0, ret, FD_API_OPEN, "sd",
+       AFTER_PACK_ORIGINAL_FD(API_ID_creat, 'd', ret, 0, ret, FD_API_OPEN, "sd",
                               absolutize_filepath(buffer, path), mode);
 
        return ret;
@@ -140,7 +140,7 @@ int close(int fd)
        PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                          API_ID_close,
                          "d", fd);
-       PACK_COMMON_END(ret, newerrno, blockresult);
+       PACK_COMMON_END('d', ret, newerrno, blockresult);
        POST_PACK_PROBEBLOCK_MIDDLE_FD(0, fd, FD_API_CLOSE);
        POST_PACK_PROBEBLOCK_END();
 
@@ -157,7 +157,7 @@ off_t lseek(int fd, off_t offset, int whence)
        offret = lseekp(fd, offset, whence);
 
        AFTER_PACK_ORIGINAL_FD(API_ID_lseek,
-                                  offret, (unsigned int)offset, fd, FD_API_OTHER,
+                                  'x', offret, (unsigned int)offset, fd, FD_API_OTHER,
                                   "dxd", fd, (uint64_t)(offset), whence);
 
        return offret;
@@ -172,7 +172,7 @@ int fsync(int fd)
        ret = fsyncp(fd);
 
        AFTER_PACK_ORIGINAL_FD(API_ID_fsync,
-                                  ret, 0, fd, FD_API_OTHER, "d", fd);
+                                  'd', ret, 0, fd, FD_API_OTHER, "d", fd);
 
        return ret;
 }
@@ -186,7 +186,7 @@ int fdatasync(int fd)
        ret = fdatasyncp(fd);
 
        AFTER_PACK_ORIGINAL_FD(API_ID_fdatasync,
-                                  ret, 0, fd, FD_API_OTHER, "d", fd);
+                                  'd', ret, 0, fd, FD_API_OTHER, "d", fd);
 
        return ret;
 }
@@ -202,7 +202,7 @@ int ftruncate(int fd, off_t length)
        ret = ftruncatep(fd, length);
 
        AFTER_PACK_ORIGINAL_FD(API_ID_ftruncate,
-                              ret, (unsigned int)length, fd,
+                              'd', ret, (unsigned int)length, fd,
                               FD_API_DIRECTORY, "dx", fd, (uint64_t)(length));
 
        return ret;
@@ -214,7 +214,7 @@ int fchown(int fd, uid_t owner, gid_t group)
 
        BEFORE_ORIGINAL_FILE(fchown, LIBC);
        ret = fchownp(fd, owner, group);
-       AFTER_PACK_ORIGINAL_FD(API_ID_fchown, ret, 0, fd, FD_API_PERMISSION,
+       AFTER_PACK_ORIGINAL_FD(API_ID_fchown, 'd', ret, 0, fd, FD_API_PERMISSION,
                          "ddd", fd, owner, group);
        return ret;
 }
@@ -229,7 +229,7 @@ int lockf(int fd, int function, off_t size)
        BEFORE_ORIGINAL_FILE(lockf, LIBC);
        ret = lockfp(fd, function, size);
        AFTER_PACK_ORIGINAL_FD(API_ID_lockf,
-                                  ret, (unsigned int)size, fd, FD_API_PERMISSION,
+                                  'd', ret, (unsigned int)size, fd, FD_API_PERMISSION,
                                   "ddx", fd, function, (uint64_t)(size));
        return ret;
 }
@@ -243,7 +243,7 @@ int fchmod(int fd, mode_t mode)
        BEFORE_ORIGINAL_FILE(fchmod, LIBC);
        ret = fchmodp(fd, mode);
        AFTER_PACK_ORIGINAL_FD(API_ID_fchmod,
-                                  ret, 0, fd, FD_API_PERMISSION, "dd", fd, mode);
+                                  'd', ret, 0, fd, FD_API_PERMISSION, "dd", fd, mode);
        return ret;
 }
 
@@ -256,7 +256,7 @@ ssize_t pread(int fd, void *buf, size_t nbyte, off_t offset)
        static ssize_t (*preadp)(int fd, void *buf, size_t nbyte, off_t offset);
        ssize_t sret;
 
-       BEFORE_ORIGINAL_START_END_FD(API_ID_pread, pread, LIBC, fd,
+       BEFORE_ORIGINAL_START_END_FD(API_ID_pread, 'x', pread, LIBC, fd,
                                     FD_API_READ_START, "dpxx", fd,
                                     voidp_to_uint64(buf),
                                     (uint64_t)(nbyte),
@@ -264,7 +264,7 @@ ssize_t pread(int fd, void *buf, size_t nbyte, off_t offset)
 
        sret = preadp(fd, buf, nbyte, offset);
 
-       AFTER_ORIGINAL_START_END_FD(API_ID_pread, sret, (unsigned int)sret, fd,
+       AFTER_ORIGINAL_START_END_FD(API_ID_pread, 'x', sret, (unsigned int)sret, fd,
                                    FD_API_READ_END, "dpxx", fd,
                                    voidp_to_uint64(buf),
                                    (uint64_t)(nbyte),
@@ -277,13 +277,13 @@ ssize_t read(int fd, void *buf, size_t nbyte)
        static ssize_t (*readp)(int fildes, void *buf, size_t nbyte);
        ssize_t sret;
 
-       BEFORE_ORIGINAL_START_END_FD(API_ID_read, read, LIBC, fd, FD_API_READ_START,
+       BEFORE_ORIGINAL_START_END_FD(API_ID_read, 'x', read, LIBC, fd, FD_API_READ_START,
                                     "dpx", fd, voidp_to_uint64(buf),
                                     (uint64_t)(nbyte));
 
        sret = readp(fd, buf, nbyte);
 
-       AFTER_ORIGINAL_START_END_FD(API_ID_read, sret, (unsigned int)sret, fd,
+       AFTER_ORIGINAL_START_END_FD(API_ID_read, 'x', sret, (unsigned int)sret, fd,
                                    FD_API_READ_END, "dpx", fd,
                                    voidp_to_uint64(buf),
                                    (uint64_t)(nbyte));
@@ -296,7 +296,7 @@ ssize_t pwrite(int fd, const void *buf, size_t nbyte, off_t offset)
        static ssize_t (*pwritep)(int fd, const void *buf, size_t nbyte, off_t offset);
        ssize_t sret;
 
-       BEFORE_ORIGINAL_START_END_FD(API_ID_pwrite, pwrite, LIBC, fd, FD_API_WRITE_START,
+       BEFORE_ORIGINAL_START_END_FD(API_ID_pwrite, 'x', pwrite, LIBC, fd, FD_API_WRITE_START,
                                     "dpxx", fd, voidp_to_uint64(buf),
                                     (uint64_t)(nbyte),
                                     (uint64_t)(offset));
@@ -304,7 +304,7 @@ ssize_t pwrite(int fd, const void *buf, size_t nbyte, off_t offset)
        sret = pwritep(fd, buf, nbyte, offset);
 
        DEFINE_FILESIZE_FD(fd);
-       AFTER_ORIGINAL_START_END_FD(API_ID_pwrite, sret, (unsigned int)sret, fd,
+       AFTER_ORIGINAL_START_END_FD(API_ID_pwrite, 'x', sret, (unsigned int)sret, fd,
                                   FD_API_WRITE_END, "dpxx", fd,
                                    voidp_to_uint64(buf),
                                    (uint64_t)(nbyte),
@@ -318,14 +318,14 @@ ssize_t write(int fd, const void *buf, size_t nbyte)
        static ssize_t (*writep)(int fildes, const void *buf, size_t nbyte);
        ssize_t sret;
 
-       BEFORE_ORIGINAL_START_END_FD(API_ID_write, write, LIBC, fd, FD_API_WRITE_START,
+       BEFORE_ORIGINAL_START_END_FD(API_ID_write, 'x', write, LIBC, fd, FD_API_WRITE_START,
                                     "dpx", fd, voidp_to_uint64(buf),
                                     (uint64_t)(nbyte));
 
        sret = writep(fd, buf, nbyte);
 
        DEFINE_FILESIZE_FD(fd);
-       AFTER_ORIGINAL_START_END_FD(API_ID_write, sret, (unsigned int)sret, fd,
+       AFTER_ORIGINAL_START_END_FD(API_ID_write, 'x', sret, (unsigned int)sret, fd,
                                    FD_API_WRITE_END, "dpx", fd,
                                    voidp_to_uint64(buf),
                                    (uint64_t)(nbyte));
@@ -339,12 +339,12 @@ ssize_t readv(int fd, const struct iovec *iov, int iovcnt)
        static ssize_t (*readvp)(int fd, const struct iovec *iov, int iovcnt);
        ssize_t sret;
 
-       BEFORE_ORIGINAL_START_END_FD(API_ID_readv, readv, LIBC, fd, FD_API_READ_START,
+       BEFORE_ORIGINAL_START_END_FD(API_ID_readv, 'x', readv, LIBC, fd, FD_API_READ_START,
                                     "dpd", fd, voidp_to_uint64(iov), iovcnt);
 
        sret = readvp(fd,iov,iovcnt);
 
-       AFTER_ORIGINAL_START_END_FD(API_ID_readv, sret, (unsigned int)sret, fd,
+       AFTER_ORIGINAL_START_END_FD(API_ID_readv, 'x', sret, (unsigned int)sret, fd,
                                    FD_API_READ_END, "dpd", fd,
                                    voidp_to_uint64(iov), iovcnt);
 
@@ -391,7 +391,7 @@ int fcntl(int fd, int cmd, ...)
        ret = fcntlp(fd, cmd, arg);
 
        AFTER_PACK_ORIGINAL_FD(API_ID_fcntl,
-                                  ret, 0, fd, FD_API_OTHER, "ddd", fd, cmd, arg);
+                                  'd', ret, 0, fd, FD_API_OTHER, "ddd", fd, cmd, arg);
 
        return ret;
 }
@@ -405,7 +405,7 @@ int dup(int fd)
        ret = dupp(fd);
 
        AFTER_PACK_ORIGINAL_FD(API_ID_dup,
-                                  ret, 0, ret, FD_API_OPEN, "d", fd);
+                                  'd', ret, 0, ret, FD_API_OPEN, "d", fd);
 
        return ret;
 }
@@ -419,7 +419,7 @@ int dup2(int fd, int fd2)
        ret = dup2p(fd, fd2);
 
        AFTER_PACK_ORIGINAL_FD(API_ID_dup2,
-                                  ret, 0, ret, FD_API_OPEN, "dd", fd, fd2);
+                                  'd', ret, 0, ret, FD_API_OPEN, "dd", fd, fd2);
 
        return ret;
 }
@@ -446,7 +446,7 @@ int futimens(int fd, const struct timespec times[2])
        BEFORE_ORIGINAL_FILE(futimens, LIBC);
        ret = futimensp(fd, times);
        AFTER_PACK_ORIGINAL_FD(API_ID_futimens,
-                              ret, 0, fd, FD_API_OTHER, "dp", fd,
+                              'd', ret, 0, fd, FD_API_OTHER, "dp", fd,
                               voidp_to_uint64(times));
        return ret;
 }
index 6c9b40bdc620ea758d9e5abcb028675223300966..550fe8f3abfcfb2f74435b9d9dfcb992742c2d06 100644 (file)
@@ -57,9 +57,9 @@ FILE* fopen(const char* filename, const char* mode)
 
        fret = fopenp(filename, mode);
 
-       AFTER_PACK_ORIGINAL_FILEP(API_ID_fopen, fret, 0, fret, FD_API_OPEN, "ss",
-                                 absolutize_filepath(buffer, filename),
-                                 mode);
+       AFTER_PACK_ORIGINAL_FILEP(API_ID_fopen,
+                                 'p', fret, 0, fret, FD_API_OPEN, "ss",
+                                 absolutize_filepath(buffer, filename), mode);
 
        return fret;
 }
@@ -76,7 +76,7 @@ FILE* freopen(const char * filename, const char * mode, FILE * stream)
 
        fret = freopenp(filename, mode, stream);
 
-       AFTER_PACK_ORIGINAL_FILEP(API_ID_freopen, fret, 0, fret, FD_API_OPEN,
+       AFTER_PACK_ORIGINAL_FILEP(API_ID_freopen, 'p', fret, 0, fret, FD_API_OPEN,
                                  "ssp", absolutize_filepath(buffer, filename),
                                  mode, voidp_to_uint64(stream));
 
@@ -93,7 +93,7 @@ FILE* fdopen(int fildes, const char *mode)
        fret = fdopenp(fildes, mode);
 
        AFTER_PACK_ORIGINAL_FILEP(API_ID_fdopen,
-                                 fret, 0, fret, FD_API_OPEN, "ds", fildes, mode);
+                                 'p', fret, 0, fret, FD_API_OPEN, "ds", fildes, mode);
 
        return fret;
 }
@@ -105,7 +105,7 @@ int fflush(FILE* stream)
        BEFORE_ORIGINAL_FILE(fflush, LIBC);
        ret = fflushp(stream);
        AFTER_PACK_ORIGINAL_FILEP(API_ID_fflush,
-                                 ret, 0, stream, FD_API_OTHER, "p",
+                                 'd', ret, 0, stream, FD_API_OTHER, "p",
                                  voidp_to_uint64(stream));
        return ret;
 }
@@ -132,7 +132,7 @@ int fclose(FILE* stream)
        PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                          API_ID_fclose,
                          "p", voidp_to_uint64(stream));
-       PACK_COMMON_END(ret, newerrno, blockresult);
+       PACK_COMMON_END('d', ret, newerrno, blockresult);
        POST_PACK_PROBEBLOCK_MIDDLE_FD(0, _fd, FD_API_CLOSE);
        POST_PACK_PROBEBLOCK_END();
 
@@ -148,7 +148,7 @@ FILE * tmpfile ( void )
        _filepath = "<temp file>";
        fret = tmpfilep();
        AFTER_PACK_ORIGINAL_FILEP(API_ID_tmpfile,
-                                 fret, 0, fret, FD_API_OPEN, "s", "");
+                                 'p', fret, 0, fret, FD_API_OPEN, "s", "");
        return fret;
 }
 
@@ -159,7 +159,7 @@ int fgetpos(FILE* stream, fpos_t* position)
        BEFORE_ORIGINAL_FILE(fgetpos, LIBC);
        ret = fgetposp(stream, position);
        AFTER_PACK_ORIGINAL_FILEP(API_ID_fgetpos,
-                                 ret, 0, stream, FD_API_OTHER, "pp",
+                                 'd', ret, 0, stream, FD_API_OTHER, "pp",
                                  voidp_to_uint64(stream),
                                  voidp_to_uint64(position));
        return ret;
@@ -172,7 +172,7 @@ int fseek(FILE* stream, long int offset, int origin)
        BEFORE_ORIGINAL_FILE(fseek, LIBC);
        ret = fseekp(stream, offset, origin);
        AFTER_PACK_ORIGINAL_FILEP(API_ID_fseek,
-                                 ret, (unsigned int)offset, stream, FD_API_OTHER,
+                                 'd', ret, (unsigned int)offset, stream, FD_API_OTHER,
                                  "pxd", voidp_to_uint64(stream),
                                  (uint64_t)(offset), origin);
        return ret;
@@ -185,7 +185,7 @@ int fsetpos(FILE* stream, const fpos_t* pos)
        BEFORE_ORIGINAL_FILE(fsetpos, LIBC);
        ret = fsetposp(stream, pos);
        AFTER_PACK_ORIGINAL_FILEP(API_ID_fsetpos,
-                                 ret, 0, stream, FD_API_OTHER, "pp",
+                                 'd', ret, 0, stream, FD_API_OTHER, "pp",
                                  voidp_to_uint64(stream), voidp_to_uint64(pos));
        return ret;
 }
@@ -200,7 +200,7 @@ long int ftell(FILE* stream)
        lret = ftellp(stream);
 
        AFTER_PACK_ORIGINAL_FILEP(API_ID_ftell,
-                                 lret, 0, stream, FD_API_OTHER, "p",
+                                 'x', lret, 0, stream, FD_API_OTHER, "p",
                                  voidp_to_uint64(stream));
 
        return lret;
@@ -215,7 +215,7 @@ void rewind(FILE* stream)
        rewindp(stream);
 
        AFTER_PACK_ORIGINAL_FILEP(API_ID_rewind,
-                                 0, 0, stream, FD_API_OTHER, "p",
+                                 'v', 0, 0, stream, FD_API_OTHER, "p",
                                  voidp_to_uint64(stream));
 }
 
@@ -228,7 +228,7 @@ void clearerr(FILE* stream)
        clearerrp(stream);
 
        AFTER_PACK_ORIGINAL_FILEP(API_ID_clearerr,
-                                 0, 0, stream, FD_API_OTHER, "p",
+                                 'v', 0, 0, stream, FD_API_OTHER, "p",
                                  voidp_to_uint64(stream));
 }
 
@@ -239,7 +239,7 @@ int feof(FILE* stream)
        BEFORE_ORIGINAL_FILE(feof, LIBC);
        ret = feofp(stream);
        AFTER_PACK_ORIGINAL_FILEP(API_ID_feof,
-                                 ret, 0, stream, FD_API_OTHER, "p",
+                                 'd', ret, 0, stream, FD_API_OTHER, "p",
                                  voidp_to_uint64(stream));
        return ret;
 }
@@ -251,7 +251,7 @@ int ferror(FILE* stream)
        BEFORE_ORIGINAL_FILE(ferror, LIBC);
        ret = ferrorp(stream);
        AFTER_PACK_ORIGINAL_FILEP(API_ID_ferror,
-                                 ret, 0, stream, FD_API_OTHER, "p",
+                                 'd', ret, 0, stream, FD_API_OTHER, "p",
                                  voidp_to_uint64(stream));
        return ret;
 }
@@ -263,7 +263,7 @@ int fileno(FILE* stream)
        BEFORE_ORIGINAL_FILE(fileno, LIBC);
        ret = filenop(stream);
        AFTER_PACK_ORIGINAL_FILEP(API_ID_fileno,
-                                 ret, 0, stream, FD_API_OTHER, "p",
+                                 'd', ret, 0, stream, FD_API_OTHER, "p",
                                  voidp_to_uint64(stream));
        return ret;
 }
@@ -278,13 +278,13 @@ int vfprintf(FILE* stream, const char* format, va_list arg)
 {
        static int (*vfprintfp)(FILE* stream, const char* format, va_list arg);
 
-       BEFORE_ORIGINAL_START_END_FILEP(API_ID_vfprintf, vfprintf, LIBC, stream,
+       BEFORE_ORIGINAL_START_END_FILEP(API_ID_vfprintf, 'd', vfprintf, LIBC, stream,
                                        FD_API_WRITE_START, "ps",
                                        voidp_to_uint64(stream), format);
 
        ret = vfprintfp(stream, format, arg);
 
-       AFTER_ORIGINAL_START_END_FILEP(API_ID_vfprintf, ret, ret, stream,
+       AFTER_ORIGINAL_START_END_FILEP(API_ID_vfprintf, 'd', ret, ret, stream,
                                       FD_API_WRITE_END, "ps",
                                       voidp_to_uint64(stream), format);
 
@@ -295,13 +295,13 @@ int vfscanf(FILE* stream, const char* format, va_list arg)
 {
        static int (*vfscanfp)(FILE* stream, const char* format, va_list arg);
 
-       BEFORE_ORIGINAL_START_END_FILEP(API_ID_vfscanf, vfscanf, LIBC, stream,
+       BEFORE_ORIGINAL_START_END_FILEP(API_ID_vfscanf, 'd', vfscanf, LIBC, stream,
                                        FD_API_READ_START, "ps",
                                        voidp_to_uint64(stream), format);
 
        ret = vfscanfp(stream, format, arg);
 
-       AFTER_ORIGINAL_START_END_FILEP(API_ID_vfscanf, ret, ret, stream,
+       AFTER_ORIGINAL_START_END_FILEP(API_ID_vfscanf, 'd', ret, ret, stream,
                                       FD_API_READ_END, "ps",
                                       voidp_to_uint64(stream), format);
 
@@ -312,13 +312,13 @@ int fgetc(FILE* stream)
 {
        static int (*fgetcp)(FILE* stream);
 
-       BEFORE_ORIGINAL_START_END_FILEP(API_ID_fgetc, fgetc, LIBC, stream,
+       BEFORE_ORIGINAL_START_END_FILEP(API_ID_fgetc, 'd', fgetc, LIBC, stream,
                                        FD_API_READ_START, "p",
                                        voidp_to_uint64(stream));
 
        ret = fgetcp(stream);
 
-       AFTER_ORIGINAL_START_END_FILEP(API_ID_fgetc, ret, (ret != EOF), stream,
+       AFTER_ORIGINAL_START_END_FILEP(API_ID_fgetc, 'd', ret, (ret != EOF), stream,
                                       FD_API_READ_END, "p",
                                       voidp_to_uint64(stream));
 
@@ -331,12 +331,12 @@ char* fgets(char* str, int size, FILE* stream)
        static char* (*fgetsp)(char* str, int num, FILE* stream);
        char* cret;
 
-       BEFORE_ORIGINAL_START_END_FILEP(API_ID_fgets, FD_API_READ_START,
+       BEFORE_ORIGINAL_START_END_FILEP(API_ID_fgets, 'p', FD_API_READ_START,
                                fgets, LIBC, stream, "sdp", str, size, stream);
 
        cret = fgetsp(str, size, stream);
 
-       AFTER_ORIGINAL_START_END_FILEP(API_ID_fgets, cret, (ret == NULL ? 0 : strlen(cret)),
+       AFTER_ORIGINAL_START_END_FILEP(API_ID_fgets, 'p', cret, (ret == NULL ? 0 : strlen(cret)),
                        stream, FD_API_READ_END, "sdp", str, size, stream);
 
        return cret;
@@ -347,13 +347,13 @@ int fputc(int character, FILE* stream)
 {
        static int (*fputcp)(int character, FILE* stream);
 
-       BEFORE_ORIGINAL_START_END_FILEP(API_ID_fputc, fputc, LIBC, stream,
+       BEFORE_ORIGINAL_START_END_FILEP(API_ID_fputc, 'd', fputc, LIBC, stream,
                                        FD_API_WRITE_START, "dp", character,
                                        voidp_to_uint64(stream));
 
        ret = fputcp(character, stream);
 
-       AFTER_ORIGINAL_START_END_FILEP(API_ID_fputc, ret, (ret == EOF ? 0 : 1),
+       AFTER_ORIGINAL_START_END_FILEP(API_ID_fputc, 'd', ret, (ret == EOF ? 0 : 1),
                                       stream, FD_API_WRITE_END, "dp",
                                       character, voidp_to_uint64(stream));
 
@@ -364,13 +364,13 @@ int fputs(const char* str, FILE* stream)
 {
        static int (*fputsp)(const char* str, FILE* stream);
 
-       BEFORE_ORIGINAL_START_END_FILEP(API_ID_fputs, fputs, LIBC, stream,
+       BEFORE_ORIGINAL_START_END_FILEP(API_ID_fputs, 'd', fputs, LIBC, stream,
                                        FD_API_WRITE_START, "sp", str,
                                        voidp_to_uint64(stream));
 
        ret = fputsp(str, stream);
 
-       AFTER_ORIGINAL_START_END_FILEP(API_ID_fputs, ret, ret, stream,
+       AFTER_ORIGINAL_START_END_FILEP(API_ID_fputs, 'd', ret, ret, stream,
                                       FD_API_WRITE_END, "sp", str,
                                       voidp_to_uint64(stream));
 
@@ -381,13 +381,13 @@ int getc(FILE* stream)
 {
        static int (*getcp)(FILE* stream);
 
-       BEFORE_ORIGINAL_START_END_FILEP(API_ID_getc, getc, LIBC, stream,
+       BEFORE_ORIGINAL_START_END_FILEP(API_ID_getc, 'd', getc, LIBC, stream,
                                        FD_API_READ_START, "p",
                                        voidp_to_uint64(stream));
 
        ret = getcp(stream);
 
-       AFTER_ORIGINAL_START_END_FILEP(API_ID_getc, ret, (ret == EOF ? 0 : 1), stream,
+       AFTER_ORIGINAL_START_END_FILEP(API_ID_getc, 'd', ret, (ret == EOF ? 0 : 1), stream,
                                       FD_API_READ_END, "p",
                                       voidp_to_uint64(stream));
 
@@ -398,13 +398,13 @@ int putc(int character, FILE* stream)
 {
        static int (*putcp)(int character, FILE* stream);
 
-       BEFORE_ORIGINAL_START_END_FILEP(API_ID_putc, putc, LIBC, stream,
+       BEFORE_ORIGINAL_START_END_FILEP(API_ID_putc, 'd', putc, LIBC, stream,
                                        FD_API_WRITE_START, "dp", character,
                                        voidp_to_uint64(stream));
 
        ret = putcp(character, stream);
 
-       AFTER_ORIGINAL_START_END_FILEP(API_ID_putc, ret, (ret == EOF ? 0 : 1),
+       AFTER_ORIGINAL_START_END_FILEP(API_ID_putc, 'd', ret, (ret == EOF ? 0 : 1),
                                       stream, FD_API_WRITE_END, "dp",
                                       character, voidp_to_uint64(stream));
 
@@ -415,13 +415,13 @@ int ungetc(int character, FILE* stream)
 {
        static int (*ungetcp)(int character, FILE* stream);
 
-       BEFORE_ORIGINAL_START_END_FILEP(API_ID_putc, ungetc, LIBC, stream,
+       BEFORE_ORIGINAL_START_END_FILEP(API_ID_putc, 'd', ungetc, LIBC, stream,
                                        FD_API_WRITE_START, "dp", character,
                                        voidp_to_uint64(stream));
 
        ret = ungetcp(character, stream);
 
-       AFTER_ORIGINAL_START_END_FILEP(API_ID_ungetc, ret, 0, stream,
+       AFTER_ORIGINAL_START_END_FILEP(API_ID_ungetc, 'd', ret, 0, stream,
                                       FD_API_OTHER, "dp", character,
                                       voidp_to_uint64(stream));
 
@@ -433,7 +433,7 @@ size_t fread(void* ptr, size_t size, size_t count, FILE* stream)
        static size_t (*freadp)(void* ptr, size_t size, size_t count, FILE* stream);
        size_t tret;
 
-       BEFORE_ORIGINAL_START_END_FILEP(API_ID_fread, fread, LIBC, stream,
+       BEFORE_ORIGINAL_START_END_FILEP(API_ID_fread, 'x', fread, LIBC, stream,
                                        FD_API_READ_START, "pxxp",
                                        voidp_to_uint64(ptr),
                                        (uint64_t)(size),
@@ -442,7 +442,7 @@ size_t fread(void* ptr, size_t size, size_t count, FILE* stream)
 
        tret = freadp(ptr, size, count, stream);
 
-       AFTER_ORIGINAL_START_END_FILEP(API_ID_fread, tret, tret*size, stream,
+       AFTER_ORIGINAL_START_END_FILEP(API_ID_fread, 'x', tret, tret*size, stream,
                                       FD_API_READ_END, "pxxp",
                                       voidp_to_uint64(ptr),
                                       (uint64_t)(size),
@@ -457,7 +457,7 @@ size_t fwrite(const void* ptr, size_t size, size_t count, FILE* stream)
        static size_t (*fwritep)(const void* ptr, size_t size, size_t count, FILE* stream);
        size_t tret;
 
-       BEFORE_ORIGINAL_START_END_FILEP(API_ID_fwrite, fwrite, LIBC, stream,
+       BEFORE_ORIGINAL_START_END_FILEP(API_ID_fwrite, 'x', fwrite, LIBC, stream,
                                        FD_API_WRITE_START, "pxxp",
                                        voidp_to_uint64(ptr),
                                        (uint64_t)(size),
@@ -466,7 +466,7 @@ size_t fwrite(const void* ptr, size_t size, size_t count, FILE* stream)
 
        tret = fwritep(ptr, size, count, stream);
 
-       AFTER_ORIGINAL_START_END_FILEP(API_ID_fwrite, tret, tret*size, stream,
+       AFTER_ORIGINAL_START_END_FILEP(API_ID_fwrite, 'x', tret, tret*size, stream,
                                       FD_API_WRITE_END, "pxxp",
                                       voidp_to_uint64(ptr),
                                       (uint64_t)(size),
@@ -483,7 +483,7 @@ int fprintf(FILE* stream, const char* format, ...)
 {
        static int (*vfprintfp)(FILE* stream, const char* format, ...);
 
-       BEFORE_ORIGINAL_START_END_FILEP(API_ID_fprintf, vfprintf, LIBC, stream,
+       BEFORE_ORIGINAL_START_END_FILEP(API_ID_fprintf, 'd', vfprintf, LIBC, stream,
                                        FD_API_WRITE_START, "ps",
                                        voidp_to_uint64(stream), format);
 
@@ -492,7 +492,7 @@ int fprintf(FILE* stream, const char* format, ...)
 
        ret = vfprintfp(stream, format, arg);
 
-       AFTER_ORIGINAL_START_END_FILEP(API_ID_fprintf, ret, ret, stream,
+       AFTER_ORIGINAL_START_END_FILEP(API_ID_fprintf, 'd', ret, ret, stream,
                                       FD_API_WRITE_END, "ps",
                                       voidp_to_uint64(stream), format);
 
@@ -505,7 +505,7 @@ int fscanf(FILE* stream, const char* format, ...)
 {
        static int (*vfscanfp)(FILE* stream, const char* format, ...);
 
-       BEFORE_ORIGINAL_START_END_FILEP(API_ID_fscanf, vfscanf, LIBC, stream,
+       BEFORE_ORIGINAL_START_END_FILEP(API_ID_fscanf, 'd', vfscanf, LIBC, stream,
                                        FD_API_READ_START, "ps",
                                        voidp_to_uint64(stream), format);
 
@@ -514,7 +514,7 @@ int fscanf(FILE* stream, const char* format, ...)
 
        ret = vfscanfp(stream, format, arg);
 
-       AFTER_ORIGINAL_START_END_FILEP(API_ID_fscanf, ret, ret, stream,
+       AFTER_ORIGINAL_START_END_FILEP(API_ID_fscanf, 'd', ret, ret, stream,
                                       FD_API_READ_END, "ps",
                                       voidp_to_uint64(stream), format);
 
@@ -528,14 +528,14 @@ int printf(const char* format, ...)
 {
        static int (*vprintfp)(const char* format, ...);
 
-       BEFORE_ORIGINAL_START_END_NOFD(API_ID_printf, vprintf, LIBC,
+       BEFORE_ORIGINAL_START_END_NOFD(API_ID_printf, 'd', vprintf, LIBC,
                                FD_API_WRITE_START, "s", format);
 
        va_list arg;
        va_start(arg, format);
        ret = vprintfp(format, arg);
 
-       AFTER_ORIGINAL_START_END_NOFD(API_ID_printf, ret, ret,
+       AFTER_ORIGINAL_START_END_NOFD(API_ID_printf, 'd', ret, ret,
                                FD_API_WRITE_END, "s", format);
 
        va_end(arg);
@@ -548,14 +548,14 @@ int scanf(const char* format, ...)
 {
        static int (*vscanfp)(const char* format, ...);
 
-       BEFORE_ORIGINAL_START_END_NOFD(API_ID_scanf, vscanf, LIBC,
+       BEFORE_ORIGINAL_START_END_NOFD(API_ID_scanf, 'd', vscanf, LIBC,
                                FD_API_READ_START, "s", format);
 
        va_list arg;
        va_start(arg, format);
        ret = vscanfp(format, arg);
 
-       AFTER_ORIGINAL_START_END_NOFD(API_ID_scanf, ret, ret,
+       AFTER_ORIGINAL_START_END_NOFD(API_ID_scanf, 'd', ret, ret,
                                 FD_API_READ_END, "s", format);
 
        va_end(arg);
@@ -567,12 +567,12 @@ int getchar()
 {
        static int (*getcharp)();
 
-       BEFORE_ORIGINAL_START_END_NOFD(API_ID_getchar, getchar, LIBC,
+       BEFORE_ORIGINAL_START_END_NOFD(API_ID_getchar, 'd', getchar, LIBC,
                                FD_API_READ_START, "", 0);
 
        ret = getcharp();
 
-       AFTER_ORIGINAL_START_END_NOFD(API_ID_getchar, ret, (ret == EOF ? 0 : 1),
+       AFTER_ORIGINAL_START_END_NOFD(API_ID_getchar, 'd', ret, (ret == EOF ? 0 : 1),
                                FD_API_READ_END, "", 0);
 
        return ret;
@@ -582,12 +582,12 @@ int putchar(int c)
 {
        static int (*putcharp)(int c);
 
-       BEFORE_ORIGINAL_START_END_NOFD(API_ID_putchar, putchar, LIBC,
+       BEFORE_ORIGINAL_START_END_NOFD(API_ID_putchar, 'd', putchar, LIBC,
                                FD_API_WRITE_START, "d", c);
 
        ret = putcharp(c);
 
-       AFTER_ORIGINAL_START_END_NOFD(API_ID_putchar, ret, (ret == EOF ? 0 : 1),
+       AFTER_ORIGINAL_START_END_NOFD(API_ID_putchar, 'd', ret, (ret == EOF ? 0 : 1),
                                FD_API_WRITE_END, "d", c);
 
        return ret;
@@ -598,12 +598,12 @@ char* gets(char* str)
        static char* (*getsp)(char* str);
        char* cret;
 
-       BEFORE_ORIGINAL_START_END_NOFD(API_ID_gets, gets, LIBC,
+       BEFORE_ORIGINAL_START_END_NOFD(API_ID_gets, 'p', gets, LIBC,
                                FD_API_READ_START, "s", str);
 
        cret = getsp(str);
 
-       AFTER_ORIGINAL_START_END_NOFD(API_ID_gets, cret, strlen(cret),
+       AFTER_ORIGINAL_START_END_NOFD(API_ID_gets, 'p', cret, strlen(cret),
                                FD_API_READ_END, "s", str);
 
        return cret;
@@ -614,12 +614,12 @@ int puts(const char* str)
 {
        static int (*putsp)(const char* str);
 
-       BEFORE_ORIGINAL_START_END_NOFD(API_ID_puts, puts, LIBC,
+       BEFORE_ORIGINAL_START_END_NOFD(API_ID_puts, 'd', puts, LIBC,
                                FD_API_WRITE_START, "s", str);
 
        ret = putsp(str);
 
-       AFTER_ORIGINAL_START_END_NOFD(API_ID_puts, ret, ret,
+       AFTER_ORIGINAL_START_END_NOFD(API_ID_puts, 'd', ret, ret,
                                FD_API_WRITE_END, "s", str);
 
        return ret;
@@ -637,7 +637,7 @@ void setbuf(FILE* stream, char* buf)
        setbufp(stream, buf);
 
        AFTER_PACK_ORIGINAL_FILEP(API_ID_setbuf,
-                                 0, 0, stream, FD_API_OTHER, "pp",
+                                 'v', 0, 0, stream, FD_API_OTHER, "pp",
                                  voidp_to_uint64(stream),
                                  voidp_to_uint64(buf));
 }
@@ -651,7 +651,7 @@ void setbuffer(FILE* stream, char* buf, size_t size)
        setbufferp(stream, buf, size);
 
        AFTER_PACK_ORIGINAL_FILEP(API_ID_setbuffer,
-                                 0, size, stream, FD_API_OTHER,
+                                 'v', 0, size, stream, FD_API_OTHER,
                                  "ppx", voidp_to_uint64(stream),
                                  voidp_to_uint64(buf), (uint64_t)(size));
 }
@@ -665,7 +665,7 @@ void setlinebuf(FILE* stream)
        setlinebufp(stream);
 
        AFTER_PACK_ORIGINAL_FILEP(API_ID_setlinebuf,
-                                 0, 0, stream, FD_API_OTHER, "p",
+                                 'v', 0, 0, stream, FD_API_OTHER, "p",
                                  voidp_to_uint64(stream));
 }
 
@@ -676,7 +676,7 @@ int setvbuf(FILE* stream, char* buf, int mode, size_t size)
        BEFORE_ORIGINAL_FILE(setvbuf, LIBC);
        ret = setvbufp(stream,buf,mode,size);
        AFTER_PACK_ORIGINAL_FILEP(API_ID_setvbuf,
-                                 ret, size, stream, FD_API_OTHER,
+                                 'd', ret, size, stream, FD_API_OTHER,
                                  "ppdx",
                                  voidp_to_uint64(stream),
                                  voidp_to_uint64(buf), mode,
index 531f70de97f63e69d35a0e15f9f5578504980f36..bb762cb2def8040457d65b6a1c6f000436ef210c 100644 (file)
@@ -41,7 +41,7 @@ void glActiveTexture(GLenum texture) {
        BEFORE(glActiveTexture);
        glActiveTexturep(texture);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x",
              (uint64_t)(texture));
 }
 
@@ -50,7 +50,7 @@ void glAttachShader(GLuint program, GLuint shader) {
        BEFORE(glAttachShader);
        glAttachShaderp(program, shader);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dd",
                        program, shader);
 }
 
@@ -63,7 +63,7 @@ void glBindAttribLocation(GLuint program, GLuint index, const char *name) {
        BEFORE(glBindAttribLocation);
        glBindAttribLocationp(program, index, name);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dds",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dds",
                        program, index, name);
 }
 
@@ -72,7 +72,7 @@ void glBindBuffer(GLenum target, GLuint buffer) {
        BEFORE(glBindBuffer);
        glBindBufferp(target, buffer);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xd",
              (uint64_t)(target), buffer);
 }
 
@@ -81,7 +81,7 @@ void glBindFramebuffer(GLenum target, GLuint framebuffer) {
        BEFORE(glBindFramebuffer);
        glBindFramebufferp(target, framebuffer);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xd",
              (uint64_t)(target), framebuffer);
 }
 
@@ -90,7 +90,7 @@ void glBindRenderbuffer(GLenum target, GLuint renderbuffer) {
        BEFORE(glBindRenderbuffer);
        glBindRenderbufferp(target, renderbuffer);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xd",
              (uint64_t)(target), renderbuffer);
 }
 
@@ -99,7 +99,7 @@ void glBindTexture(GLenum target, GLuint texture) {
        BEFORE(glBindTexture);
        glBindTexturep(target, texture);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xd",
              (uint64_t)(target), texture);
 }
 
@@ -108,7 +108,7 @@ void glBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) {
        BEFORE(glBlendColor);
        glBlendColorp(red, green, blue, alpha);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ffff",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ffff",
                        red, green, blue, alpha);
 }
 
@@ -117,7 +117,7 @@ void glBlendEquation(GLenum mode) {
        BEFORE(glBlendEquation);
        glBlendEquationp(mode);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x",
              (uint64_t)(mode));
 }
 
@@ -126,7 +126,7 @@ void glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha) {
        BEFORE(glBlendEquationSeparate);
        glBlendEquationSeparatep(modeRGB, modeAlpha);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
              (uint64_t)(modeRGB), (uint64_t)(modeAlpha));
 }
 
@@ -135,7 +135,7 @@ void glBlendFunc(GLenum sfactor, GLenum dfactor) {
        BEFORE(glBlendFunc);
        glBlendFuncp(sfactor, dfactor);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
              (uint64_t)(sfactor), (uint64_t)(dfactor));
 }
 
@@ -145,7 +145,7 @@ void glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha,
        BEFORE(glBlendFuncSeparate);
        glBlendFuncSeparatep(srcRGB, dstRGB, srcAlpha, dstAlpha);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxxx",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxxx",
              (uint64_t)(srcRGB), (uint64_t)(dstRGB),
              (uint64_t)(srcAlpha), (uint64_t)(dstAlpha));
 }
@@ -156,7 +156,7 @@ void glBufferData(GLenum target, GLsizeiptr size, const GLvoid * data,
        BEFORE(glBufferData);
        glBufferDatap(target, size, data, usage);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxpx",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxpx",
              (uint64_t)(target), (uint64_t)(size),
              voidp_to_uint64(data), (uint64_t)(usage));
 }
@@ -167,7 +167,7 @@ void glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size,
        BEFORE(glBufferSubData);
        glBufferSubDatap(target, offset, size, data);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxxp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxxp",
              (uint64_t)(target), (uint64_t)(offset),
              (uint64_t)(size), voidp_to_uint64(data));
 }
@@ -181,7 +181,7 @@ GLenum glCheckFramebufferStatus(GLenum target) {
        BEFORE(glCheckFramebufferStatus);
        GLenum ret = glCheckFramebufferStatusp(target);
        error = glGetError();
-       AFTER(ret, APITYPE_CONTEXT, "", "x",
+       AFTER('d', ret, APITYPE_CONTEXT, "", "x",
              (uint64_t)(target));
 
        return ret;
@@ -192,7 +192,7 @@ void glClear(GLbitfield mask) {
        BEFORE(glClear);
        glClearp(mask);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x",
              (uint64_t)(mask));
 }
 
@@ -201,7 +201,7 @@ void glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) {
        BEFORE(glClearColor);
        glClearColorp(red, green, blue, alpha);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ffff",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ffff",
                        red, green, blue, alpha);
 }
 
@@ -210,7 +210,7 @@ void glClearDepthf(GLclampf depth) {
        BEFORE(glClearDepthf);
        glClearDepthfp(depth);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "f", depth);
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "f", depth);
 }
 
 void glClearStencil(GLint s) {
@@ -218,7 +218,7 @@ void glClearStencil(GLint s) {
        BEFORE(glClearStencil);
        glClearStencilp(s);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "d", s);
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "d", s);
 }
 
 void glColorMask(GLboolean red, GLboolean green, GLboolean blue,
@@ -227,7 +227,7 @@ void glColorMask(GLboolean red, GLboolean green, GLboolean blue,
        BEFORE(glColorMask);
        glColorMaskp(red, green, blue, alpha);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dddd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dddd",
                        red, green, blue, alpha);
 }
 
@@ -236,7 +236,7 @@ void glCompileShader(GLuint shader) {
        BEFORE(glCompileShader);
        glCompileShaderp(shader);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(shader));
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(shader));
 }
 
 void glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat,
@@ -248,7 +248,7 @@ void glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat,
        glCompressedTexImage2Dp(target, level, internalformat, width, height,
                        border, imageSize, data);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xdxddddp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xdxddddp",
              (uint64_t)(target), level,
              (uint64_t)(internalformat), width, height, border, imageSize,
              voidp_to_uint64(data));
@@ -263,7 +263,7 @@ void glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset,
        glCompressedTexSubImage2Dp(target, level, xoffset, yoffset, width, height,
                        format, imageSize, data);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xdddddxdp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xdddddxdp",
              (uint64_t)(target), level, xoffset, yoffset, width, height,
              (uint64_t)(format), imageSize, voidp_to_uint64(data));
 }
@@ -276,7 +276,7 @@ void glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat,
        glCopyTexImage2Dp(target, level, internalformat, x, y, width, height,
                        border);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xdxddddd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xdxddddd",
              (uint64_t)(target), level,
              (uint64_t)(internalformat), x, y, width, height, border);
 }
@@ -288,7 +288,7 @@ void glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset,
        BEFORE(glCopyTexSubImage2D);
        glCopyTexSubImage2Dp(target, level, xoffset, yoffset, x, y, width, height);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xddddddd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xddddddd",
              (uint64_t)(target), level, xoffset, yoffset, x, y, width,
              height);
 }
@@ -298,7 +298,7 @@ GLuint glCreateProgram(void) {
        BEFORE(glCreateProgram);
        GLuint ret = glCreateProgramp();
        error = glGetError();
-       AFTER_NO_PARAM(ret, APITYPE_CONTEXT, "");
+       AFTER_NO_PARAM('d', ret, APITYPE_CONTEXT, "");
 
        return ret;
 }
@@ -308,7 +308,7 @@ GLuint glCreateShader(GLenum shaderType) {
        BEFORE(glCreateShader);
        GLuint ret = glCreateShaderp(shaderType);
        error = glGetError();
-       AFTER(ret, APITYPE_CONTEXT, "", "x", (uint64_t)(shaderType));
+       AFTER('d', ret, APITYPE_CONTEXT, "", "x", (uint64_t)(shaderType));
 
        return ret;
 }
@@ -318,7 +318,7 @@ void glCullFace(GLenum mode) {
        BEFORE(glCullFace);
        glCullFacep(mode);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(mode));
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(mode));
 }
 
 // ==================================================================
@@ -330,7 +330,7 @@ void glDeleteBuffers(GLsizei n, const GLuint * buffers) {
        BEFORE(glDeleteBuffers);
        glDeleteBuffersp(n, buffers);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
              n, voidp_to_uint64(buffers));
 }
 
@@ -339,7 +339,7 @@ void glDeleteFramebuffers(GLsizei n, const GLuint * framebuffers) {
        BEFORE(glDeleteFramebuffers);
        glDeleteFramebuffersp(n, framebuffers);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
              n, voidp_to_uint64(framebuffers));
 }
 
@@ -348,7 +348,7 @@ void glDeleteProgram(GLuint program) {
        BEFORE(glDeleteProgram);
        glDeleteProgramp(program);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "d",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "d",
                        program);
 }
 
@@ -357,7 +357,7 @@ void glDeleteRenderbuffers(GLsizei n, const GLuint * renderbuffers) {
        BEFORE(glDeleteRenderbuffers);
        glDeleteRenderbuffersp(n, renderbuffers);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
              n, voidp_to_uint64(renderbuffers));
 }
 
@@ -366,7 +366,7 @@ void glDeleteShader(GLuint shader) {
        BEFORE(glDeleteShader);
        glDeleteShaderp(shader);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "d", shader);
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "d", shader);
 }
 
 void glDeleteTextures(GLsizei n, const GLuint * textures) {
@@ -383,10 +383,10 @@ void glDeleteTextures(GLsizei n, const GLuint * textures) {
                                bufP += sprintf(buf + bufP, ",");
                        }
                }
-               AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, buf, "dp",
+               AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, buf, "dp",
                      n, voidp_to_uint64(textures));
        } else {
-               AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
+               AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
                      n, voidp_to_uint64(textures));
        }
 }
@@ -396,7 +396,7 @@ void glDepthFunc(GLenum func) {
        BEFORE(glDepthFunc);
        glDepthFuncp(func);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(func));
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(func));
 }
 
 void glDepthMask(GLboolean flag) {
@@ -404,7 +404,7 @@ void glDepthMask(GLboolean flag) {
        BEFORE(glDepthMask);
        glDepthMaskp(flag);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(flag));
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(flag));
 }
 
 void glDepthRangef(GLclampf nearVal, GLclampf farVal) {
@@ -412,7 +412,7 @@ void glDepthRangef(GLclampf nearVal, GLclampf farVal) {
        BEFORE(glDepthRangef);
        glDepthRangefp(nearVal, farVal);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ff",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ff",
                        nearVal, farVal);
 }
 
@@ -421,7 +421,7 @@ void glDetachShader(GLuint program, GLuint shader) {
        BEFORE(glDetachShader);
        glDetachShaderp(program, shader);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dd",
                        program, shader);
 }
 
@@ -430,7 +430,7 @@ void glDisable(GLenum cap) {
        BEFORE(glDisable);
        glDisablep(cap);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(cap));
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(cap));
 }
 
 void glDisableVertexAttribArray(GLuint index) {
@@ -438,7 +438,7 @@ void glDisableVertexAttribArray(GLuint index) {
        BEFORE(glDisableVertexAttribArray);
        glDisableVertexAttribArrayp(index);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "d", index);
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "d", index);
 }
 
 void glDrawArrays(GLenum mode, GLint first, GLsizei count) {
@@ -446,7 +446,7 @@ void glDrawArrays(GLenum mode, GLint first, GLsizei count) {
        BEFORE(glDrawArrays);
        glDrawArraysp(mode, first, count);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xdd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xdd",
              (uint64_t)(mode), first, count);
 }
 
@@ -456,7 +456,7 @@ void glDrawElements(GLenum mode, GLsizei count, GLenum type,
        BEFORE(glDrawElements);
        glDrawElementsp(mode, count, type, indices);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xdxp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xdxp",
              (uint64_t)(mode), count, (uint64_t)(type), indices);
 }
 
@@ -469,7 +469,7 @@ void glEnable(GLenum cap) {
        BEFORE(glEnable);
        glEnablep(cap);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(cap));
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(cap));
 }
 
 void glEnableVertexAttribArray(GLuint index) {
@@ -477,7 +477,7 @@ void glEnableVertexAttribArray(GLuint index) {
        BEFORE(glEnableVertexAttribArray);
        glEnableVertexAttribArrayp(index);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "d", index);
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "d", index);
 }
 
 #undef eglSwapBuffers
@@ -486,7 +486,7 @@ extern "C" EGLBoolean eglSwapBuffers(EGLDisplay dpy, EGLSurface surface) {
        BEFORE_EGL(eglSwapBuffers);
        EGLBoolean ret = eglSwapBuffersp(dpy, surface);
        error = eglGetError();
-       AFTER_NO_PARAM(ret, APITYPE_CONTEXT, "");
+       AFTER_NO_PARAM('d', ret, APITYPE_CONTEXT, "");
 
        return ret;
 }
@@ -497,7 +497,7 @@ EGLBoolean _SglSwapBuffers(EGLDisplay dpy, EGLSurface surface) {
        BEFORE_OSP_UIFW(_SglSwapBuffers);
        EGLBoolean ret = _SglSwapBuffersp(dpy, surface);
        error = eglGetError();
-       AFTER_NO_PARAM(ret, APITYPE_CONTEXT, "");
+       AFTER_NO_PARAM('d', ret, APITYPE_CONTEXT, "");
 
        return ret;
 }
@@ -511,7 +511,7 @@ void glFinish(void) {
        BEFORE(glFinish);
        glFinishp();
        error = glGetError();
-       AFTER_NO_PARAM(NO_RETURN_VALUE, APITYPE_CONTEXT, "");
+       AFTER_NO_PARAM('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "");
 }
 
 void glFlush(void) {
@@ -519,7 +519,7 @@ void glFlush(void) {
        BEFORE(glFlush);
        glFlushp();
        error = glGetError();
-       AFTER_NO_PARAM(NO_RETURN_VALUE, APITYPE_CONTEXT, "");
+       AFTER_NO_PARAM('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "");
 }
 
 void glFramebufferRenderbuffer(GLenum target, GLenum attachment,
@@ -529,7 +529,7 @@ void glFramebufferRenderbuffer(GLenum target, GLenum attachment,
        glFramebufferRenderbufferp(target, attachment, renderbuffertarget,
                        renderbuffer);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxxd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxxd",
              (uint64_t)(target), (uint64_t)(attachment),
              (uint64_t)(renderbuffertarget), renderbuffer);
 }
@@ -540,7 +540,7 @@ void glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget,
        BEFORE(glFramebufferTexture2D);
        glFramebufferTexture2Dp(target, attachment, textarget, texture, level);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxxdd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxxdd",
              (uint64_t)(target), (uint64_t)(attachment),
              (uint64_t)(textarget), texture, level);
 }
@@ -550,7 +550,7 @@ void glFrontFace(GLenum mode) {
        BEFORE(glFrontFace);
        glFrontFacep(mode);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x",
              (uint64_t)(mode));
 }
 
@@ -572,10 +572,10 @@ void glGenBuffers(GLsizei n, GLuint * buffers) {
                                bufP += sprintf(buf + bufP, ",");
                        }
                }
-               AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, buf, "dp",
+               AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, buf, "dp",
                      n, voidp_to_uint64(buffers));
        } else {
-               AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
+               AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
                      n, voidp_to_uint64(buffers));
        }
 }
@@ -585,7 +585,7 @@ void glGenFramebuffers(GLsizei n, GLuint * framebuffers) {
        BEFORE(glGenFramebuffers);
        glGenFramebuffersp(n, framebuffers);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
              n, voidp_to_uint64(framebuffers));
 }
 
@@ -594,7 +594,7 @@ void glGenRenderbuffers(GLsizei n, GLuint * renderbuffers) {
        BEFORE(glGenRenderbuffers);
        glGenRenderbuffersp(n, renderbuffers);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
              n, voidp_to_uint64(renderbuffers));
 }
 
@@ -612,10 +612,10 @@ void glGenTextures(GLsizei n, GLuint * textures) {
                                bufP += sprintf(buf + bufP, ",");
                        }
                }
-               AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, buf, "dp",
+               AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, buf, "dp",
                      n, voidp_to_uint64(textures));
        } else {
-               AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
+               AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dp",
                      n, voidp_to_uint64(textures));
        }
 }
@@ -625,7 +625,7 @@ void glGenerateMipmap(GLenum target) {
        BEFORE(glGenerateMipmap);
        glGenerateMipmapp(target);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(target));
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(target));
 }
 
 //lsh_get
@@ -634,7 +634,7 @@ void glGetBooleanv(GLenum pname, GLboolean * params) {
        BEFORE(glGetBooleanv);
        glGetBooleanvp(pname, params);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(pname));
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(pname));
 }
 
 //lsh_get
@@ -643,7 +643,7 @@ void glGetFloatv(GLenum pname, GLfloat * params) {
        BEFORE(glGetFloatv);
        glGetFloatvp(pname, params);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(pname));
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(pname));
 }
 
 //lsh_get
@@ -652,7 +652,7 @@ void glGetIntegerv(GLenum pname, GLint * params) {
        BEFORE(glGetIntegerv);
        glGetIntegervp(pname, params);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(pname));
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(pname));
 }
 
 //lsh_get
@@ -663,7 +663,7 @@ void glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize,
        BEFORE(glGetActiveAttrib);
        glGetActiveAttribp(program, index, bufSize, length, size, type, name);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddd",
                        program, index, bufSize);
 }
 
@@ -675,7 +675,7 @@ void glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize,
        BEFORE(glGetActiveUniform);
        glGetActiveUniformp(program, index, bufSize, length, size, type, name);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddd",
                        program, index, bufSize);
 }
 
@@ -686,7 +686,7 @@ void glGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count,
        BEFORE(glGetAttachedShaders);
        glGetAttachedShadersp(program, maxCount, count, shaders);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dd",
                        program, maxCount);
 }
 
@@ -696,7 +696,7 @@ void glGetAttribLocation(GLenum pname, GLint * params) {
        BEFORE(glGetAttribLocation);
        glGetAttribLocationp(pname, params);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(pname));
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "x", (uint64_t)(pname));
 }
 
 //lsh_get
@@ -705,7 +705,7 @@ void glGetBufferParameteriv(GLenum target, GLenum value, GLint * data) {
        BEFORE(glGetBufferParameteriv);
        glGetBufferParameterivp(target, value, data);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
              (uint64_t)(target), (uint64_t)(value));
 }
 
@@ -714,7 +714,7 @@ GLenum glGetError(void) {
        BEFORE(glGetError);
        GLenum ret = glGetErrorp();
 //     error = glGetError();
-       AFTER_NO_PARAM(ret, APITYPE_CONTEXT, "");
+       AFTER_NO_PARAM('d', ret, APITYPE_CONTEXT, "");
 
        return ret;
 }
@@ -726,7 +726,7 @@ void glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment,
        BEFORE(glGetFramebufferAttachmentParameteriv);
        glGetFramebufferAttachmentParameterivp(target, attachment, pname, params);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxx",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxx",
              (uint64_t)(target), (uint64_t)(attachment),
              (uint64_t)(pname));
 }
@@ -738,7 +738,7 @@ void glGetProgramInfoLog(GLuint program, GLsizei maxLength, GLsizei *length,
        BEFORE(glGetProgramInfoLog);
        glGetProgramInfoLogp(program, maxLength, length, infoLog);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dd",
                        program, maxLength);
 }
 
@@ -748,7 +748,7 @@ void glGetProgramiv(GLuint program, GLenum pname, GLint *params) {
        BEFORE(glGetProgramiv);
        glGetProgramivp(program, pname, params);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dx",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dx",
              program, (uint64_t)(pname));
 }
 
@@ -758,7 +758,7 @@ void glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params) {
        BEFORE(glGetRenderbufferParameteriv);
        glGetRenderbufferParameterivp(target, pname, params);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
              (uint64_t)(target), (uint64_t)(pname));
 }
 
@@ -769,7 +769,7 @@ void glGetShaderInfoLog(GLuint shader, GLsizei maxLength, GLsizei *length,
        BEFORE(glGetShaderInfoLog);
        glGetShaderInfoLogp(shader, maxLength, length, infoLog);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dd",
                        shader, maxLength);
 }
 
@@ -780,7 +780,7 @@ void glGetShaderPrecisionFormat(GLenum shaderType, GLenum precisionType,
        BEFORE(glGetShaderPrecisionFormat);
        glGetShaderPrecisionFormatp(shaderType, precisionType, range, precision);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
              (uint64_t)(shaderType), (uint64_t)(precisionType));
 }
 
@@ -791,7 +791,7 @@ void glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length,
        BEFORE(glGetShaderSource);
        glGetShaderSourcep(shader, bufSize, length, source);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dd",
                        shader, bufSize);
 }
 
@@ -801,7 +801,7 @@ void glGetShaderiv(GLuint shader, GLenum pname, GLint *params) {
        BEFORE(glGetShaderiv);
        glGetShaderivp(shader, pname, params);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dx",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dx",
              shader, (uint64_t)(pname));
 }
 
@@ -810,7 +810,7 @@ const GLubyte* glGetString(GLenum name) {
        BEFORE(glGetString);
        const GLubyte* ret = glGetStringp(name);
        error = glGetError();
-       AFTER(ret, APITYPE_CONTEXT, "", "x", (uint64_t)(name));
+       AFTER('p', ret, APITYPE_CONTEXT, "", "x", (uint64_t)(name));
 
        return ret;
 }
@@ -821,7 +821,7 @@ void glGetTexParameterfv(GLenum target, GLenum pname, GLfloat * params) {
        BEFORE(glGetTexParameterfv);
        glGetTexParameterfvp(target, pname, params);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
              (uint64_t)(target), (uint64_t)(pname));
 }
 
@@ -831,7 +831,7 @@ void glGetTexParameteriv(GLenum target, GLenum pname, GLint * params) {
        BEFORE(glGetTexParameteriv);
        glGetTexParameterivp(target, pname, params);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
              (uint64_t)(target), (uint64_t)(pname));
 }
 
@@ -841,7 +841,7 @@ void glGetUniformfv(GLuint program, GLint location, GLfloat *params) {
        BEFORE(glGetUniformfv);
        glGetUniformfvp(program, location, params);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dd",
                        program, location);
 }
 
@@ -851,7 +851,7 @@ void glGetUniformiv(GLuint program, GLint location, GLint *params) {
        BEFORE(glGetUniformiv);
        glGetUniformivp(program, location, params);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dd",
                        program, location);
 }
 
@@ -861,7 +861,7 @@ GLint glGetUniformLocation(GLuint program, const char *name) {
        BEFORE(glGetUniformLocation);
        GLint ret = glGetUniformLocationp(program, name);
        error = glGetError();
-       AFTER(ret, APITYPE_CONTEXT, "", "d", program);
+       AFTER('d', ret, APITYPE_CONTEXT, "", "d", program);
 
        return ret;
 }
@@ -872,7 +872,7 @@ void glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params) {
        BEFORE(glGetVertexAttribfv);
        glGetVertexAttribfvp(index, pname, params);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dx",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dx",
              index, (uint64_t)(pname));
 }
 
@@ -882,7 +882,7 @@ void glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params) {
        BEFORE(glGetVertexAttribiv);
        glGetVertexAttribivp(index, pname, params);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dx",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dx",
              index, (uint64_t)(pname));
 }
 
@@ -892,7 +892,7 @@ void glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid **pointer) {
        BEFORE(glGetVertexAttribPointerv);
        glGetVertexAttribPointervp(index, pname, pointer);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dx",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dx",
              index, (uint64_t)(pname));
 }
 
@@ -905,7 +905,7 @@ void glHint(GLenum target, GLenum mode) {
        BEFORE(glHint);
        glHintp(target, mode);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xx",
              (uint64_t)(target), (uint64_t)(mode));
 }
 
@@ -918,7 +918,7 @@ GLboolean glIsBuffer(GLuint buffer) {
        BEFORE(glIsBuffer);
        GLboolean ret = glIsBufferp(buffer);
        error = glGetError();
-       AFTER(ret, APITYPE_CONTEXT, "", "d", buffer);
+       AFTER('c', ret, APITYPE_CONTEXT, "", "d", buffer);
 
        return ret;
 }
@@ -928,7 +928,7 @@ GLboolean glIsEnabled(GLenum cap) {
        BEFORE(glIsEnabled);
        GLboolean ret = glIsEnabledp(cap);
        error = glGetError();
-       AFTER(ret, APITYPE_CONTEXT, "", "x", (uint64_t)(cap));
+       AFTER('c', ret, APITYPE_CONTEXT, "", "x", (uint64_t)(cap));
 
        return ret;
 }
@@ -938,7 +938,7 @@ GLboolean glIsFramebuffer(GLuint framebuffer) {
        BEFORE(glIsFramebuffer);
        GLboolean ret = glIsFramebufferp(framebuffer);
        error = glGetError();
-       AFTER(ret, APITYPE_CONTEXT, "", "d", framebuffer);
+       AFTER('c', ret, APITYPE_CONTEXT, "", "d", framebuffer);
 
        return ret;
 }
@@ -948,7 +948,7 @@ GLboolean glIsProgram(GLuint program) {
        BEFORE(glIsProgram);
        GLboolean ret = glIsProgramp(program);
        error = glGetError();
-       AFTER(ret, APITYPE_CONTEXT, "", "d", program);
+       AFTER('c', ret, APITYPE_CONTEXT, "", "d", program);
 
        return ret;
 }
@@ -958,7 +958,7 @@ GLboolean glIsRenderbuffer(GLuint renderbuffer) {
        BEFORE(glIsRenderbuffer);
        GLboolean ret = glIsRenderbufferp(renderbuffer);
        error = glGetError();
-       AFTER(ret, APITYPE_CONTEXT, "", "d", renderbuffer);
+       AFTER('c', ret, APITYPE_CONTEXT, "", "d", renderbuffer);
 
        return ret;
 }
@@ -968,7 +968,7 @@ GLboolean glIsShader(GLuint shader) {
        BEFORE(glIsShader);
        GLboolean ret = glIsShaderp(shader);
        error = glGetError();
-       AFTER(ret, APITYPE_CONTEXT, "", "d", shader);
+       AFTER('c', ret, APITYPE_CONTEXT, "", "d", shader);
 
        return ret;
 }
@@ -978,7 +978,7 @@ GLboolean glIsTexture(GLuint texture) {
        BEFORE(glIsTexture);
        GLboolean ret = glIsTexturep(texture);
        error = glGetError();
-       AFTER(ret, APITYPE_CONTEXT, "", "d", texture);
+       AFTER('c', ret, APITYPE_CONTEXT, "", "d", texture);
 
        return ret;
 }
@@ -992,7 +992,7 @@ void glLineWidth(GLfloat width) {
        BEFORE(glLineWidth);
        glLineWidthp(width);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "f", width);
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "f", width);
 }
 
 void glLinkProgram(GLuint program) {
@@ -1033,7 +1033,7 @@ void glLinkProgram(GLuint program) {
                                        type[0]);
                }
        }
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, buf, "d",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, buf, "d",
                        program);
 }
 
@@ -1046,7 +1046,7 @@ void glPixelStorei(GLenum pname, GLint param) {
        BEFORE(glPixelStorei);
        glPixelStoreip(pname, param);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xd",
              (uint64_t)(pname), param);
 }
 
@@ -1055,7 +1055,7 @@ void glPolygonOffset(GLfloat factor, GLfloat units) {
        BEFORE(glPolygonOffset);
        glPolygonOffsetp(factor, units);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ff",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ff",
                        factor, units);
 }
 
@@ -1071,7 +1071,7 @@ void glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
        BEFORE(glReadPixels);
        glReadPixelsp(x, y, width, height, format, type, data);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "",
              "ddddxx", x, y, width, height,
              (uint64_t)(format), (uint64_t)(type));
 }
@@ -1081,7 +1081,7 @@ void glReleaseShaderCompiler(void) {
        BEFORE(glReleaseShaderCompiler);
        glReleaseShaderCompilerp();
        error = glGetError();
-       AFTER_NO_PARAM(NO_RETURN_VALUE, APITYPE_CONTEXT, "");
+       AFTER_NO_PARAM('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "");
 }
 
 void glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width,
@@ -1090,7 +1090,7 @@ void glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width,
        BEFORE(glRenderbufferStorage);
        glRenderbufferStoragep(target, internalformat, width, height);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxdd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxdd",
              (uint64_t)(target), (uint64_t)(internalformat),
              width, height);
 }
@@ -1104,7 +1104,7 @@ void glSampleCoverage(GLclampf value, GLboolean invert) {
        BEFORE(glSampleCoverage);
        glSampleCoveragep(value, invert);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "fx",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "fx",
                        value, (uint64_t)(invert));
 }
 
@@ -1113,7 +1113,7 @@ void glScissor(GLint x, GLint y, GLsizei width, GLsizei height) {
        BEFORE(glScissor);
        glScissorp(x, y, width, height);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dddd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dddd",
                        x, y, width, height);
 }
 
@@ -1125,7 +1125,7 @@ void glShaderBinary(GLsizei n, const GLuint *shaders, GLenum binaryformat,
        BEFORE(glShaderBinary);
        glShaderBinaryp(n, shaders, binaryformat, binary, length);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "",
              "dpxpd", n, voidp_to_uint64(shaders),
              (uint64_t)(binaryformat), voidp_to_uint64(binary), length);
 }
@@ -1142,11 +1142,11 @@ void glShaderSource(GLuint shader, GLsizei count, const char** string,
                glGetShaderiv(shader, GL_SHADER_SOURCE_LENGTH, length);
                char buf[length[0]];
                glGetShaderSource(shader, length[0], NULL, buf);
-               AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, buf,
+               AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, buf,
                      "ddpp", shader, count,
                      voidp_to_uint64(string), voidp_to_uint64(length));
        } else {
-               AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "",
+               AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "",
                      "ddpp", shader, count,
                      voidp_to_uint64(string), voidp_to_uint64(length));
        }
@@ -1157,7 +1157,7 @@ void glStencilFunc(GLenum func, GLint ref, GLuint mask) {
        BEFORE(glStencilFunc);
        glStencilFuncp(func, ref, mask);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xdd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xdd",
              (uint64_t)(func), ref, mask);
 }
 
@@ -1166,7 +1166,7 @@ void glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask) {
        BEFORE(glStencilFuncSeparate);
        glStencilFuncSeparatep(face, func, ref, mask);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxdd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxdd",
              (uint64_t)(face), (uint64_t)(func), ref, mask);
 }
 
@@ -1175,7 +1175,7 @@ void glStencilMask(GLuint mask) {
        BEFORE(glStencilMask);
        glStencilMaskp(mask);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "d", mask);
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "d", mask);
 }
 
 void glStencilMaskSeparate(GLenum face, GLuint mask) {
@@ -1183,7 +1183,7 @@ void glStencilMaskSeparate(GLenum face, GLuint mask) {
        BEFORE(glStencilMaskSeparate);
        glStencilMaskSeparatep(face, mask);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xd",
              (uint64_t)(face), mask);
 }
 
@@ -1192,7 +1192,7 @@ void glStencilOp(GLenum sfail, GLenum dpfail, GLenum dppass) {
        BEFORE(glStencilOp);
        glStencilOpp(sfail, dpfail, dppass);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxx",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxx",
              (uint64_t)(sfail), (uint64_t)(dpfail),
              (uint64_t)(dppass));
 }
@@ -1203,7 +1203,7 @@ void glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail,
        BEFORE(glStencilOpSeparate);
        glStencilOpSeparatep(face, sfail, dpfail, dppass);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxxx",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxxx",
              (uint64_t)(face), (uint64_t)(sfail), (uint64_t)(dpfail),
              (uint64_t)(dppass));
 }
@@ -1221,7 +1221,7 @@ void glTexImage2D(GLenum target, GLint level, GLint internalformat,
        glTexImage2Dp(target, level, internalformat, width, height, border, format,
                        type, data);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xdddddxxp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xdddddxxp",
              (uint64_t)(target), level, internalformat, width, height,
              border, (uint64_t)(format), (uint64_t)(type),
              voidp_to_uint64(data));
@@ -1232,7 +1232,7 @@ void glTexParameterf(GLenum target, GLenum pname, GLfloat param) {
        BEFORE(glTexParameterf);
        glTexParameterfp(target, pname, param);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxf",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxf",
              (uint64_t)(target), (uint64_t)(pname), param);
 }
 
@@ -1244,11 +1244,11 @@ void glTexParameterfv(GLenum target, GLenum pname, const GLfloat * params) {
        if(error == GL_NO_ERROR) {
                char param0[8];
                sprintf(param0, "%x", (GLenum)params[0]);
-               AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, param0, "xxp",
+               AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, param0, "xxp",
                      (uint64_t)(target), (uint64_t)(pname),
                      voidp_to_uint64(params));
        } else {
-               AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxp",
+               AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxp",
                      (uint64_t)(target), (uint64_t)(pname),
                      voidp_to_uint64(params));
        }
@@ -1259,7 +1259,7 @@ void glTexParameteri(GLenum target, GLenum pname, GLint param) {
        BEFORE(glTexParameteri);
        glTexParameterip(target, pname, param);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxx",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxx",
              (uint64_t)(target), (uint64_t)(pname),
              (uint64_t)(param));
 }
@@ -1272,11 +1272,11 @@ void glTexParameteriv(GLenum target, GLenum pname, const GLint * params) {
        if(error == GL_NO_ERROR) {
                char param0[8];
                sprintf(param0, "%x", (GLenum)params[0]);
-               AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, param0, "xxp",
+               AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, param0, "xxp",
                      (uint64_t)(target), (uint64_t)(pname),
                      voidp_to_uint64(params));
        } else {
-               AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxp",
+               AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "xxp",
                      (uint64_t)(target),
                      (uint64_t)(pname),
                      voidp_to_uint64(params));
@@ -1292,7 +1292,7 @@ void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
        glTexImage2Dp(target, level, xoffset, yoffset, width, height, format, type,
                        data);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "",
              "xdddddxxp",
              (uint64_t)(target), level, xoffset, yoffset, width, height,
              (uint64_t)(format), (uint64_t)(type), voidp_to_uint64(data));
@@ -1307,7 +1307,7 @@ void glUniform1f(GLint location, GLfloat v0) {
        BEFORE(glUniform1f);
        glUniform1fp(location, v0);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "df",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "df",
                        location, v0);
 }
 
@@ -1316,7 +1316,7 @@ void glUniform2f(GLint location, GLfloat v0, GLfloat v1) {
        BEFORE(glUniform2f);
        glUniform2fp(location, v0, v1);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dff",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dff",
                        location, v0, v1);
 }
 
@@ -1325,7 +1325,7 @@ void glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2) {
        BEFORE(glUniform3f);
        glUniform3fp(location, v0, v1, v2);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dfff",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dfff",
                        location, v0, v1, v2);
 }
 
@@ -1335,7 +1335,7 @@ void glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2,
        BEFORE(glUniform4f);
        glUniform4fp(location, v0, v1, v2, v3);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "",
                        "dffff", location, v0, v1, v2, v3);
 }
 
@@ -1344,7 +1344,7 @@ void glUniform1fv(GLint location, GLsizei count, const GLfloat *value) {
        BEFORE(glUniform1fv);
        glUniform1fvp(location, count, value);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
              location, count, voidp_to_uint64(value));
 }
 
@@ -1353,7 +1353,7 @@ void glUniform2fv(GLint location, GLsizei count, const GLfloat *value) {
        BEFORE(glUniform2fv);
        glUniform2fvp(location, count, value);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
              location, count, voidp_to_uint64(value));
 }
 
@@ -1362,7 +1362,7 @@ void glUniform3fv(GLint location, GLsizei count, const GLfloat *value) {
        BEFORE(glUniform3fv);
        glUniform3fvp(location, count, value);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
              location, count, voidp_to_uint64(value));
 }
 
@@ -1371,7 +1371,7 @@ void glUniform4fv(GLint location, GLsizei count, const GLfloat *value) {
        BEFORE(glUniform4fv);
        glUniform4fvp(location, count, value);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
              location, count, voidp_to_uint64(value));
 }
 
@@ -1380,7 +1380,7 @@ void glUniform1i(GLint location, GLint v0) {
        BEFORE(glUniform1i);
        glUniform1ip(location, v0);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dd",
                        location, v0);
 }
 
@@ -1389,7 +1389,7 @@ void glUniform2i(GLint location, GLint v0, GLint v1) {
        BEFORE(glUniform2i);
        glUniform2ip(location, v0, v1);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddd",
                        location, v0, v1);
 }
 
@@ -1398,7 +1398,7 @@ void glUniform3i(GLint location, GLint v0, GLint v1, GLint v2) {
        BEFORE(glUniform3i);
        glUniform3ip(location, v0, v1, v2);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dddd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dddd",
                        location, v0, v1, v2);
 }
 
@@ -1407,7 +1407,7 @@ void glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3) {
        BEFORE(glUniform4i);
        glUniform4ip(location, v0, v1, v2, v3);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "",
                        "ddddd", location, v0, v1, v2, v3);
 }
 
@@ -1416,7 +1416,7 @@ void glUniform1iv(GLint location, GLsizei count, const GLint *value) {
        BEFORE(glUniform1iv);
        glUniform1ivp(location, count, value);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
              location, count, voidp_to_uint64(value));
 }
 
@@ -1425,7 +1425,7 @@ void glUniform2iv(GLint location, GLsizei count, const GLint *value) {
        BEFORE(glUniform2iv);
        glUniform2ivp(location, count, value);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
              location, count, voidp_to_uint64(value));
 }
 
@@ -1434,7 +1434,7 @@ void glUniform3iv(GLint location, GLsizei count, const GLint *value) {
        BEFORE(glUniform3iv);
        glUniform3ivp(location, count, value);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
              location, count, voidp_to_uint64(value));
 }
 
@@ -1444,7 +1444,7 @@ void glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose,
        BEFORE(glUniformMatrix2fv);
        glUniformMatrix2fvp(location, count, transpose, value);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddxp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddxp",
              location, count, (uint64_t)(transpose), voidp_to_uint64(value));
 }
 
@@ -1454,7 +1454,7 @@ void glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose,
        BEFORE(glUniformMatrix3fv);
        glUniformMatrix3fvp(location, count, transpose, value);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddxp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddxp",
              location, count, (uint64_t)(transpose), voidp_to_uint64(value));
 }
 
@@ -1464,7 +1464,7 @@ void glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose,
        BEFORE(glUniformMatrix4fv);
        glUniformMatrix4fvp(location, count, transpose, value);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddxp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddxp",
              location, count, (uint64_t)(transpose), voidp_to_uint64(value));
 }
 
@@ -1473,7 +1473,7 @@ void glUniform4iv(GLint location, GLsizei count, const GLint *value) {
        BEFORE(glUniform4iv);
        glUniform4ivp(location, count, value);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddp",
              location, count, voidp_to_uint64(value));
 }
 
@@ -1482,7 +1482,7 @@ void glUseProgram(GLuint program) {
        BEFORE(glUseProgram);
        glUseProgramp(program);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "d",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "d",
                        program);
 }
 
@@ -1495,7 +1495,7 @@ void glValidateProgram(GLuint program) {
        BEFORE(glValidateProgram);
        glValidateProgramp(program);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "d",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "d",
                        program);
 }
 
@@ -1509,7 +1509,7 @@ void glVertexAttrib1f(GLuint index, GLfloat v0) {
        sprintf(contextValue, "%f,%f,%f,%f", cv[0], cv[1], cv[2], cv[3]);
 
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, contextValue,
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, contextValue,
                        "df", index, v0);
 }
 
@@ -1523,7 +1523,7 @@ void glVertexAttrib2f(GLuint index, GLfloat v0, GLfloat v1) {
        sprintf(contextValue, "%f,%f,%f,%f", cv[0], cv[1], cv[2], cv[3]);
 
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, contextValue,
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, contextValue,
                        "dff", index, v0, v1);
 }
 
@@ -1537,7 +1537,7 @@ void glVertexAttrib3f(GLuint index, GLfloat v0, GLfloat v1, GLfloat v2) {
        sprintf(contextValue, "%f,%f,%f,%f", cv[0], cv[1], cv[2], cv[3]);
 
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, contextValue,
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, contextValue,
                        "dfff", index, v0, v1, v2);
 }
 
@@ -1552,7 +1552,7 @@ void glVertexAttrib4f(GLuint index, GLfloat v0, GLfloat v1, GLfloat v2,
        sprintf(contextValue, "%f,%f,%f,%f", cv[0], cv[1], cv[2], cv[3]);
 
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, contextValue,
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, contextValue,
                        "dffff", index, v0, v1, v2, v3);
 }
 
@@ -1566,7 +1566,7 @@ void glVertexAttrib1fv(GLuint index, const GLfloat *v) {
        sprintf(contextValue, "%f,%f,%f,%f", cv[0], cv[1], cv[2], cv[3]);
 
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, contextValue,
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, contextValue,
              "dp", index, voidp_to_uint64(v));
 }
 
@@ -1580,7 +1580,7 @@ void glVertexAttrib2fv(GLuint index, const GLfloat *v) {
        sprintf(contextValue, "%f,%f,%f,%f", cv[0], cv[1], cv[2], cv[3]);
 
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, contextValue,
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, contextValue,
              "dp", index, voidp_to_uint64(v));
 }
 
@@ -1594,7 +1594,7 @@ void glVertexAttrib3fv(GLuint index, const GLfloat *v) {
        sprintf(contextValue, "%f,%f,%f,%f", cv[0], cv[1], cv[2], cv[3]);
 
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, contextValue,
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, contextValue,
              "dp", index, voidp_to_uint64(v));
 }
 
@@ -1607,7 +1607,7 @@ void glVertexAttrib4fv(GLuint index, const GLfloat *v) {
        sprintf(contextValue, "%f,%f,%f,%f", cv[0], cv[1], cv[2], cv[3]);
 
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, contextValue,
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, contextValue,
              "dp", index, voidp_to_uint64(v));
 }
 
@@ -1618,7 +1618,7 @@ void glVertexAttribPointer(GLuint index, GLint size, GLenum type,
        BEFORE(glVertexAttribPointer);
        glVertexAttribPointerp(index, size, type, normalized, stride, pointer);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddxxdp",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "ddxxdp",
              index, size, (uint64_t)(type), (uint64_t)(normalized),
              stride, voidp_to_uint64(pointer));
 }
@@ -1628,6 +1628,6 @@ void glViewport(GLint x, GLint y, GLsizei width, GLsizei height) {
        BEFORE(glViewport);
        glViewportp(x, y, width, height);
        error = glGetError();
-       AFTER(NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dddd",
+       AFTER('v', NO_RETURN_VALUE, APITYPE_CONTEXT, "", "dddd",
                        x, y, width, height);
 }
index 3d80339a36d6f69aff7c0da27904ae30241bb3a1..38d83712771309f278bc5adf02d50d6276f19fc9 100644 (file)
@@ -83,7 +83,7 @@ char contextValue[256];
                        sprintf(maxValString, "%d,%d", maxVal[0], maxVal[1]);           \
                        PREPARE_LOCAL_BUF();                                            \
                        PACK_COMMON_BEGIN(MSG_PROBE_GL, vAPI_ID, "", 0);                \
-                       PACK_COMMON_END(1, 0, 0);                                       \
+                       PACK_COMMON_END('p', 1, 0, 0);                                  \
                        PACK_GL_ADD(APITYPE_INIT, 0, maxValString);                     \
                        FLUSH_LOCAL_BUF();                                              \
                }                                                       \
@@ -161,17 +161,17 @@ char contextValue[256];
        }                                                               \
        PRE_PROBEBLOCK()
 
-#define AFTER(RET_VAL, APITYPE, CONTEXT_VAL, INPUTFORMAT, ...) \
+#define AFTER(RET_TYPE, RET_VAL, APITYPE, CONTEXT_VAL, INPUTFORMAT, ...)       \
        POST_PACK_PROBEBLOCK_BEGIN();                                           \
        PREPARE_LOCAL_BUF();                                                    \
-       PACK_COMMON_BEGIN(MSG_PROBE_GL, vAPI_ID, INPUTFORMAT, __VA_ARGS__);\
-       PACK_COMMON_END(RET_VAL, error, blockresult);                                   \
+       PACK_COMMON_BEGIN(MSG_PROBE_GL, vAPI_ID, INPUTFORMAT, __VA_ARGS__);     \
+       PACK_COMMON_END(RET_TYPE, RET_VAL, error, blockresult);                 \
        PACK_GL_ADD(APITYPE, get_current_nsec() - start_nsec, CONTEXT_VAL);     \
        FLUSH_LOCAL_BUF();                                                      \
        POST_PACK_PROBEBLOCK_END()
 
-#define AFTER_NO_PARAM(RETVAL, APITYPE, CONTEXTVALUE) \
-               AFTER(RETVAL, APITYPE, CONTEXTVALUE, "", 0)
+#define AFTER_NO_PARAM(RET_TYPE, RETVAL, APITYPE, CONTEXTVALUE) \
+               AFTER(RET_TYPE, RETVAL, APITYPE, CONTEXTVALUE, "", 0)
 
 #endif /* DA_GLES20_H_ */
 
index ee53cddbcbf99cf8df308746fb817acaed9ed0f3..1e4fa99b52953458031159212c2b67cdd3912667 100755 (executable)
@@ -96,7 +96,7 @@ void *malloc(size_t size)
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY, API_ID_malloc,
                          "x", (int64_t) size);
-       PACK_COMMON_END(pret, newerrno, blockresult);
+       PACK_COMMON_END('p', pret, newerrno, blockresult);
        PACK_MEMORY(size, MEMORY_API_ALLOC, pret);
        FLUSH_LOCAL_BUF();
 
@@ -124,7 +124,7 @@ void free(void *ptr)
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY, API_ID_free, 
                          "p", (int64_t)(int) ptr);
-       PACK_COMMON_END(0, newerrno, blockresult);
+       PACK_COMMON_END('v', 0, newerrno, blockresult);
        PACK_MEMORY(0, MEMORY_API_FREE, ptr);
        FLUSH_LOCAL_BUF();
 
@@ -154,7 +154,7 @@ void *realloc(void *memblock, size_t size)
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY, API_ID_realloc,
                          "px", voidp_to_uint64(memblock), (uint64_t) size);
-       PACK_COMMON_END(pret, newerrno, blockresult);
+       PACK_COMMON_END('p', pret, newerrno, blockresult);
        PACK_MEMORY(size, MEMORY_API_ALLOC, pret);
        FLUSH_LOCAL_BUF();
 
@@ -201,7 +201,7 @@ void *calloc(size_t nelem, size_t elsize)
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY, API_ID_calloc,
                          "xx", (uint64_t)nelem, (uint64_t)elsize);
-       PACK_COMMON_END(pret, newerrno, blockresult);
+       PACK_COMMON_END('p', pret, newerrno, blockresult);
        PACK_MEMORY(nelem * elsize, MEMORY_API_ALLOC, pret);
        FLUSH_LOCAL_BUF();
 
index 409c40ba2e70b4b464d83dd40bff60de538cb175..7e757801e79ca990698372a4115dbfef53fea117 100644 (file)
@@ -64,7 +64,7 @@ void *memset(void *memblock, int c, size_t n)
                          API_ID_memset,
                          "pdx", voidp_to_uint64(memblock), c,
                          (uint64_t)(n));
-       PACK_COMMON_END(pret, newerrno, blockresult);
+       PACK_COMMON_END('p', pret, newerrno, blockresult);
        PACK_MEMORY(n, MEMORY_API_MANAGE, pret);
        FLUSH_LOCAL_BUF();
 
@@ -91,7 +91,7 @@ int memcmp(const void * ptr1, const void * ptr2, size_t num)
                          API_ID_memcmp,
                          "ppx", voidp_to_uint64(ptr1), voidp_to_uint64(ptr2),
                          (uint64_t)(num));
-       PACK_COMMON_END(ret, newerrno, blockresult);
+       PACK_COMMON_END('d', ret, newerrno, blockresult);
        PACK_MEMORY(num, MEMORY_API_MANAGE, ret);
        FLUSH_LOCAL_BUF();
 
@@ -120,7 +120,7 @@ void *memcpy(void * destination, const void * source, size_t num )
                          "ppx", voidp_to_uint64(destination),
                          voidp_to_uint64(source),
                          (uint64_t)(num));
-       PACK_COMMON_END(pret, newerrno, blockresult);
+       PACK_COMMON_END('p', pret, newerrno, blockresult);
        PACK_MEMORY(num, MEMORY_API_MANAGE, pret);
        FLUSH_LOCAL_BUF();
 
index 0785f9ef8146b223a19d95b28fe1628aadaf94bb..7a3e2206cb84eb3e232ed9eb2f424704c9bc14d2 100644 (file)
@@ -69,7 +69,7 @@ void *operator new(std::size_t size) throw (std::bad_alloc)
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY,
                          API_ID_void__operator_new_std__size_t_size__throw__std__bad_alloc_,
                          "x", (uint64_t)(size));
-       PACK_COMMON_END(pret, newerrno, blockresult);
+       PACK_COMMON_END('p', pret, newerrno, blockresult);
        PACK_MEMORY(size, MEMORY_API_ALLOC, pret);
        FLUSH_LOCAL_BUF();
 
@@ -102,7 +102,7 @@ void *operator new[](std::size_t size) throw (std::bad_alloc)
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY,
                          API_ID_void__operator_new___std__size_t_size__throw__std__bad_alloc_,
                          "x", (uint64_t)(size));
-       PACK_COMMON_END(pret, newerrno, blockresult);
+       PACK_COMMON_END('p', pret, newerrno, blockresult);
        PACK_MEMORY(size, MEMORY_API_ALLOC, pret);
        FLUSH_LOCAL_BUF();
 
@@ -143,7 +143,7 @@ void operator delete(void *ptr) throw()
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY,
                          API_ID_void_operator_delete_void__ptr__throw__,
                          "p", voidp_to_uint64(ptr));
-       PACK_COMMON_END(0, newerrno, blockresult);
+       PACK_COMMON_END('v', 0, newerrno, blockresult);
        PACK_MEMORY(0, MEMORY_API_FREE, ptr);
        FLUSH_LOCAL_BUF();
 
@@ -182,7 +182,7 @@ void operator delete[](void *ptr) throw()
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY,
                          API_ID_void_operator_delete___void__ptr__throw__,
                          "p", voidp_to_uint64(ptr));
-       PACK_COMMON_END(0, newerrno, blockresult);
+       PACK_COMMON_END('v', 0, newerrno, blockresult);
        PACK_MEMORY(0, MEMORY_API_FREE, ptr);
        FLUSH_LOCAL_BUF();
 
@@ -213,7 +213,7 @@ void *operator new(std::size_t size, const std::nothrow_t& nothrow) throw()
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY,
                          API_ID_void__operator_new_std__size_t_size__const_std__nothrow_t__nothrow__throw__,
                          "xp", (uint64_t)(size), voidp_to_uint64(&nothrow));
-       PACK_COMMON_END(pret, newerrno, blockresult);
+       PACK_COMMON_END('p', pret, newerrno, blockresult);
        PACK_MEMORY(size, MEMORY_API_ALLOC, pret);
        FLUSH_LOCAL_BUF();
 
@@ -246,7 +246,7 @@ void *operator new[](std::size_t size, const std::nothrow_t& nothrow) throw()
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY,
                          API_ID_void__operator_new___std__size_t_size__const_std__nothrow_t__nothrow__throw__,
                          "xp", (uint64_t)(size), voidp_to_uint64(&nothrow));
-       PACK_COMMON_END(pret, newerrno, blockresult);
+       PACK_COMMON_END('p', pret, newerrno, blockresult);
        PACK_MEMORY(size, MEMORY_API_ALLOC, pret);
        FLUSH_LOCAL_BUF();
 
@@ -287,7 +287,7 @@ void operator delete(void *ptr, const std::nothrow_t& nothrow) throw()
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY,
                          API_ID_void_operator_delete_void__ptr__const_std__nothrow_t__nothrow__throw__,
                          "pp", voidp_to_uint64(ptr), voidp_to_uint64(&nothrow));
-       PACK_COMMON_END(0, newerrno, blockresult);
+       PACK_COMMON_END('v', 0, newerrno, blockresult);
        PACK_MEMORY(0, MEMORY_API_FREE, ptr);
        FLUSH_LOCAL_BUF();
 
@@ -326,7 +326,7 @@ void operator delete[](void *ptr, const std::nothrow_t& nothrow) throw()
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY,
                          API_ID_void_operator_delete___void__ptr__const_std__nothrow_t__nothrow__throw__,
                          "pp", voidp_to_uint64(ptr), voidp_to_uint64(&nothrow));
-       PACK_COMMON_END(0, newerrno, blockresult);
+       PACK_COMMON_END('v', 0, newerrno, blockresult);
        PACK_MEMORY(0, MEMORY_API_FREE, ptr);
        FLUSH_LOCAL_BUF();
 
index 8985d8d5cad55febec42525e4fa8ccdc26f4ab08..c6be486578d5166719e110d464597b3799b251c3 100644 (file)
@@ -85,7 +85,7 @@
                        if(postBlockBegin(blockresult)) {                                                                               \
                                PREPARE_LOCAL_BUF(); \
                                PACK_COMMON_BEGIN(MSG_PROBE_NETWORK, vAPI_ID, INPUTFORMAT, __VA_ARGS__);\
-                               PACK_COMMON_END(RETVALUE, errno, blockresult)
+                               PACK_COMMON_END('p', RETVALUE, errno, blockresult)
 
 
 //lib END Function
                setProbePoint(&probeInfo);                                                                              \
                PREPARE_LOCAL_BUF(); \
                PACK_COMMON_BEGIN(MSG_PROBE_NETWORK, vAPI_ID, INPUTFORMAT, __VA_ARGS__);\
-               PACK_COMMON_END(RETVALUE, errno, blockresult)
+               PACK_COMMON_END('p', RETVALUE, errno, blockresult)
 
 #define BEFORE_ORIGINAL_TIZEN_NET(FUNCNAME, FUNCTIONPOINTER)   \
                DECLARE_VARIABLE_STANDARD_OSP_NET(FUNCNAME);                                                            \
        if(postBlockBegin(blockresult)) {                                                                               \
                PREPARE_LOCAL_BUF(); \
                PACK_COMMON_BEGIN(MSG_PROBE_NETWORK, vAPI_ID, INPUTFORMAT, __VA_ARGS__);\
-               PACK_COMMON_END(RETVALUE, errno, blockresult)
+               PACK_COMMON_END('p', RETVALUE, errno, blockresult)
 
 #define APPEND_NETWORK_LOG_BASIC(LCTYPE, APINAME)                                                              \
        log.length = sprintf(log.data, "%d`,%d`,%s`,%lu`,%d`,%d",       \
                        if(postBlockBegin(blockresult)) {                                                                               \
                                PREPARE_LOCAL_BUF(); \
                                PACK_COMMON_BEGIN(MSG_PROBE_NETWORK, vAPI_ID, INPUTFORMAT, __VA_ARGS__);\
-                               PACK_COMMON_END(RETVALUE, errno, blockresult)
+                               PACK_COMMON_END('p', RETVALUE, errno, blockresult)
 
 #define POST_PROBEBLOCK_TIZEN_FUNC_END_BEGIN(APINAME, LCTYPE, RETTYPE, RETVALUE, INPUTFORMAT, ...)     \
        if(postBlockBegin(blockresult)) {                                                                               \
                setProbePoint(&probeInfo);                                                                              \
                PREPARE_LOCAL_BUF(); \
                PACK_COMMON_BEGIN(MSG_PROBE_NETWORK, vAPI_ID, INPUTFORMAT, __VA_ARGS__);\
-               PACK_COMMON_END(RETVALUE, errno, blockresult)
+               PACK_COMMON_END('p', RETVALUE, errno, blockresult)
 
 #define APPEND_LOG_TIZEN_RESULT(RETTYPE, RETVALUE)                                                     \
        __appendTypeLog(&log, 4, NULL, RETTYPE, RETVALUE, VT_INT, 0,            \
index 3380fe406743305874f661c34c3045f82190cd3e..c7a283a4fba8678b02db13cd75056c58efc67ff4 100644 (file)
@@ -48,13 +48,13 @@ int real_pthread_setcancelstate(int state, int *oldstate);
        GET_REAL_FUNC(FUNCNAME, LIBNAME);                               \
        PRE_PROBEBLOCK()
 
-#define AFTER_PACK_ORIGINAL_SYNC(API_ID, RVAL, SYNCVAL, SYNCTYPE, APITYPE, INPUTFORMAT, ...) \
-       POST_PACK_PROBEBLOCK_BEGIN();                                                                                                                           \
-       PREPARE_LOCAL_BUF();                                                                                                                                            \
-       PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID, INPUTFORMAT, __VA_ARGS__);                                            \
-       PACK_COMMON_END(RVAL, errno, blockresult);                                                                                                      \
-       PACK_SYNC(SYNCVAL, SYNCTYPE, APITYPE);                                                                                                          \
-       FLUSH_LOCAL_BUF();                                                                                                                                                      \
+#define AFTER_PACK_ORIGINAL_SYNC(API_ID, RTYPE, RVAL, SYNCVAL, SYNCTYPE, APITYPE, INPUTFORMAT, ...)    \
+       POST_PACK_PROBEBLOCK_BEGIN();                                                                   \
+       PREPARE_LOCAL_BUF();                                                                            \
+       PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID, INPUTFORMAT, __VA_ARGS__);                            \
+       PACK_COMMON_END(RTYPE, RVAL, errno, blockresult);                                               \
+       PACK_SYNC(SYNCVAL, SYNCTYPE, APITYPE);                                                          \
+       FLUSH_LOCAL_BUF();                                                                              \
        POST_PACK_PROBEBLOCK_END()
 
 #ifdef __cplusplus
index db4831f4fdbaf8a4d664fd7dde5a6843aae9fb99..2da0b71708da5b20d200025d95da30855bb25eac 100644 (file)
        GET_REAL_FUNC(FUNCNAME, LIBNAME);                               \
        PRE_PROBEBLOCK()
 
-#define AFTER_PACK_ORIGINAL_THREAD(API_ID, RVAL, THREADVAL, APITYPE, INPUTFORMAT, ...) \
-       POST_PACK_PROBEBLOCK_BEGIN();                           \
-       PREPARE_LOCAL_BUF();                                                                                                                            \
+#define AFTER_PACK_ORIGINAL_THREAD(API_ID, RTYPE, RVAL, THREADVAL, APITYPE, INPUTFORMAT, ...)  \
+       POST_PACK_PROBEBLOCK_BEGIN();                                                           \
+       PREPARE_LOCAL_BUF();                                                                    \
        PACK_COMMON_BEGIN(MSG_PROBE_THREAD, API_ID, INPUTFORMAT, __VA_ARGS__);                  \
-       PACK_COMMON_END(RVAL, errno, blockresult);                                                                                      \
-       PACK_THREAD(THREADVAL, THREAD_PTHREAD, APITYPE);                                                                        \
-       FLUSH_LOCAL_BUF();                                                                                                                                      \
+       PACK_COMMON_END(RTYPE, RVAL, errno, blockresult);                                       \
+       PACK_THREAD(THREADVAL, THREAD_PTHREAD, APITYPE);                                        \
+       FLUSH_LOCAL_BUF();                                                                      \
        POST_PACK_PROBEBLOCK_END()
 
 #endif // __DA_THREAD_H__
index d2cc1cf2338db8e0b5b870c72c8629a884f54080..7db0859d8f6e93e6735ff1d76a3374b9bf6f0620 100644 (file)
@@ -52,7 +52,7 @@ int pthread_mutex_init(pthread_mutex_t *mutex,
        ret = pthread_mutex_initp(mutex, attr);
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutex_init,
-                                ret, mutex, SYNC_PTHREAD_MUTEX,
+                                'd', ret, mutex, SYNC_PTHREAD_MUTEX,
                                 SYNC_API_OTHER, "pp",
                                 voidp_to_uint64(mutex), voidp_to_uint64(attr));
 
@@ -67,7 +67,7 @@ int pthread_mutex_destroy(pthread_mutex_t *mutex) {
        ret = pthread_mutex_destroyp(mutex);
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutex_destroy,
-                                ret, mutex, SYNC_PTHREAD_MUTEX,
+                                'd', ret, mutex, SYNC_PTHREAD_MUTEX,
                                 SYNC_API_OTHER, "p", voidp_to_uint64(mutex));
 
        return ret;
@@ -93,7 +93,7 @@ int pthread_mutex_lock(pthread_mutex_t *mutex) {
        PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                          API_ID_pthread_mutex_lock,
                          "p", voidp_to_uint64(mutex));
-       PACK_COMMON_END(0, 0, blockresult);
+       PACK_COMMON_END('d', 0, 0, blockresult);
        PACK_SYNC(mutex, SYNC_PTHREAD_MUTEX, SYNC_API_ACQUIRE_WAIT_START);
        FLUSH_LOCAL_BUF();
 
@@ -110,7 +110,7 @@ int pthread_mutex_lock(pthread_mutex_t *mutex) {
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_pthread_mutex_lock,
                                  "p", voidp_to_uint64(mutex));
-               PACK_COMMON_END(ret, errno, blockresult);
+               PACK_COMMON_END('p', ret, errno, blockresult);
                PACK_SYNC(mutex, SYNC_PTHREAD_MUTEX, SYNC_API_ACQUIRE_WAIT_END);
                FLUSH_LOCAL_BUF();
 
@@ -135,7 +135,7 @@ int pthread_mutex_timedlock(pthread_mutex_t *mutex,
                          API_ID_pthread_mutex_timedlock,
                          "pp", voidp_to_uint64(mutex),
                          voidp_to_uint64(abs_timeout));
-       PACK_COMMON_END(0, 0, blockresult);
+       PACK_COMMON_END('d', 0, 0, blockresult);
        PACK_SYNC(mutex, SYNC_PTHREAD_MUTEX, SYNC_API_ACQUIRE_WAIT_START);
        FLUSH_LOCAL_BUF();
 
@@ -153,7 +153,7 @@ int pthread_mutex_timedlock(pthread_mutex_t *mutex,
                                  API_ID_pthread_mutex_timedlock,
                                  "pp", voidp_to_uint64(mutex),
                                  voidp_to_uint64(abs_timeout));
-               PACK_COMMON_END(ret, errno, blockresult);
+               PACK_COMMON_END('d', ret, errno, blockresult);
                PACK_SYNC(mutex, SYNC_PTHREAD_MUTEX, SYNC_API_ACQUIRE_WAIT_END);
                FLUSH_LOCAL_BUF();
 
@@ -171,7 +171,7 @@ int pthread_mutex_trylock(pthread_mutex_t *mutex) {
        ret = pthread_mutex_trylockp(mutex);
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutex_trylock,
-                                ret, mutex, SYNC_PTHREAD_MUTEX,
+                                'd', ret, mutex, SYNC_PTHREAD_MUTEX,
                                 SYNC_API_TRY_ACQUIRE, "p",
                                 voidp_to_uint64(mutex));
 
@@ -194,7 +194,7 @@ int pthread_mutex_unlock(pthread_mutex_t *mutex) {
        ret = pthread_mutex_unlockp(mutex);
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutex_unlock,
-                                ret, mutex, SYNC_PTHREAD_MUTEX,
+                                'd', ret, mutex, SYNC_PTHREAD_MUTEX,
                                 SYNC_API_RELEASE, "p",
                                 voidp_to_uint64(mutex));
 
@@ -209,7 +209,7 @@ int pthread_mutexattr_init(pthread_mutexattr_t *attr) {
        ret = pthread_mutexattr_initp(attr);
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutexattr_init,
-                                ret, 0, SYNC_PTHREAD_MUTEX,
+                                'd', ret, 0, SYNC_PTHREAD_MUTEX,
                                 SYNC_API_OTHER, "p",
                                 voidp_to_uint64(attr));
 
@@ -224,7 +224,7 @@ int pthread_mutexattr_destroy(pthread_mutexattr_t *attr) {
        ret = pthread_mutexattr_destroyp(attr);
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutexattr_destroy,
-                                ret, 0, SYNC_PTHREAD_MUTEX,
+                                'd', ret, 0, SYNC_PTHREAD_MUTEX,
                                 SYNC_API_OTHER, "p",
                                 voidp_to_uint64(attr));
 
@@ -241,7 +241,7 @@ int pthread_mutexattr_getprioceiling(const pthread_mutexattr_t *attr,
        ret = pthread_mutexattr_getprioceilingp(attr, prioceiling);
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutexattr_getprioceiling,
-                                ret, 0, SYNC_PTHREAD_MUTEX,
+                                'd', ret, 0, SYNC_PTHREAD_MUTEX,
                                 SYNC_API_OTHER, "pp",
                                 voidp_to_uint64(attr),
                                 voidp_to_uint64(prioceiling));
@@ -259,7 +259,7 @@ int pthread_mutexattr_setprioceiling(pthread_mutexattr_t *attr,
        ret = pthread_mutexattr_setprioceilingp(attr, prioceiling);
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutexattr_setprioceiling,
-                                ret, 0, SYNC_PTHREAD_MUTEX,
+                                'd', ret, 0, SYNC_PTHREAD_MUTEX,
                                 SYNC_API_OTHER, "pd", voidp_to_uint64(attr),
                                 prioceiling);
 
@@ -276,7 +276,7 @@ int pthread_mutexattr_getprotocol(const pthread_mutexattr_t *attr,
        ret = pthread_mutexattr_getprotocolp(attr, protocol);
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutexattr_getprotocol,
-                                ret, 0, SYNC_PTHREAD_MUTEX,
+                                'd', ret, 0, SYNC_PTHREAD_MUTEX,
                                 SYNC_API_OTHER, "pp",
                                 voidp_to_uint64(attr),
                                 voidp_to_uint64(protocol));
@@ -294,7 +294,7 @@ int pthread_mutexattr_setprotocol(pthread_mutexattr_t *attr,
        ret = pthread_mutexattr_setprotocolp(attr, protocol);
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutexattr_setprotocol,
-                                ret, 0, SYNC_PTHREAD_MUTEX,
+                                'd', ret, 0, SYNC_PTHREAD_MUTEX,
                                 SYNC_API_OTHER, "pd", voidp_to_uint64(attr),
                                 protocol);
 
@@ -311,7 +311,7 @@ int pthread_mutexattr_getpshared(const pthread_mutexattr_t *attr,
        ret = pthread_mutexattr_getpsharedp(attr, pshared);
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutexattr_getpshared,
-                                ret, 0, SYNC_PTHREAD_MUTEX,
+                                'd', ret, 0, SYNC_PTHREAD_MUTEX,
                                 SYNC_API_OTHER, "pp",
                                 voidp_to_uint64(attr),
                                 voidp_to_uint64(pshared));
@@ -329,7 +329,7 @@ int pthread_mutexattr_setpshared(pthread_mutexattr_t *attr,
        ret = pthread_mutexattr_setpsharedp(attr, pshared);
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutexattr_setpshared,
-                                ret, 0, SYNC_PTHREAD_MUTEX,
+                                'd', ret, 0, SYNC_PTHREAD_MUTEX,
                                 SYNC_API_OTHER, "pd", voidp_to_uint64(attr),
                                 pshared);
 
@@ -345,7 +345,7 @@ int pthread_mutexattr_gettype(const pthread_mutexattr_t *attr, int *type) {
        ret = pthread_mutexattr_gettypep(attr, type);
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutexattr_gettype,
-                                ret, 0, SYNC_PTHREAD_MUTEX,
+                                'd', ret, 0, SYNC_PTHREAD_MUTEX,
                                 SYNC_API_OTHER, "pp",
                                 voidp_to_uint64(attr),
                                 voidp_to_uint64(type));
@@ -362,7 +362,7 @@ int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type) {
        ret = pthread_mutexattr_settypep(attr, type);
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_mutexattr_settype,
-                                ret, 0, SYNC_PTHREAD_MUTEX,
+                                'd', ret, 0, SYNC_PTHREAD_MUTEX,
                                 SYNC_API_OTHER, "pd",
                                 voidp_to_uint64(attr),
                                 type);
@@ -386,7 +386,7 @@ int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr) {
        ret = pthread_cond_initp(cond, attr);
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_cond_init,
-                                ret, cond, SYNC_PTHREAD_COND_VARIABLE,
+                                'd', ret, cond, SYNC_PTHREAD_COND_VARIABLE,
                                 SYNC_API_OTHER, "pp",
                                 voidp_to_uint64(cond),
                                 voidp_to_uint64(attr));
@@ -402,7 +402,7 @@ int pthread_cond_destroy(pthread_cond_t *cond) {
        ret = pthread_cond_destroyp(cond);
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_cond_destroy,
-                                ret, cond, SYNC_PTHREAD_COND_VARIABLE,
+                                'd', ret, cond, SYNC_PTHREAD_COND_VARIABLE,
                                 SYNC_API_OTHER, "p",
                                 voidp_to_uint64(cond));
 
@@ -425,7 +425,7 @@ int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) {
                          "pp",
                          voidp_to_uint64(cond),
                          voidp_to_uint64(mutex));
-       PACK_COMMON_END(0, 0, blockresult);
+       PACK_COMMON_END('d', 0, 0, blockresult);
        PACK_SYNC(cond, SYNC_PTHREAD_COND_VARIABLE, SYNC_API_COND_WAIT_START);
        FLUSH_LOCAL_BUF();
 
@@ -444,7 +444,7 @@ int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) {
                                  "pp",
                                  voidp_to_uint64(cond),
                                  voidp_to_uint64(mutex));
-               PACK_COMMON_END(ret, errno, blockresult);
+               PACK_COMMON_END('d', ret, errno, blockresult);
                PACK_SYNC(cond, SYNC_PTHREAD_COND_VARIABLE, SYNC_API_COND_WAIT_END);
                FLUSH_LOCAL_BUF();
 
@@ -472,7 +472,7 @@ int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
                          voidp_to_uint64(cond),
                          voidp_to_uint64(mutex),
                          voidp_to_uint64(abstime));
-       PACK_COMMON_END(0, 0, blockresult);
+       PACK_COMMON_END('d', 0, 0, blockresult);
        PACK_SYNC(cond, SYNC_PTHREAD_COND_VARIABLE, SYNC_API_COND_WAIT_START);
        FLUSH_LOCAL_BUF();
 
@@ -492,7 +492,7 @@ int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
                                  voidp_to_uint64(cond),
                                  voidp_to_uint64(mutex),
                                  voidp_to_uint64(abstime));
-               PACK_COMMON_END(ret, errno, blockresult);
+               PACK_COMMON_END('d', ret, errno, blockresult);
                PACK_SYNC(cond, SYNC_PTHREAD_COND_VARIABLE, SYNC_API_COND_WAIT_END);
                FLUSH_LOCAL_BUF();
 
@@ -510,7 +510,7 @@ int pthread_cond_signal(pthread_cond_t *cond) {
        ret = pthread_cond_signalp(cond);
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_cond_signal,
-                                ret, cond, SYNC_PTHREAD_COND_VARIABLE,
+                                'd', ret, cond, SYNC_PTHREAD_COND_VARIABLE,
                                 SYNC_API_NOTIFY, "p", voidp_to_uint64(cond));
 
        return ret;
@@ -524,7 +524,7 @@ int pthread_cond_broadcast(pthread_cond_t *cond) {
        ret = pthread_cond_broadcastp(cond);
 
        AFTER_PACK_ORIGINAL_SYNC(API_ID_pthread_cond_broadcast,
-                                ret, cond, SYNC_PTHREAD_COND_VARIABLE,
+                                'd', ret, cond, SYNC_PTHREAD_COND_VARIABLE,
                                 SYNC_API_NOTIFY_ALL, "p", voidp_to_uint64(cond));
 
        return ret;
index 47f52201400ecb847346d0ba4bf0f238ecaf704a..2ca05a9bde3c9fb650297983c3f056f6388a547c 100644 (file)
@@ -65,7 +65,7 @@ void _da_cleanup_handler(void *data)
        PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                          API_ID__da_cleanup_handler,
                          "p", voidp_to_uint64(data));
-       PACK_COMMON_END(0, 0, 1);
+       PACK_COMMON_END('v', 0, 0, 1);
        PACK_THREAD(pSelf, THREAD_PTHREAD, THREAD_API_INTERNAL_STOP);
        FLUSH_LOCAL_BUF();
 
@@ -96,7 +96,7 @@ void *_da_ThreadProc(void *params)
        PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                          API_ID__da_ThreadProc,
                          "p", voidp_to_uint64(params));
-       PACK_COMMON_END(0, 0, 1);
+       PACK_COMMON_END('p', 0, 0, 1);
        PACK_THREAD(pSelf, THREAD_PTHREAD, THREAD_API_INTERNAL_START);
        FLUSH_LOCAL_BUF();
 
@@ -121,7 +121,7 @@ void *_da_ThreadProc(void *params)
        PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                          API_ID__da_ThreadProc,
                          "p", voidp_to_uint64(params));
-       PACK_COMMON_END(ret, 0, 1);
+       PACK_COMMON_END('p', ret, 0, 1);
        PACK_THREAD(pSelf, THREAD_PTHREAD, THREAD_API_INTERNAL_STOP);
        FLUSH_LOCAL_BUF();
 
@@ -156,7 +156,7 @@ int pthread_create(pthread_t *thread, const pthread_attr_t *attr,
        }
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_create,
-                                  ret, *thread, THREAD_API_START,
+                                  'd', ret, *thread, THREAD_API_START,
                                   "pppp",
                                   voidp_to_uint64(thread),
                                   voidp_to_uint64(attr),
@@ -179,7 +179,7 @@ int pthread_join(pthread_t thread, void **retval)
        PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                          API_ID_pthread_join,
                          "xp", (uint64_t)(thread), voidp_to_uint64(retval));
-       PACK_COMMON_END(0, 0, blockresult);
+       PACK_COMMON_END('d', 0, 0, blockresult);
        PACK_THREAD(thread, THREAD_PTHREAD, THREAD_API_WAIT_START);
        FLUSH_LOCAL_BUF();
 
@@ -198,7 +198,7 @@ int pthread_join(pthread_t thread, void **retval)
                                  "xp",
                                  (uint64_t)(thread),
                                  voidp_to_uint64(retval));
-               PACK_COMMON_END(ret, errno, blockresult);
+               PACK_COMMON_END('d', ret, errno, blockresult);
                PACK_THREAD(thread, THREAD_PTHREAD, THREAD_API_WAIT_END);
                FLUSH_LOCAL_BUF();
 
@@ -224,7 +224,7 @@ void pthread_exit(void *retval)
        PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                          API_ID_pthread_exit,
                          "p", voidp_to_uint64(retval));
-       PACK_COMMON_END(0, 0, blockresult);
+       PACK_COMMON_END('v', 0, 0, blockresult);
        PACK_THREAD(pSelf, THREAD_PTHREAD, THREAD_API_EXIT);
        FLUSH_LOCAL_BUF();
 
@@ -242,7 +242,7 @@ int pthread_cancel(pthread_t thread)
        ret = pthread_cancelp(thread);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_cancel,
-                                  ret, thread, THREAD_API_STOP, "x",
+                                  'd', ret, thread, THREAD_API_STOP, "x",
                                   (uint64_t)(thread));
 
        return ret;
@@ -257,7 +257,7 @@ int pthread_detach(pthread_t thread)
        ret = pthread_detachp(thread);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_detach,
-                                  ret, thread, THREAD_API_OTHER, "x",
+                                  'd', ret, thread, THREAD_API_OTHER, "x",
                                   (uint64_t)(thread));
 
        return ret;
@@ -275,7 +275,7 @@ pthread_t pthread_self(void)
        newerrno = errno;
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_self,
-                                  ret_pthr, ret_pthr, THREAD_API_OTHER, "", 0);
+                                  'p', ret_pthr, ret_pthr, THREAD_API_OTHER, "", 0);
 
        return ret_pthr;
 }
@@ -289,7 +289,7 @@ int pthread_equal(pthread_t t1, pthread_t t2)
        ret = pthread_equalp(t1, t2);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_equal,
-                                  ret, t1, THREAD_API_OTHER, "xx",
+                                  'd', ret, t1, THREAD_API_OTHER, "xx",
                                   (uint64_t)(t1), (uint64_t)(t2));
 
        return ret;
@@ -315,7 +315,7 @@ int pthread_setcancelstate(int state, int *oldstate)
        ret = pthread_setcancelstatep(state, oldstate);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_setcancelstate,
-                                  ret, pSelf, THREAD_API_OTHER,
+                                  'd', ret, pSelf, THREAD_API_OTHER,
                                   "dp", state, voidp_to_uint64(oldstate));
 
        return ret;
@@ -332,7 +332,7 @@ int pthread_setcanceltype(int type, int *oldtype)
        ret = pthread_setcanceltypep(type, oldtype);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_setcanceltype,
-                                  ret, pSelf, THREAD_API_OTHER,
+                                  'd', ret, pSelf, THREAD_API_OTHER,
                                   "dp", type, voidp_to_uint64(oldtype));
 
        return ret;
@@ -348,7 +348,7 @@ int pthread_attr_init(pthread_attr_t *attr)
        ret = pthread_attr_initp(attr);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_init,
-                                  ret, thread, THREAD_API_OTHER, "p",
+                                  'd', ret, thread, THREAD_API_OTHER, "p",
                                   voidp_to_uint64(attr));
 
        return ret;
@@ -364,7 +364,7 @@ int pthread_attr_destroy(pthread_attr_t *attr)
        ret = pthread_attr_destroyp(attr);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_destroy,
-                                  ret, thread, THREAD_API_OTHER, "p",
+                                  'd', ret, thread, THREAD_API_OTHER, "p",
                                   voidp_to_uint64(attr));
 
        return ret;
@@ -381,7 +381,7 @@ int pthread_attr_getdetachstate(const pthread_attr_t *attr, int *detachstate)
        ret = pthread_attr_getdetachstatep(attr, detachstate);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_getdetachstate,
-                                  ret, thread, THREAD_API_OTHER,
+                                  'd', ret, thread, THREAD_API_OTHER,
                                   "pp", voidp_to_uint64(attr),
                                   voidp_to_uint64(detachstate));
 
@@ -399,7 +399,7 @@ int pthread_attr_setdetachstate(pthread_attr_t *attr, int detachstate)
        ret = pthread_attr_setdetachstatep(attr, detachstate);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_setdetachstate,
-                                  ret, thread, THREAD_API_OTHER,
+                                  'd', ret, thread, THREAD_API_OTHER,
                                   "pd", voidp_to_uint64(attr),
                                   detachstate);
 
@@ -417,7 +417,7 @@ int pthread_attr_getstacksize(const pthread_attr_t *attr, size_t *stacksize)
        ret = pthread_attr_getstacksizep(attr, stacksize);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_getstacksize,
-                                  ret, thread, THREAD_API_OTHER,
+                                  'd', ret, thread, THREAD_API_OTHER,
                                   "pp", voidp_to_uint64(attr),
                                   voidp_to_uint64(stacksize));
 
@@ -435,7 +435,7 @@ int pthread_attr_setstacksize(pthread_attr_t *attr, size_t stacksize)
        ret = pthread_attr_setstacksizep(attr, stacksize);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_setstacksize,
-                                  ret, thread, THREAD_API_OTHER,
+                                  'd', ret, thread, THREAD_API_OTHER,
                                   "px", voidp_to_uint64(attr),
                                   (uint64_t)(stacksize));
 
@@ -453,7 +453,7 @@ int pthread_attr_getstackaddr(const pthread_attr_t *attr, void **stackaddr)
        ret = pthread_attr_getstackaddrp(attr, stackaddr);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_getstackaddr,
-                                  ret, thread, THREAD_API_OTHER,
+                                  'd', ret, thread, THREAD_API_OTHER,
                                   "pp", voidp_to_uint64(attr),
                                   voidp_to_uint64(stackaddr));
 
@@ -471,7 +471,7 @@ int pthread_attr_setstackaddr(pthread_attr_t *attr, void *stackaddr)
        ret = pthread_attr_setstackaddrp(attr, stackaddr);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_setstackaddr,
-                                  ret, thread, THREAD_API_OTHER,
+                                  'd', ret, thread, THREAD_API_OTHER,
                                   "pp",
                                   voidp_to_uint64(attr),
                                   voidp_to_uint64(stackaddr));
@@ -490,7 +490,7 @@ int pthread_attr_getinheritsched(const pthread_attr_t *attr, int *inheritsched)
        ret = pthread_attr_getinheritschedp(attr, inheritsched);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_getinheritsched,
-                                  ret, thread, THREAD_API_OTHER,
+                                  'd', ret, thread, THREAD_API_OTHER,
                                   "pp", voidp_to_uint64(attr),
                                   voidp_to_uint64(inheritsched));
 
@@ -508,7 +508,7 @@ int pthread_attr_setinheritsched(pthread_attr_t *attr, int inheritsched)
        ret = pthread_attr_setinheritschedp(attr, inheritsched);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_setinheritsched,
-                                  ret, thread, THREAD_API_OTHER,
+                                  'd', ret, thread, THREAD_API_OTHER,
                                   "pd", voidp_to_uint64(attr),
                                   inheritsched);
 
@@ -527,7 +527,7 @@ int pthread_attr_getschedparam(const pthread_attr_t *attr,
        ret = pthread_attr_getschedparamp(attr, param);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_getschedparam,
-                                  ret, thread, THREAD_API_OTHER,
+                                  'd', ret, thread, THREAD_API_OTHER,
                                   "pp", voidp_to_uint64(attr),
                                   voidp_to_uint64(param));
 
@@ -546,7 +546,7 @@ int pthread_attr_setschedparam(pthread_attr_t *attr,
        ret = pthread_attr_setschedparamp(attr, param);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_setschedparam,
-                                  ret, thread, THREAD_API_OTHER,
+                                  'd', ret, thread, THREAD_API_OTHER,
                                   "pp",
                                   voidp_to_uint64(attr),
                                   voidp_to_uint64(param));
@@ -565,7 +565,7 @@ int pthread_attr_getschedpolicy(const pthread_attr_t *attr, int *policy)
        ret = pthread_attr_getschedpolicyp(attr, policy);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_getschedpolicy,
-                                  ret, thread, THREAD_API_OTHER,
+                                  'd', ret, thread, THREAD_API_OTHER,
                                   "pp", voidp_to_uint64(attr),
                                   voidp_to_uint64(policy));
 
@@ -583,7 +583,7 @@ int pthread_attr_setschedpolicy(pthread_attr_t *attr, int policy)
        ret = pthread_attr_setschedpolicyp(attr, policy);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_setschedpolicy,
-                                  ret, thread, THREAD_API_OTHER,
+                                  'd', ret, thread, THREAD_API_OTHER,
                                   "pd", voidp_to_uint64(attr),
                                   policy);
 
@@ -601,7 +601,7 @@ int pthread_attr_getguardsize(const pthread_attr_t *attr, size_t *guardsize)
        ret = pthread_attr_getguardsizep(attr, guardsize);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_getguardsize,
-                                  ret, thread, THREAD_API_OTHER,
+                                  'd', ret, thread, THREAD_API_OTHER,
                                   "pp", voidp_to_uint64(attr),
                                   voidp_to_uint64(guardsize));
 
@@ -619,7 +619,7 @@ int pthread_attr_setguardsize(pthread_attr_t *attr, size_t guardsize)
        ret = pthread_attr_setguardsizep(attr, guardsize);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_setguardsize,
-                                  ret, thread, THREAD_API_OTHER,
+                                  'd', ret, thread, THREAD_API_OTHER,
                                   "px", voidp_to_uint64(attr),
                                   (uint64_t)(guardsize));
 
@@ -637,7 +637,7 @@ int pthread_attr_getscope(const pthread_attr_t *attr, int *contentionscope)
        ret = pthread_attr_getscopep(attr, contentionscope);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_getscope,
-                                  ret, thread, THREAD_API_OTHER,
+                                  'd', ret, thread, THREAD_API_OTHER,
                                   "pp", voidp_to_uint64(attr),
                                   voidp_to_uint64(contentionscope));
 
@@ -655,7 +655,7 @@ int pthread_attr_setscope(pthread_attr_t *attr, int contentionscope)
        ret = pthread_attr_setscopep(attr, contentionscope);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_setscope,
-                                  ret, thread, THREAD_API_OTHER,
+                                  'd', ret, thread, THREAD_API_OTHER,
                                   "pd", voidp_to_uint64(attr), contentionscope);
 
        return ret;
@@ -673,7 +673,7 @@ int pthread_attr_getstack(const pthread_attr_t *attr,
        ret = pthread_attr_getstackp(attr, stackaddr, stacksize);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_getstack,
-                                  ret, thread, THREAD_API_OTHER,
+                                  'd', ret, thread, THREAD_API_OTHER,
                                   "ppp", voidp_to_uint64(attr),
                                   voidp_to_uint64(stackaddr),
                                   voidp_to_uint64(stacksize));
@@ -693,7 +693,7 @@ int pthread_attr_setstack(pthread_attr_t *attr,
        ret = pthread_attr_setstackp(attr, stackaddr, stacksize);
 
        AFTER_PACK_ORIGINAL_THREAD(API_ID_pthread_attr_setstack,
-                                  ret, thread, THREAD_API_OTHER,
+                                  'd', ret, thread, THREAD_API_OTHER,
                                   "ppx", voidp_to_uint64(attr),
                                   voidp_to_uint64(stackaddr),
                                   (uint64_t)(stacksize));
index 59e955aa7f3bdc0f3fe4f028f108c63fc2809a6d..289ecb24b6357cdfa67d47975c02877e0c7a2c1e 100755 (executable)
@@ -76,7 +76,7 @@ result UiApp::AddFrame(const Tizen::Ui::Controls::Frame& frame)
                        PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL,
                                          API_ID_result_UiApp__AddFrame_const_Tizen__Ui__Controls__Frame__frame_,
                                          "p", voidp_to_uint64(&frame));
-                       PACK_COMMON_END(ret, 0, 0);
+                       PACK_COMMON_END('p', ret, 0, 0);
                        PACK_UICONTROL(parent);
                        PACK_UICONTROL(&frame);
                        FLUSH_LOCAL_BUF();
@@ -111,7 +111,7 @@ result UiApp::RemoveFrame(const Tizen::Ui::Controls::Frame &frame)
                PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL,
                                  API_ID_result_UiApp__RemoveFrame_const_Tizen__Ui__Controls__Frame__frame_,
                                  "p", voidp_to_uint64(&frame));
-               PACK_COMMON_END(0, 0, 0);
+               PACK_COMMON_END('p', 0, 0, 0);
                PACK_UICONTROL(parent);
                PACK_UICONTROL(&frame);
        }
@@ -123,7 +123,7 @@ result UiApp::RemoveFrame(const Tizen::Ui::Controls::Frame &frame)
 
        if(bOption)
        {
-               PACK_RETURN_END(ret);
+               PACK_RETURN_END('p', ret);
        }
 
        FLUSH_LOCAL_BUF();
@@ -174,7 +174,7 @@ void Control::SetName(const Tizen::Base::String &name)
                PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL,
                                  API_ID_void_Control__SetName_const_Tizen__Base__String__name_,
                                  "p", voidp_to_uint64(&name));
-               PACK_COMMON_END(0, 0, 0);
+               PACK_COMMON_END('p', 0, 0, 0);
                PACK_UICONTROL(this);
                PACK_UICONTROL(parent);
                FLUSH_LOCAL_BUF();
@@ -229,7 +229,7 @@ result Container::AddControl(const Control &control)
                        PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL,
                                          API_ID_result_Container__AddControl_const_Control__control_,
                                          "p", voidp_to_uint64(&control));
-                       PACK_COMMON_END(ret, 0, 0);
+                       PACK_COMMON_END('p', ret, 0, 0);
                        PACK_UICONTROL(this);
                        PACK_UICONTROL(&control);
                        FLUSH_LOCAL_BUF();
@@ -287,7 +287,7 @@ result Container::AddControl(Control* control)
                        PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL,
                                          API_ID_result_Container__AddControl_Control__control_,
                                          "p", voidp_to_uint64(control));
-                       PACK_COMMON_END(ret, 0, 0);
+                       PACK_COMMON_END('p', ret, 0, 0);
                        PACK_UICONTROL(this);
                        PACK_UICONTROL(control);
                        FLUSH_LOCAL_BUF();
@@ -321,7 +321,7 @@ result Container::RemoveControl(const Control &control)
                PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL,
                                  API_ID_result_Container__RemoveControl_const_Control__control_,
                                  "p", voidp_to_uint64(&control));
-               PACK_COMMON_END(0, 0, 0);
+               PACK_COMMON_END('p', 0, 0, 0);
                PACK_UICONTROL(this);
                PACK_UICONTROL(&control);
        }
@@ -333,7 +333,7 @@ result Container::RemoveControl(const Control &control)
 
        if(bOption)
        {
-               PACK_RETURN_END(ret);
+               PACK_RETURN_END('p', ret);
        }
 
        FLUSH_LOCAL_BUF();
@@ -366,7 +366,7 @@ result Container::RemoveControl(Control* control)
                PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL,
                                  API_ID_result_Container__RemoveControl_Control__control_,
                                  "p", voidp_to_uint64(control));
-               PACK_COMMON_END(0, 0, 0);
+               PACK_COMMON_END('p', 0, 0, 0);
                PACK_UICONTROL(this);
                PACK_UICONTROL(control);
        }
@@ -378,7 +378,7 @@ result Container::RemoveControl(Control* control)
 
        if(bOption)
        {
-               PACK_RETURN_END(ret);
+               PACK_RETURN_END('p', ret);
        }
 
        FLUSH_LOCAL_BUF();
@@ -412,7 +412,7 @@ result Container::RemoveControl(int index)
                PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL,
                                  API_ID_result_Container__RemoveControl_int_index_,
                                  "d", index);
-               PACK_COMMON_END(0, 0, 0);
+               PACK_COMMON_END('p', 0, 0, 0);
                PACK_UICONTROL(this);
                PACK_UICONTROL(pcontrol);
        }
@@ -424,7 +424,7 @@ result Container::RemoveControl(int index)
 
        if(bOption)
        {
-               PACK_RETURN_END(ret);
+               PACK_RETURN_END('p', ret);
        }
 
        FLUSH_LOCAL_BUF();
@@ -452,7 +452,7 @@ void Container::RemoveAllControls(void)
                PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL,
                                  API_ID_void_Container__RemoveAllControls_void_,
                                  "", 0);
-               PACK_COMMON_END(0, 0, 0);
+               PACK_COMMON_END('p', 0, 0, 0);
                PACK_UICONTROL(this);
                PACK_UICONTROL(pcontrol);
                FLUSH_LOCAL_BUF();
index f622d6423dfd61e8903bdafed3813507a76deba7..4d13474e97100c6611580be203533e54002186da 100755 (executable)
@@ -90,7 +90,7 @@ result File::Construct(const Tizen::Base::String& filePath,
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID_result_File__Construct_const_Tizen__Base__String__filePath__const_Tizen__Base__String__openMode__bool_createParentDirectories_,
                                  "ssd", absolutize_filepath(buffer,temp_path),
                                  temp_mode, createParentDirectories);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_OPEN, size, temp_path);
                FLUSH_LOCAL_BUF();
 
@@ -149,9 +149,8 @@ result File::Construct(const Tizen::Base::String& filePath,
                PREPARE_LOCAL_BUF();
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Construct_const_Tizen__Base__String__filePath__const_Tizen__Base__String__openMode_,
-                                 "ss", absolutize_filepath(buffer, temp_path),
-                                 temp_mode);
-               PACK_COMMON_END(ret, ret, blockresult);
+                                 "ss", absolutize_filepath(buffer, temp_path), temp_mode);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_OPEN, size, temp_path);
                FLUSH_LOCAL_BUF();
 
@@ -207,7 +206,7 @@ result File::Construct(const Tizen::Base::String& filePath,
                                  API_ID_result_File__Construct_const_Tizen__Base__String__filePath__const_char__pOpenMode_,
                                  "sp", absolutize_filepath(buffer, temp),
                                  voidp_to_uint64(pOpenMode));
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_OPEN, size, temp);
                FLUSH_LOCAL_BUF();
 
@@ -264,7 +263,7 @@ result File::Construct(const Tizen::Base::String& filePath,
                                  API_ID_result_File__Construct_const_Tizen__Base__String__filePath__const_char__pOpenMode__const_Tizen__Base__ByteBuffer__secretKey_,
                                  "sp", temp,
                                  voidp_to_uint64(pOpenMode));
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_OPEN, size, temp);
                FLUSH_LOCAL_BUF();
 
@@ -315,7 +314,7 @@ result File::Flush(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Flush_void_,
                                  "", 0);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_OTHER, size, temp);
                FLUSH_LOCAL_BUF();
 
@@ -367,7 +366,7 @@ Tizen::Base::String File::GetName(void) const{
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_Tizen__Base__String_File__GetName_void__const,
                                  "", 0);
-               PACK_COMMON_END(ret.GetPointer(), res, blockresult);
+               PACK_COMMON_END('p', ret.GetPointer(), res, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_OTHER, size, temp);
                FLUSH_LOCAL_BUF();
 
@@ -414,7 +413,7 @@ result File::Read(Tizen::Base::String& buffer) {
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Read_Tizen__Base__String__buffer_,
                                  "x", (uint64_t)(&buffer));
-               PACK_COMMON_END(0, 0, blockresult);
+               PACK_COMMON_END('p', 0, 0, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_READ_START, size, temp);
                FLUSH_LOCAL_BUF();
 
@@ -434,7 +433,7 @@ result File::Read(Tizen::Base::String& buffer) {
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Read_Tizen__Base__String__buffer_,
                                  "x", (uint64_t)(&buffer));
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_RESOURCE(nRead, (unsigned long)this, FD_API_READ_END, size, temp);
                FLUSH_LOCAL_BUF();
 
@@ -481,7 +480,7 @@ result File::Read(Tizen::Base::ByteBuffer& buffer) {
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Read_Tizen__Base__ByteBuffer__buffer_,
                                  "x", (uint64_t)(&buffer));
-               PACK_COMMON_END(0, 0, blockresult);
+               PACK_COMMON_END('p', 0, 0, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_READ_START, size, temp);
                FLUSH_LOCAL_BUF();
 
@@ -501,7 +500,7 @@ result File::Read(Tizen::Base::ByteBuffer& buffer) {
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Read_Tizen__Base__ByteBuffer__buffer_,
                                  "x", (uint64_t)(&buffer));
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_RESOURCE(nRead, (unsigned long)this, FD_API_READ_END, size, temp);
                FLUSH_LOCAL_BUF();
 
@@ -548,7 +547,7 @@ int File::Read(void *buffer, int length) {
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_int_File__Read_void__buffer__int_length_,
                                  "xd", (uint64_t)(buffer), length);
-               PACK_COMMON_END(0, 0, blockresult);
+               PACK_COMMON_END('p', 0, 0, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_READ_START, size, temp);
                FLUSH_LOCAL_BUF();
 
@@ -569,7 +568,7 @@ int File::Read(void *buffer, int length) {
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_int_File__Read_void__buffer__int_length_,
                                  "xd", (uint64_t)(buffer), length);
-               PACK_COMMON_END(ret, res, blockresult);
+               PACK_COMMON_END('p', ret, res, blockresult);
                PACK_RESOURCE(nRead, (unsigned long)this, FD_API_READ_END, size, temp);
                FLUSH_LOCAL_BUF();
 
@@ -634,7 +633,7 @@ result File::Seek(FileSeekPosition position, long offset) {
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Seek_FileSeekPosition_position__long_offset_,
                                  "sx", temp_pos, (uint64_t)(offset));
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_OTHER, size, temp);
                FLUSH_LOCAL_BUF();
 
@@ -687,7 +686,7 @@ int File::Tell(void) const {
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_int_File__Tell_void__const,
                                  "", 0);
-               PACK_COMMON_END(ret, res, blockresult);
+               PACK_COMMON_END('p', ret, res, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_OTHER, size, temp);
                FLUSH_LOCAL_BUF();
 
@@ -738,7 +737,7 @@ result File::Truncate(int length) {
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Truncate_int_length_,
                                  "d", length);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_OTHER, size, temp);
                FLUSH_LOCAL_BUF();
 
@@ -785,7 +784,7 @@ result File::Write(const void *buffer, int length) {
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Write_const_void__buffer__int_length_,
                                  "xd", (uint64_t)(buffer), length);
-               PACK_COMMON_END(0, 0, blockresult);
+               PACK_COMMON_END('p', 0, 0, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_WRITE_START, size, temp);
                FLUSH_LOCAL_BUF();
 
@@ -805,7 +804,7 @@ result File::Write(const void *buffer, int length) {
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Write_const_void__buffer__int_length_,
                                  "xd", (uint64_t)(buffer), length);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_RESOURCE(nWritten, (unsigned long)this, FD_API_WRITE_END, size, temp);
                FLUSH_LOCAL_BUF();
 
@@ -852,7 +851,7 @@ result File::Write(const Tizen::Base::ByteBuffer& buffer) {
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Write_const_Tizen__Base__ByteBuffer__buffer_,
                                  "x", (uint64_t)(&buffer));
-               PACK_COMMON_END(0, 0, blockresult);
+               PACK_COMMON_END('p', 0, 0, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_WRITE_START, size, temp);
                FLUSH_LOCAL_BUF();
 
@@ -872,7 +871,7 @@ result File::Write(const Tizen::Base::ByteBuffer& buffer) {
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Write_const_Tizen__Base__ByteBuffer__buffer_,
                                  "x", (uint64_t)(&buffer));
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_RESOURCE(nWritten, (unsigned long)this, FD_API_WRITE_END, size, temp);
                FLUSH_LOCAL_BUF();
 
@@ -921,7 +920,7 @@ result File::Write(const Tizen::Base::String& buffer) {
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Write_const_Tizen__Base__String__buffer_,
                                  "s", temp_buf);
-               PACK_COMMON_END(0, 0, blockresult);
+               PACK_COMMON_END('p', 0, 0, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_WRITE_START, size, temp_path);
                FLUSH_LOCAL_BUF();
 
@@ -943,7 +942,7 @@ result File::Write(const Tizen::Base::String& buffer) {
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_result_File__Write_const_Tizen__Base__String__buffer_,
                                  "s", temp_buf);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_RESOURCE(nWritten, (unsigned long)this, FD_API_WRITE_END, size, temp_path);
                FLUSH_LOCAL_BUF();
 
@@ -993,7 +992,7 @@ File::~File(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE,
                                  API_ID_File___File_void_,
                                  "", 0);
-               PACK_COMMON_END(0, 0, blockresult);
+               PACK_COMMON_END('p', 0, 0, blockresult);
                PACK_RESOURCE(0, (unsigned long)this, FD_API_CLOSE, size, "");
                FLUSH_LOCAL_BUF();
 
index 67566067db9362ae819b00df8573d706b635e339..887cfc6d55a65d4bd82f8dce80a19c1608970c0a 100755 (executable)
@@ -109,7 +109,7 @@ result UiApp::Execute(UiAppInstanceFactory pUiAppFactory,
                          API_ID_result_UiApp__Execute_UiAppInstanceFactory_pUiAppFactory__const_IList__pArguments_,
                          "pp", (uint64_t)(pUiAppFactory),
                          voidp_to_uint64(pArguments));
-       PACK_COMMON_END(ret, 0, 0);
+       PACK_COMMON_END('p', ret, 0, 0);
        FLUSH_LOCAL_BUF();
 
        unregister_orientation_event_listener(handler);
@@ -133,7 +133,7 @@ void _AppImpl::OnTerminate(void* user_data)
        PACK_COMMON_BEGIN(MSG_PROBE_LIFECYCLE,
                          API_ID_void__AppImpl__OnTerminate_void__user_data_,
                          "p", voidp_to_uint64(user_data));
-       PACK_COMMON_END(0, 0, 0);
+       PACK_COMMON_END('p', 0, 0, 0);
        FLUSH_LOCAL_BUF();
 
        probeBlockEnd();
@@ -173,7 +173,7 @@ void _AppInfo::SetAppState(AppState appState)
                PACK_COMMON_BEGIN(MSG_PROBE_LIFECYCLE,
                                  API_ID_void__AppInfo__SetAppState_AppState_appState_,
                                  "p", (uint64_t)(appState));
-               PACK_COMMON_END(0, 0, 0);
+               PACK_COMMON_END('p', 0, 0, 0);
                FLUSH_LOCAL_BUF();
        }
        probeBlockEnd();
@@ -197,7 +197,7 @@ void _UiAppImpl::OnBackground(void)
        PACK_COMMON_BEGIN(MSG_PROBE_LIFECYCLE,
                          API_ID_void__UiAppImpl__OnBackground_void_,
                          "", 0);
-       PACK_COMMON_END(0, 0, 0);
+       PACK_COMMON_END('p', 0, 0, 0);
        FLUSH_LOCAL_BUF();
 
        probeBlockEnd();
@@ -220,7 +220,7 @@ void _UiAppImpl::OnForeground(void)
        PACK_COMMON_BEGIN(MSG_PROBE_LIFECYCLE,
                          API_ID_void__UiAppImpl__OnForeground_void_,
                          "", 0);
-       PACK_COMMON_END(0, 0, 0);
+       PACK_COMMON_END('p', 0, 0, 0);
        FLUSH_LOCAL_BUF();
 
        SCREENSHOT_UNLOCK();
index 30e11c7a54215a7f4a1d9d38b1c69d044afb8749..c06a79b291c620178cf2af33a84bf780dc512d61 100755 (executable)
@@ -88,7 +88,7 @@ result Mutex::Create(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_result_Mutex__Create_void_,
                                  "", 0);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_NEW);
                FLUSH_LOCAL_BUF();
 
@@ -144,7 +144,7 @@ result Mutex::Create(const Tizen::Base::String& name) {
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_result_Mutex__Create_const_Tizen__Base__String__name_,
                                  "s", temp);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_NEW);
                FLUSH_LOCAL_BUF();
 
@@ -197,7 +197,7 @@ result Mutex::Release(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_result_Mutex__Release_void_,
                                  "", 0);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_RELEASE);
                FLUSH_LOCAL_BUF();
 
@@ -244,7 +244,7 @@ result Mutex::Acquire(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_result_Mutex__Acquire_void_,
                                  "", 0);
-               PACK_COMMON_END(0, 0, blockresult);
+               PACK_COMMON_END('p', 0, 0, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_ACQUIRE_WAIT_START);
                FLUSH_LOCAL_BUF();
 
@@ -260,7 +260,7 @@ result Mutex::Acquire(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_result_Mutex__Acquire_void_,
                                  "", 0);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_ACQUIRE_WAIT_END);
                FLUSH_LOCAL_BUF();
 
@@ -313,7 +313,7 @@ result Mutex::TryToAcquire(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_result_Mutex__TryToAcquire_void_,
                                  "", 0);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_TRY_ACQUIRE);
                FLUSH_LOCAL_BUF();
 
@@ -367,7 +367,7 @@ result Semaphore::Create(int count) {
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_result_Semaphore__Create_int_count_,
                                  "d", count);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_NEW);
                FLUSH_LOCAL_BUF();
 
@@ -423,7 +423,7 @@ result Semaphore::Create(const Tizen::Base::String& name, int count) {
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_result_Semaphore__Create_const_Tizen__Base__String__name__int_count_,
                                  "sd", temp, count);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_NEW);
                FLUSH_LOCAL_BUF();
 
@@ -471,7 +471,7 @@ result Semaphore::Acquire(long timeout) {
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_result_Semaphore__Acquire_long_timeout_,
                                  "x", (uint64_t)(timeout));
-               PACK_COMMON_END(0, 0, blockresult);
+               PACK_COMMON_END('p', 0, 0, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_ACQUIRE_WAIT_START);
                FLUSH_LOCAL_BUF();
 
@@ -487,7 +487,7 @@ result Semaphore::Acquire(long timeout) {
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_result_Semaphore__Acquire_long_timeout_,
                                  "x", (uint64_t)(timeout));
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_ACQUIRE_WAIT_END);
                FLUSH_LOCAL_BUF();
 
@@ -540,7 +540,7 @@ result Semaphore::TryToAcquire(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_result_Semaphore__TryToAcquire_void_,
                                  "", 0);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_TRY_ACQUIRE);
                FLUSH_LOCAL_BUF();
 
@@ -593,7 +593,7 @@ result Semaphore::Release(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_result_Semaphore__Release_void_,
                                  "", 0);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_RELEASE);
                FLUSH_LOCAL_BUF();
 
@@ -646,7 +646,7 @@ result Monitor::Construct(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_result_Monitor__Construct_void_,
                                  "", 0);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_NEW);
                FLUSH_LOCAL_BUF();
 
@@ -693,7 +693,7 @@ result Monitor::Enter(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_result_Monitor__Enter_void_,
                                  "", 0);
-               PACK_COMMON_END(0, 0, blockresult);
+               PACK_COMMON_END('p', 0, 0, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_ACQUIRE_WAIT_START);
                FLUSH_LOCAL_BUF();
 
@@ -709,7 +709,7 @@ result Monitor::Enter(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_result_Monitor__Enter_void_,
                                  "", 0);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_ACQUIRE_WAIT_END);
                FLUSH_LOCAL_BUF();
 
@@ -762,7 +762,7 @@ result Monitor::Exit(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                   API_ID_result_Monitor__Exit_void_,
                                  "", 0);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_RELEASE);
                FLUSH_LOCAL_BUF();
 
@@ -809,7 +809,7 @@ result Monitor::Wait(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_result_Monitor__Wait_void_,
                                  "", 0);
-               PACK_COMMON_END(0, 0, blockresult);
+               PACK_COMMON_END('p', 0, 0, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_COND_WAIT_START);
                FLUSH_LOCAL_BUF();
 
@@ -825,7 +825,7 @@ result Monitor::Wait(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_result_Monitor__Wait_void_,
                                  "", 0);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_COND_WAIT_END);
                FLUSH_LOCAL_BUF();
 
@@ -878,7 +878,7 @@ result Monitor::Notify(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_result_Monitor__Notify_void_,
                                  "", 0);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_NOTIFY);
                FLUSH_LOCAL_BUF();
 
@@ -931,7 +931,7 @@ result Monitor::NotifyAll(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_SYNC,
                                  API_ID_result_Monitor__NotifyAll_void_,
                                  "", 0);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_NOTIFY_ALL);
                FLUSH_LOCAL_BUF();
 
index d8f6b53422313c4b64b19356933869d8b1683315..5cac0665f33b94159144989bc7d828aa697b3c29 100755 (executable)
@@ -163,7 +163,7 @@ _ThreadImpl::ThreadProc(void* params) {
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_void___ThreadImpl__ThreadProc_void__params_,
                                  "p", voidp_to_uint64(params));
-               PACK_COMMON_END((unsigned int)pSelf, 0, blockresult);
+               PACK_COMMON_END('p', (unsigned int)pSelf, 0, blockresult);
                PACK_THREAD((unsigned int)pThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_INTERNAL_START);
                FLUSH_LOCAL_BUF();
 
@@ -187,7 +187,7 @@ _ThreadImpl::ThreadProc(void* params) {
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_void___ThreadImpl__ThreadProc_void__params_,
                                  "p", voidp_to_uint64(params));
-               PACK_COMMON_END((unsigned int)pSelf, 0, blockresult);
+               PACK_COMMON_END('p', (unsigned int)pSelf, 0, blockresult);
                PACK_THREAD((unsigned int)pThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_INTERNAL_STOP);
                FLUSH_LOCAL_BUF();
 
@@ -470,7 +470,7 @@ result Thread::Sleep(long milliSeconds) {
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_Thread__Sleep_long_milliSeconds_,
                                  "x", (uint64_t)(milliSeconds));
-               PACK_COMMON_END(0, 0, blockresult);
+               PACK_COMMON_END('p', 0, 0, blockresult);
                PACK_THREAD((unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_WAIT_START);
                FLUSH_LOCAL_BUF();
 
@@ -489,7 +489,7 @@ result Thread::Sleep(long milliSeconds) {
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_Thread__Yield_void_,
                                  "x", (uint64_t)(milliSeconds));
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_THREAD((unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_WAIT_END);
                FLUSH_LOCAL_BUF();
 
@@ -542,7 +542,7 @@ Thread* Thread::GetCurrentThread(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_Thread__Thread__GetCurrentThread_void_,
                                  "", 0);
-               PACK_COMMON_END((unsigned int)currentThread, res, blockresult);
+               PACK_COMMON_END('p', (unsigned int)currentThread, res, blockresult);
                PACK_THREAD((unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_OTHER);
                FLUSH_LOCAL_BUF();
 
@@ -596,7 +596,7 @@ result Thread::Yield(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_Thread__Yield_void_,
                                  "", 0);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_THREAD((unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_OTHER);
                FLUSH_LOCAL_BUF();
 
@@ -645,7 +645,7 @@ result Thread::Exit(int exitCode) {
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_Thread__Exit_int_exitCode_,
                                  "d", exitCode);
-               PACK_COMMON_END(0, 0, blockresult);
+               PACK_COMMON_END('p', 0, 0, blockresult);
                PACK_THREAD((unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_EXIT);
                FLUSH_LOCAL_BUF();
 
@@ -706,7 +706,7 @@ result Thread::Construct(ThreadType threadType, long stackSize,
                                  API_ID_result_Thread__Construct_ThreadType_threadType__long_stackSize__ThreadPriority_priority_,
                                  "dxd", threadType, (uint64_t)(stackSize),
                                  priority);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
 
@@ -757,7 +757,7 @@ result Thread::Construct(long stackSize, ThreadPriority priority) {
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_Thread__Construct_long_stackSize__ThreadPriority_priority_,
                                  "xd", (uint64_t)(stackSize), priority);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
 
@@ -814,7 +814,7 @@ result Thread::Construct(const Tizen::Base::String &name, long stackSize,
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_Thread__Construct_const_Tizen__Base__String__name__long_stackSize__ThreadPriority_priority_,
                                  "sxd", temp, (uint64_t)(stackSize), priority);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
 
@@ -874,7 +874,7 @@ result Thread::Construct(const Tizen::Base::String &name, ThreadType threadType,
                                  API_ID_result_Thread__Construct_const_Tizen__Base__String__name__ThreadType_threadType__long_stackSize__ThreadPriority_priority_,
                                  "sdxd", temp, threadType,
                                  (uint64_t)(stackSize), priority);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
 
@@ -931,7 +931,7 @@ result Thread::Construct(IRunnable &target, long stackSize,
                                  API_ID_result_Thread__Construct_IRunnable__target__long_stackSize__ThreadPriority_priority_,
                                  "xxd", (uint64_t)(&target),
                                  (uint64_t)(stackSize), priority);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
 
@@ -991,7 +991,7 @@ result Thread::Construct(const Tizen::Base::String &name, IRunnable &target,
                                  API_ID_result_Thread__Construct_const_Tizen__Base__String__name__IRunnable__target__long_stackSize__ThreadPriority_priority_,
                                  "sxxd", temp, (uint64_t)(&target),
                                  (uint64_t)(stackSize), priority);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
 
@@ -1045,7 +1045,7 @@ result Thread::GetExitCode(int &exitCode) const {
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_Thread__GetExitCode_int__exitCode__const,
                                  "d", exitCode);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_OTHER);
                FLUSH_LOCAL_BUF();
 
@@ -1100,7 +1100,7 @@ const Tizen::Base::String & Thread::GetName(void) const {
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_const_Tizen__Base__String___Thread__GetName_void__const,
                                  "", 0);
-               PACK_COMMON_END(ret.GetPointer(), res, blockresult);
+               PACK_COMMON_END('p', ret.GetPointer(), res, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_OTHER);
                FLUSH_LOCAL_BUF();
 
@@ -1146,7 +1146,7 @@ result Thread::Join(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_Thread__Join_void_,
                                  "", 0);
-               PACK_COMMON_END(0, 0, blockresult);
+               PACK_COMMON_END('p', 0, 0, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_WAIT_START);
                FLUSH_LOCAL_BUF();
 
@@ -1162,7 +1162,7 @@ result Thread::Join(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_Thread__Join_void_,
                                  "", 0);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_WAIT_END);
                FLUSH_LOCAL_BUF();
 
@@ -1291,7 +1291,7 @@ result Thread::Start(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_Thread__Start_void_,
                                  "", 0);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_START);
                FLUSH_LOCAL_BUF();
 
@@ -1341,7 +1341,7 @@ result Thread::Stop(void) {
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_Thread__Stop_void_,
                                  "", 0);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_STOP);
                FLUSH_LOCAL_BUF();
 
@@ -1393,7 +1393,7 @@ result EventDrivenThread::Construct(long stackSize, ThreadPriority priority) {
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_EventDrivenThread__Construct_long_stackSize__ThreadPriority_priority_,
                                  "xd", (uint64_t)(stackSize), priority);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_EVENTDRIVEN, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
 
@@ -1453,7 +1453,7 @@ result EventDrivenThread::Construct(const Tizen::Base::String &name, long stackS
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_EventDrivenThread__Construct_const_Tizen__Base__String__name__long_stackSize__ThreadPriority_priority_,
                                  "sx", temp, (uint64_t)(stackSize));
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_EVENTDRIVEN, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
 
@@ -1505,7 +1505,7 @@ result EventDrivenThread::Quit() {
                PACK_COMMON_BEGIN(MSG_PROBE_THREAD,
                                  API_ID_result_EventDrivenThread__Quit__,
                                  "", 0);
-               PACK_COMMON_END(ret, ret, blockresult);
+               PACK_COMMON_END('p', ret, ret, blockresult);
                PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_EVENTDRIVEN, THREAD_API_STOP);
                FLUSH_LOCAL_BUF();
 
index 2b04036631020069d63465e83c159bcb2bd2fbcb..311157aa4687fec68ca7bdf7dc88aca6a543fea2 100755 (executable)
@@ -97,7 +97,7 @@ void SceneManagerEventListener::OnSceneTransitionCompleted(const SceneId &previo
                                                  "pp",
                                                  voidp_to_uint64(&previousSceneId),
                                                  voidp_to_uint64(&currentSceneId));
-                               PACK_COMMON_END(0, 0, 0);
+                               PACK_COMMON_END('v', 0, 0, 0);
                                PACK_SCENE(scene_name, formid, pform, panelid, ppanel, transition, user);
                                FLUSH_LOCAL_BUF();
                        }