mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-16 01:02:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improve logging interface to reduce overhead

Browse Source 
This reduces logging overhead by only calling the log output function
once instead of three times.

Additionally the nslog_gettime interface no longer needs to be
exported and the static function is directly inlined further reducing
function call overhead.

Finally the appending of a newline uses fputc instead of a full printf
call which is considerably more simple and further reduces overhead
time.
This commit is contained in:
Vincent Sanders 2015-05-29 16:18:18 +01:00
parent 4324bf535f
commit faf9b9d919
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
utils/log.c
View File

@ -95,7 +95,7 @@ nserror nslog_init(nslog_ensure_t *ensure, int *pargc, char **argv)
/* Subtract the `struct timeval' values X and Y,
storing the result in RESULT.
Return 1 if the difference is negative, otherwise 0.
Return 1 if the difference is negative, otherwise 0.
*/
static int
@ -122,37 +122,45 @@ timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y)
return x->tv_sec < y->tv_sec;
}
const char *nslog_gettime(void)
/**
* Obtain a formatted string suitable for prepending to a log message
*
* \return formatted string of the time since first log call
*/
static const char *nslog_gettime(void)
{
static struct timeval start_tv;
static char buff[32];
struct timeval tv;
struct timeval now_tv;
struct timeval now_tv;
if (!timerisset(&start_tv)) {
gettimeofday(&start_tv, NULL);
gettimeofday(&start_tv, NULL);
}
gettimeofday(&now_tv, NULL);
gettimeofday(&now_tv, NULL);
timeval_subtract(&tv, &now_tv, &start_tv);
snprintf(buff, sizeof(buff),"(%ld.%06ld)",
snprintf(buff, sizeof(buff),"(%ld.%06ld)",
(long)tv.tv_sec, (long)tv.tv_usec);
return buff;
return buff;
}
void nslog_log(const char *format, ...)
void nslog_log(const char *file, const char *func, int ln, const char *format, ...)
{
va_list ap;
fprintf(logf, "%s %s:%i %s: ", nslog_gettime(), file, ln, func);
va_start(ap, format);
vfprintf(stderr, format, ap);
vfprintf(logf, format, ap);
va_end(ap);
fputc('\n', logf);
}
#endif

14
utils/log.h
View File

@ -47,14 +47,7 @@ extern nserror nslog_init(nslog_ensure_t *ensure, int *pargc, char **argv);
# define LOG(format, ...) ((void) 0)
#else
/**
* Obtain a formatted string suitable for prepending to a log message
*
* \return formatted string of the time since first log call
*/
extern const char *nslog_gettime(void);
extern void nslog_log(const char *format, ...) __attribute__ ((format (printf, 1, 2)));
extern void nslog_log(const char *file, const char *func, int ln, const char *format, ...) __attribute__ ((format (printf, 4, 5)));
# ifdef __GNUC__
# define LOG_FN __PRETTY_FUNCTION__
@ -70,10 +63,7 @@ extern void nslog_log(const char *format, ...) __attribute__ ((format (printf, 1
#define LOG(format, args...) \
do { \
if (verbose_log) { \
nslog_log("%s " __FILE__ " %s %i: ", \
nslog_gettime(), LOG_FN, LOG_LN); \
nslog_log(format , ##args); \
nslog_log("\n"); \
nslog_log(__FILE__, LOG_FN, LOG_LN, format , ##args); \
} \
} while(0)