varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2025-12-31 20:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsysprof-capture: Open-code MAX and CLAMP macros

Browse Source 
The macros don’t seem to make things sufficiently much clearer that it
makes sense to provide them.

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

Helps: #40
This commit is contained in:
Philip Withnall
2020-07-02 13:04:30 +01:00
parent d83adffd2d
commit b558e7b128
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,7 +165,7 @@ sysprof_capture_reader_discover_end_time (SysprofCaptureReader *self)
const SysprofCaptureMark *mark = NULL;
if ((mark = sysprof_capture_reader_read_mark (self)))
end_time = frame.time + MAX (0, mark->duration);
end_time = frame.time + ((mark->duration > 0) ? mark->duration : 0);
}
break;
@ -1145,7 +1145,7 @@ sysprof_capture_reader_get_end_time (SysprofCaptureReader *self)
end_time = self->header.end_time;
}
return MAX (self->end_time, end_time);
return (self->end_time > end_time) ? self->end_time : end_time;
}
/**

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

@ -327,7 +327,7 @@ sysprof_collector_allocate (SysprofCaptureAddress alloc_addr,
else
n_addrs = 0;
ev->n_addrs = CLAMP (n_addrs, 0, MAX_UNWIND_DEPTH);
ev->n_addrs = ((n_addrs < 0) ? 0 : (n_addrs > MAX_UNWIND_DEPTH) ? MAX_UNWIND_DEPTH : n_addrs);
ev->frame.len = sizeof *ev + sizeof (SysprofCaptureAddress) * ev->n_addrs;
ev->frame.type = SYSPROF_CAPTURE_FRAME_ALLOCATION;
ev->frame.cpu = _do_getcpu ();
@ -364,7 +364,7 @@ sysprof_collector_sample (SysprofBacktraceFunc backtrace_func,
else
n_addrs = 0;
ev->n_addrs = CLAMP (n_addrs, 0, MAX_UNWIND_DEPTH);
ev->n_addrs = ((n_addrs < 0) ? 0 : (n_addrs > MAX_UNWIND_DEPTH) ? MAX_UNWIND_DEPTH : n_addrs);
ev->frame.len = sizeof *ev + sizeof (SysprofCaptureAddress) * ev->n_addrs;
ev->frame.type = SYSPROF_CAPTURE_FRAME_SAMPLE;
ev->frame.cpu = _do_getcpu ();