varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2026-02-12 16:10:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsysprof-capture: Replace G_{UN,}LIKELY with SYSPROF_{UN,}LIKELY

Browse Source 
This does the same thing for modern compilers, but without the GLib
dependency.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Helps: #40
This commit is contained in:
Philip Withnall
2020-07-01 16:52:19 +01:00
parent c9f54fcc68
commit f925fab564
7 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsysprof-capture/sysprof-capture-condition.c
View File

@ -340,7 +340,7 @@ sysprof_capture_condition_new_where_time_between (int64_t begin_time,
{ {
SysprofCaptureCondition *self; SysprofCaptureCondition *self;
if G_UNLIKELY (begin_time > end_time) if SYSPROF_UNLIKELY (begin_time > end_time)
{ {
int64_t tmp = begin_time; int64_t tmp = begin_time;
begin_time = end_time; begin_time = end_time;

26
src/libsysprof-capture/sysprof-capture-reader.c
View File

@ -282,7 +282,7 @@ sysprof_capture_reader_bswap_frame (SysprofCaptureReader *self,
assert (self != NULL); assert (self != NULL);
assert (frame!= NULL); assert (frame!= NULL);
if (G_UNLIKELY (self->endian != G_BYTE_ORDER)) if (SYSPROF_UNLIKELY (self->endian != G_BYTE_ORDER))
{ {
frame->len = GUINT16_SWAP_LE_BE (frame->len); frame->len = GUINT16_SWAP_LE_BE (frame->len);
frame->cpu = GUINT16_SWAP_LE_BE (frame->cpu); frame->cpu = GUINT16_SWAP_LE_BE (frame->cpu);
@ -298,7 +298,7 @@ sysprof_capture_reader_bswap_file_chunk (SysprofCaptureReader *self,
assert (self != NULL); assert (self != NULL);
assert (file_chunk != NULL); assert (file_chunk != NULL);
if (G_UNLIKELY (self->endian != G_BYTE_ORDER)) if (SYSPROF_UNLIKELY (self->endian != G_BYTE_ORDER))
file_chunk->len = GUINT16_SWAP_LE_BE (file_chunk->len); file_chunk->len = GUINT16_SWAP_LE_BE (file_chunk->len);
} }
@ -309,7 +309,7 @@ sysprof_capture_reader_bswap_log (SysprofCaptureReader *self,
assert (self != NULL); assert (self != NULL);
assert (log != NULL); assert (log != NULL);
if (G_UNLIKELY (self->endian != G_BYTE_ORDER)) if (SYSPROF_UNLIKELY (self->endian != G_BYTE_ORDER))
log->severity = GUINT16_SWAP_LE_BE (log->severity); log->severity = GUINT16_SWAP_LE_BE (log->severity);
} }
@ -320,7 +320,7 @@ sysprof_capture_reader_bswap_map (SysprofCaptureReader *self,
assert (self != NULL); assert (self != NULL);
assert (map != NULL); assert (map != NULL);
if (G_UNLIKELY (self->endian != G_BYTE_ORDER)) if (SYSPROF_UNLIKELY (self->endian != G_BYTE_ORDER))
{ {
map->start = GUINT64_SWAP_LE_BE (map->start); map->start = GUINT64_SWAP_LE_BE (map->start);
map->end = GUINT64_SWAP_LE_BE (map->end); map->end = GUINT64_SWAP_LE_BE (map->end);
@ -336,7 +336,7 @@ sysprof_capture_reader_bswap_mark (SysprofCaptureReader *self,
assert (self != NULL); assert (self != NULL);
assert (mark != NULL); assert (mark != NULL);
if (G_UNLIKELY (self->endian != G_BYTE_ORDER)) if (SYSPROF_UNLIKELY (self->endian != G_BYTE_ORDER))
mark->duration = GUINT64_SWAP_LE_BE (mark->duration); mark->duration = GUINT64_SWAP_LE_BE (mark->duration);
} }
@ -347,7 +347,7 @@ sysprof_capture_reader_bswap_jitmap (SysprofCaptureReader *self,
assert (self != NULL); assert (self != NULL);
assert (jitmap != NULL); assert (jitmap != NULL);
if (G_UNLIKELY (self->endian != G_BYTE_ORDER)) if (SYSPROF_UNLIKELY (self->endian != G_BYTE_ORDER))
jitmap->n_jitmaps = GUINT64_SWAP_LE_BE (jitmap->n_jitmaps); jitmap->n_jitmaps = GUINT64_SWAP_LE_BE (jitmap->n_jitmaps);
} }
@ -531,7 +531,7 @@ sysprof_capture_reader_read_fork (SysprofCaptureReader *self)
if (fk != NULL) if (fk != NULL)
{ {
if (G_UNLIKELY (self->endian != G_BYTE_ORDER)) if (SYSPROF_UNLIKELY (self->endian != G_BYTE_ORDER))
fk->child_pid = GUINT32_SWAP_LE_BE (fk->child_pid); fk->child_pid = GUINT32_SWAP_LE_BE (fk->child_pid);
} }
@ -660,7 +660,7 @@ sysprof_capture_reader_read_mark (SysprofCaptureReader *self)
((char *)mark)[mark->frame.len - 1] = 0; ((char *)mark)[mark->frame.len - 1] = 0;
/* Maybe update end-time */ /* Maybe update end-time */
if G_UNLIKELY ((mark->frame.time + mark->duration) > self->end_time) if SYSPROF_UNLIKELY ((mark->frame.time + mark->duration) > self->end_time)
self->end_time = mark->frame.time + mark->duration; self->end_time = mark->frame.time + mark->duration;
return mark; return mark;
@ -843,7 +843,7 @@ sysprof_capture_reader_read_sample (SysprofCaptureReader *self)
sample = (SysprofCaptureSample *)(void *)&self->buf[self->pos]; sample = (SysprofCaptureSample *)(void *)&self->buf[self->pos];
if (G_UNLIKELY (self->endian != G_BYTE_ORDER)) if (SYSPROF_UNLIKELY (self->endian != G_BYTE_ORDER))
{ {
unsigned int i; unsigned int i;
@ -876,7 +876,7 @@ sysprof_capture_reader_read_counter_define (SysprofCaptureReader *self)
if (def->frame.len < sizeof *def) if (def->frame.len < sizeof *def)
return NULL; return NULL;
if (G_UNLIKELY (self->endian != G_BYTE_ORDER)) if (SYSPROF_UNLIKELY (self->endian != G_BYTE_ORDER))
def->n_counters = GUINT16_SWAP_LE_BE (def->n_counters); def->n_counters = GUINT16_SWAP_LE_BE (def->n_counters);
if (def->frame.len < (sizeof *def + (sizeof (SysprofCaptureCounterDefine) * def->n_counters))) if (def->frame.len < (sizeof *def + (sizeof (SysprofCaptureCounterDefine) * def->n_counters)))
@ -887,7 +887,7 @@ sysprof_capture_reader_read_counter_define (SysprofCaptureReader *self)
def = (SysprofCaptureCounterDefine *)(void *)&self->buf[self->pos]; def = (SysprofCaptureCounterDefine *)(void *)&self->buf[self->pos];
if (G_UNLIKELY (self->endian != G_BYTE_ORDER)) if (SYSPROF_UNLIKELY (self->endian != G_BYTE_ORDER))
{ {
unsigned int i; unsigned int i;
@ -934,7 +934,7 @@ sysprof_capture_reader_read_counter_set (SysprofCaptureReader *self)
set = (SysprofCaptureCounterSet *)(void *)&self->buf[self->pos]; set = (SysprofCaptureCounterSet *)(void *)&self->buf[self->pos];
if (G_UNLIKELY (self->endian != G_BYTE_ORDER)) if (SYSPROF_UNLIKELY (self->endian != G_BYTE_ORDER))
{ {
unsigned int i; unsigned int i;
@ -1424,7 +1424,7 @@ sysprof_capture_reader_read_allocation (SysprofCaptureReader *self)
ma = (SysprofCaptureAllocation *)(void *)&self->buf[self->pos]; ma = (SysprofCaptureAllocation *)(void *)&self->buf[self->pos];
if (G_UNLIKELY (self->endian != G_BYTE_ORDER)) if (SYSPROF_UNLIKELY (self->endian != G_BYTE_ORDER))
{ {
for (unsigned int i = 0; i < ma->n_addrs; i++) for (unsigned int i = 0; i < ma->n_addrs; i++)
ma->addrs[i] = GUINT64_SWAP_LE_BE (ma->addrs[i]); ma->addrs[i] = GUINT64_SWAP_LE_BE (ma->addrs[i]);

3
src/libsysprof-capture/sysprof-capture-util.c
View File

@ -70,6 +70,7 @@
#endif #endif
#include "sysprof-capture-util-private.h" #include "sysprof-capture-util-private.h"
#include "sysprof-macros.h"
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
static G_LOCK_DEFINE (_sysprof_io_sync); static G_LOCK_DEFINE (_sysprof_io_sync);
@ -80,7 +81,7 @@ size_t
{ {
static size_t pgsz = 0; static size_t pgsz = 0;
if G_UNLIKELY (pgsz == 0) if SYSPROF_UNLIKELY (pgsz == 0)
{ {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
SYSTEM_INFO system_info; SYSTEM_INFO system_info;

4
src/libsysprof-capture/sysprof-capture-writer.c
View File

@ -433,7 +433,7 @@ sysprof_capture_writer_insert_jitmap (SysprofCaptureWriter *self,
{ {
SysprofCaptureJitmapBucket *bucket = &self->addr_hash[i]; SysprofCaptureJitmapBucket *bucket = &self->addr_hash[i];
if (G_LIKELY (bucket->str == NULL)) if (SYSPROF_LIKELY (bucket->str == NULL))
{ {
bucket->str = dst; bucket->str = dst;
bucket->addr = addr; bucket->addr = addr;
@ -447,7 +447,7 @@ sysprof_capture_writer_insert_jitmap (SysprofCaptureWriter *self,
{ {
SysprofCaptureJitmapBucket *bucket = &self->addr_hash[i]; SysprofCaptureJitmapBucket *bucket = &self->addr_hash[i];
if (G_LIKELY (bucket->str == NULL)) if (SYSPROF_LIKELY (bucket->str == NULL))
{ {
bucket->str = dst; bucket->str = dst;
bucket->addr = addr; bucket->addr = addr;

2
src/libsysprof-capture/sysprof-clock.h
View File

@ -80,7 +80,7 @@ sysprof_clock_get_current_time (void)
struct timespec ts; struct timespec ts;
SysprofClock clock = sysprof_clock; SysprofClock clock = sysprof_clock;
if G_UNLIKELY (clock == -1) if SYSPROF_UNLIKELY (clock == -1)
clock = CLOCK_MONOTONIC; clock = CLOCK_MONOTONIC;
clock_gettime (clock, &ts); clock_gettime (clock, &ts);

10
src/libsysprof-capture/sysprof-collector.c
View File

@ -224,10 +224,10 @@ sysprof_collector_get (void)
const SysprofCollector *collector = g_private_get (&collector_key); const SysprofCollector *collector = g_private_get (&collector_key);
/* We might have gotten here recursively */ /* We might have gotten here recursively */
if G_UNLIKELY (collector == COLLECTOR_INVALID) if SYSPROF_UNLIKELY (collector == COLLECTOR_INVALID)
return COLLECTOR_INVALID; return COLLECTOR_INVALID;
if G_LIKELY (collector != NULL) if SYSPROF_LIKELY (collector != NULL)
return collector; return collector;
if (use_single_trace () && shared_collector != COLLECTOR_INVALID) if (use_single_trace () && shared_collector != COLLECTOR_INVALID)
@ -278,9 +278,9 @@ sysprof_collector_init (void)
#define COLLECTOR_BEGIN \ #define COLLECTOR_BEGIN \
G_STMT_START { \ G_STMT_START { \
const SysprofCollector *collector = sysprof_collector_get (); \ const SysprofCollector *collector = sysprof_collector_get (); \
if G_LIKELY (collector->buffer) \ if SYSPROF_LIKELY (collector->buffer) \
{ \ { \
if G_UNLIKELY (collector->is_shared) \ if SYSPROF_UNLIKELY (collector->is_shared) \
G_LOCK (control_fd); \ G_LOCK (control_fd); \
\ \
{ {
@ -288,7 +288,7 @@ sysprof_collector_init (void)
#define COLLECTOR_END \ #define COLLECTOR_END \
} \ } \
\ \
if G_UNLIKELY (collector->is_shared) \ if SYSPROF_UNLIKELY (collector->is_shared) \
G_UNLOCK (control_fd); \ G_UNLOCK (control_fd); \
} \ } \
} G_STMT_END } G_STMT_END

8
src/libsysprof-capture/sysprof-macros.h
View File

@ -72,3 +72,11 @@
#else #else
#define SYSPROF_INTERNAL #define SYSPROF_INTERNAL
#endif #endif
#if defined(__GNUC__)
#define SYSPROF_LIKELY(expr) (__builtin_expect (!!(expr), 1))
#define SYSPROF_UNLIKELY(expr) (__builtin_expect (!!(expr), 0))
#else
#define SYSPROF_LIKELY(expr) (expr)
#define SYSPROF_UNLIKELY(expr) (expr)
#endif