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

Return error when the counter can't be opened.

Browse Source
This commit is contained in:
Søren Sandmann Pedersen
2009-11-02 13:30:04 -05:00
parent 1b64f1d924
commit 71f2cd3a64
5 changed files with 51 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
collector.c
View File

@ -295,7 +295,7 @@ on_read (gpointer data)
} while (0)
static void *
map_buffer (counter_t *counter)
map_buffer (counter_t *counter, GError **err)
{
int n_bytes = N_PAGES * get_page_size();
void *address, *a;
@ -331,8 +331,9 @@ map_buffer (counter_t *counter)
}
static counter_t *
counter_new (Collector *collector,
int cpu)
counter_new (Collector *collector,
int cpu,
GError **err)
{
struct perf_counter_attr attr;
counter_t *counter;
@ -370,20 +371,20 @@ counter_new (Collector *collector,
if (fd < 0)
{
fail ("perf_counter_open");
g_set_error (err, COLLECTOR_ERROR, COLLECTOR_ERROR_CANT_OPEN_COUNTER,
"Could not open performance counter: %s\n",
strerror (errno));
return NULL;
}
counter->collector = collector;
counter->fd = fd;
counter->mmap_page = map_buffer (counter);
counter->mmap_page = map_buffer (counter, err);
if (counter->mmap_page == MAP_FAILED)
{
fail ("mmap");
return NULL;
}
counter->data = (uint8_t *)counter->mmap_page + get_page_size ();
counter->tail = 0;
@ -667,7 +668,7 @@ collector_start (Collector *collector,
for (i = 0; i < n_cpus; ++i)
{
counter_t *counter = counter_new (collector, i);
counter_t *counter = counter_new (collector, i, err);
collector->counters = g_list_append (collector->counters, counter);
}