kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add pid to eina log. 

SVN revision: 53091
This commit is contained in:
Carsten Haitzler 2010-10-06 07:09:05 +00:00
parent 96172a4066
commit f1cac3e69c
1 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
legacy/eina/src/lib/eina_log.c
View File

@ -539,6 +539,12 @@ eina_log_win32_color_get(const char *domain_str)
} }
#endif #endif
static inline unsigned int
eina_log_pid_get(void)
{
return (unsigned int)getpid();
}
static inline void static inline void
eina_log_print_level_name_get(int level, const char **p_name) eina_log_print_level_name_get(int level, const char **p_name)
{ {
@ -633,7 +639,8 @@ eina_log_print_prefix_NOthreads_NOcolor_file_func(FILE *fp,
int line) int line)
{ {
DECLARE_LEVEL_NAME(level); DECLARE_LEVEL_NAME(level);
fprintf(fp, "%s:%s %s:%d %s() ", name, d->domain_str, file, line, fnc); fprintf(fp, "%s<%u>:%s %s:%d %s() ", name, eina_log_pid_get(),
d->domain_str, file, line, fnc);
} }
static void static void
@ -645,7 +652,8 @@ eina_log_print_prefix_NOthreads_NOcolor_NOfile_func(FILE *fp,
int line __UNUSED__) int line __UNUSED__)
{ {
DECLARE_LEVEL_NAME(level); DECLARE_LEVEL_NAME(level);
fprintf(fp, "%s:%s %s() ", name, d->domain_str, fnc); fprintf(fp, "%s<%u>:%s %s() ", name, eina_log_pid_get(), d->domain_str,
fnc);
} }
static void static void
@ -657,7 +665,8 @@ eina_log_print_prefix_NOthreads_NOcolor_file_NOfunc(FILE *fp,
int line) int line)
{ {
DECLARE_LEVEL_NAME(level); DECLARE_LEVEL_NAME(level);
fprintf(fp, "%s:%s %s:%d ", name, d->domain_str, file, line); fprintf(fp, "%s<%u>:%s %s:%d ", name, eina_log_pid_get(), d->domain_str,
file, line);
} }
/* No threads, color */ /* No threads, color */
@ -693,9 +702,9 @@ eina_log_print_prefix_NOthreads_color_file_func(FILE *fp,
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE); FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE);
fprintf(fp, " "); fprintf(fp, " ");
#else #else
fprintf(fp, "%s%s" EINA_COLOR_RESET ":%s %s:%d " fprintf(fp, "%s%s<%u>" EINA_COLOR_RESET ":%s %s:%d "
EINA_COLOR_HIGH "%s()" EINA_COLOR_RESET " ", EINA_COLOR_HIGH "%s()" EINA_COLOR_RESET " ",
color, name, d->domain_str, file, line, fnc); color, name, eina_log_pid_get(), d->domain_str, file, line, fnc);
#endif #endif
} }
@ -728,9 +737,9 @@ eina_log_print_prefix_NOthreads_color_NOfile_func(FILE *fp,
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE); FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE);
fprintf(fp, " "); fprintf(fp, " ");
#else #else
fprintf(fp, "%s%s" EINA_COLOR_RESET ":%s " fprintf(fp, "%s%s<%u>" EINA_COLOR_RESET ":%s "
EINA_COLOR_HIGH "%s()" EINA_COLOR_RESET " ", EINA_COLOR_HIGH "%s()" EINA_COLOR_RESET " ",
color, name, d->domain_str, fnc); color, name, eina_log_pid_get(), d->domain_str, fnc);
#endif #endif
} }
@ -758,8 +767,8 @@ eina_log_print_prefix_NOthreads_color_file_NOfunc(FILE *fp,
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE); FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE);
fprintf(fp, " %s:%d ", file, line); fprintf(fp, " %s:%d ", file, line);
#else #else
fprintf(fp, "%s%s" EINA_COLOR_RESET ":%s %s:%d ", fprintf(fp, "%s%s<%u>" EINA_COLOR_RESET ":%s %s:%d ",
color, name, d->domain_str, file, line); color, name, eina_log_pid_get(), d->domain_str, file, line);
#endif #endif
} }
@ -779,12 +788,13 @@ eina_log_print_prefix_threads_NOcolor_file_func(FILE *fp,
cur = SELF(); cur = SELF();
if (IS_OTHER(cur)) if (IS_OTHER(cur))
{ {
fprintf(fp, "%s:%s[T:%lu] %s:%d %s() ", fprintf(fp, "%s<%u>:%s[T:%lu] %s:%d %s() ",
name, d->domain_str, (unsigned long)cur, file, line, fnc); name, eina_log_pid_get(), d->domain_str,
(unsigned long)cur, file, line, fnc);
return; return;
} }
fprintf(fp, "%s<%u>:%s %s:%d %s() ",
fprintf(fp, "%s:%s %s:%d %s() ", name, d->domain_str, file, line, fnc); name, eina_log_pid_get(), d->domain_str, file, line, fnc);
} }
static void static void
@ -801,12 +811,13 @@ eina_log_print_prefix_threads_NOcolor_NOfile_func(FILE *fp,
cur = SELF(); cur = SELF();
if (IS_OTHER(cur)) if (IS_OTHER(cur))
{ {
fprintf(fp, "%s:%s[T:%lu] %s() ", fprintf(fp, "%s<%u>:%s[T:%lu] %s() ",
name, d->domain_str, (unsigned long)cur, fnc); name, eina_log_pid_get(), d->domain_str,
(unsigned long)cur, fnc);
return; return;
} }
fprintf(fp, "%s<%u>:%s %s() ",
fprintf(fp, "%s:%s %s() ", name, d->domain_str, fnc); name, eina_log_pid_get(), d->domain_str, fnc);
} }
static void static void
@ -823,12 +834,14 @@ eina_log_print_prefix_threads_NOcolor_file_NOfunc(FILE *fp,
cur = SELF(); cur = SELF();
if (IS_OTHER(cur)) if (IS_OTHER(cur))
{ {
fprintf(fp, "%s:%s[T:%lu] %s:%d ", fprintf(fp, "%s<%u>:%s[T:%lu] %s:%d ",
name, d->domain_str, (unsigned long)cur, file, line); name, eina_log_pid_get(), d->domain_str, (unsigned long)cur,
file, line);
return; return;
} }
fprintf(fp, "%s:%s %s:%d ", name, d->domain_str, file, line); fprintf(fp, "%s<%u>:%s %s:%d ",
name, eina_log_pid_get(), d->domain_str, file, line);
} }
/* threads, color */ /* threads, color */
@ -883,11 +896,11 @@ eina_log_print_prefix_threads_color_file_func(FILE *fp,
FOREGROUND_BLUE); FOREGROUND_BLUE);
fprintf(fp, " "); fprintf(fp, " ");
# else # else
fprintf(fp, "%s%s" EINA_COLOR_RESET ":%s[T:" fprintf(fp, "%s%s<%u>" EINA_COLOR_RESET ":%s[T:"
EINA_COLOR_ORANGE "%lu" EINA_COLOR_RESET "] %s:%d " EINA_COLOR_ORANGE "%lu" EINA_COLOR_RESET "] %s:%d "
EINA_COLOR_HIGH "%s()" EINA_COLOR_RESET " ", EINA_COLOR_HIGH "%s()" EINA_COLOR_RESET " ",
color, name, d->domain_str, (unsigned long)cur, file, color, name, eina_log_pid_get() ,d->domain_str,
line, fnc); (unsigned long)cur, file, line, fnc);
# endif # endif
return; return;
} }
@ -900,9 +913,9 @@ eina_log_print_prefix_threads_color_file_func(FILE *fp,
fnc, fnc,
line); line);
# else # else
fprintf(fp, "%s%s" EINA_COLOR_RESET ":%s %s:%d " fprintf(fp, "%s%s<%u>" EINA_COLOR_RESET ":%s %s:%d "
EINA_COLOR_HIGH "%s()" EINA_COLOR_RESET " ", EINA_COLOR_HIGH "%s()" EINA_COLOR_RESET " ",
color, name, d->domain_str, file, line, fnc); color, name, eina_log_pid_get(), d->domain_str, file, line, fnc);
# endif # endif
} }
@ -952,10 +965,11 @@ eina_log_print_prefix_threads_color_NOfile_func(FILE *fp,
FOREGROUND_BLUE); FOREGROUND_BLUE);
fprintf(fp, " "); fprintf(fp, " ");
# else # else
fprintf(fp, "%s%s" EINA_COLOR_RESET ":%s[T:" fprintf(fp, "%s%s<%u>" EINA_COLOR_RESET ":%s[T:"
EINA_COLOR_ORANGE "%lu" EINA_COLOR_RESET "] " EINA_COLOR_ORANGE "%lu" EINA_COLOR_RESET "] "
EINA_COLOR_HIGH "%s()" EINA_COLOR_RESET " ", EINA_COLOR_HIGH "%s()" EINA_COLOR_RESET " ",
color, name, d->domain_str, (unsigned long)cur, fnc); color, name, eina_log_pid_get(), d->domain_str,
(unsigned long)cur, fnc);
# endif # endif
return; return;
} }
@ -968,9 +982,9 @@ eina_log_print_prefix_threads_color_NOfile_func(FILE *fp,
fnc, fnc,
line); line);
# else # else
fprintf(fp, "%s%s" EINA_COLOR_RESET ":%s " fprintf(fp, "%s%s<%u>" EINA_COLOR_RESET ":%s "
EINA_COLOR_HIGH "%s()" EINA_COLOR_RESET " ", EINA_COLOR_HIGH "%s()" EINA_COLOR_RESET " ",
color, name, d->domain_str, fnc); color, name, eina_log_pid_get(), d->domain_str, fnc);
# endif # endif
} }
@ -1015,9 +1029,10 @@ eina_log_print_prefix_threads_color_file_NOfunc(FILE *fp,
FOREGROUND_BLUE); FOREGROUND_BLUE);
fprintf(fp, "] %s:%d ", file, line); fprintf(fp, "] %s:%d ", file, line);
# else # else
fprintf(fp, "%s%s" EINA_COLOR_RESET ":%s[T:" fprintf(fp, "%s%s<%u>" EINA_COLOR_RESET ":%s[T:"
EINA_COLOR_ORANGE "%lu" EINA_COLOR_RESET "] %s:%d ", EINA_COLOR_ORANGE "%lu" EINA_COLOR_RESET "] %s:%d ",
color, name, d->domain_str, (unsigned long)cur, file, line); color, name, eina_log_pid_get(), d->domain_str,
(unsigned long)cur, file, line);
# endif # endif
return; return;
} }
@ -2361,7 +2376,8 @@ eina_log_print_cb_file(const Eina_Log_Domain *d,
} }
#endif #endif
fprintf(f, "%s %s:%d %s() ", d->name, file, line, fnc); fprintf(f, "%s<%u> %s:%d %s() ", d->name, eina_log_pid_get(),
file, line, fnc);
#ifdef EFL_HAVE_THREADS #ifdef EFL_HAVE_THREADS
end: end:
#endif #endif