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: Drop GError usage from SysprofCaptureReader

Browse Source 
Use `errno` instead, which is icky, but given that all of the failure
modes are from POSIX I/O functions, it’s at least in keeping with them.

This is a major API break.

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

Helps: #40
This commit is contained in:
Philip Withnall
2020-07-02 12:56:12 +01:00
parent fde278fb7f
commit e19d70bca0
19 changed files with 114 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/tests/allocs-by-size.c
View File

@ -134,9 +134,10 @@ main (gint argc,
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
if (!(reader = sysprof_capture_reader_new (filename, &error)))
if (!(reader = sysprof_capture_reader_new (filename)))
{
g_printerr ("%s\n", error->message);
int errsv = errno;
g_printerr ("%s\n", g_strerror (errsv));
return EXIT_FAILURE;
}

5
src/tests/allocs-within-mark.c
View File

@ -205,9 +205,10 @@ main (gint argc,
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
if (!(reader = sysprof_capture_reader_new (filename, &error)))
if (!(reader = sysprof_capture_reader_new (filename)))
{
g_printerr ("%s\n", error->message);
int errsv = errno;
g_printerr ("%s\n", g_strerror (errsv));
return EXIT_FAILURE;
}

6
src/tests/cross-thread-frees.c
View File

@ -116,7 +116,6 @@ main (gint argc,
{
SysprofCaptureReader *reader;
const gchar *filename = argv[1];
g_autoptr(GError) error = NULL;
if (argc < 2)
{
@ -124,9 +123,10 @@ main (gint argc,
return EXIT_FAILURE;
}
if (!(reader = sysprof_capture_reader_new (filename, &error)))
if (!(reader = sysprof_capture_reader_new (filename)))
{
g_printerr ("%s\n", error->message);
int errsv = errno;
g_printerr ("%s\n", g_strerror (errsv));
return EXIT_FAILURE;
}

6
src/tests/find-temp-allocs.c
View File

@ -141,7 +141,6 @@ main (gint argc,
{
SysprofCaptureReader *reader;
const gchar *filename = argv[1];
g_autoptr(GError) error = NULL;
if (argc < 2)
{
@ -149,9 +148,10 @@ main (gint argc,
return EXIT_FAILURE;
}
if (!(reader = sysprof_capture_reader_new (filename, &error)))
if (!(reader = sysprof_capture_reader_new (filename)))
{
g_printerr ("%s\n", error->message);
int errsv = errno;
g_printerr ("%s\n", g_strerror (errsv));
return EXIT_FAILURE;
}

5
src/tests/memory-stack-stash.c
View File

@ -77,9 +77,10 @@ main (gint argc,
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
if (!(reader = sysprof_capture_reader_new (filename, &error)))
if (!(reader = sysprof_capture_reader_new (filename)))
{
g_printerr ("%s\n", error->message);
int errsv = errno;
g_printerr ("%s\n", g_strerror (errsv));
return EXIT_FAILURE;
}

6
src/tests/show-page-usage.c
View File

@ -168,7 +168,6 @@ main (gint argc,
SysprofCaptureReader *reader;
const gchar *filename = argv[1];
g_autoptr(SysprofProfile) memprof = NULL;
g_autoptr(GError) error = NULL;
if (argc < 2)
{
@ -178,9 +177,10 @@ main (gint argc,
main_loop = g_main_loop_new (NULL, FALSE);
if (!(reader = sysprof_capture_reader_new (filename, &error)))
if (!(reader = sysprof_capture_reader_new (filename)))
{
g_printerr ("%s\n", error->message);
int errsv = errno;
g_printerr ("%s\n", g_strerror (errsv));
return EXIT_FAILURE;
}

6
src/tests/test-addr-decode.c
View File

@ -11,7 +11,6 @@ main (gint argc,
{
g_autoptr(SysprofCaptureReader) reader = NULL;
g_autoptr(SysprofSymbolResolver) resolver = NULL;
g_autoptr(GError) error = NULL;
SysprofCaptureFrameType type;
if (argc != 2)
@ -20,9 +19,10 @@ main (gint argc,
return 1;
}
if (!(reader = sysprof_capture_reader_new (argv[1], &error)))
if (!(reader = sysprof_capture_reader_new (argv[1])))
{
g_printerr ("%s\n", error->message);
int errsv = errno;
g_printerr ("%s\n", g_strerror (errsv));
return 1;
}

5
src/tests/test-addr-map.c
View File

@ -92,9 +92,10 @@ main (gint argc,
return 1;
}
if (!(reader = sysprof_capture_reader_new (argv[1], &error)))
if (!(reader = sysprof_capture_reader_new (argv[1])))
{
g_printerr ("%s\n", error->message);
int errsv = errno;
g_printerr ("%s\n", g_strerror (errsv));
return 1;
}

8
src/tests/test-capture-cursor.c
View File

@ -37,20 +37,18 @@ test_cursor_basic (void)
SysprofCaptureReader *reader;
SysprofCaptureWriter *writer;
SysprofCaptureCursor *cursor;
GError *error = NULL;
gint64 t = SYSPROF_CAPTURE_CURRENT_TIME;
guint i;
gint r;
gint count = 0;
writer = sysprof_capture_writer_new ("capture-cursor-file", 0);
g_assert (writer != NULL);
g_assert_nonnull (writer);
sysprof_capture_writer_flush (writer);
reader = sysprof_capture_reader_new ("capture-cursor-file", &error);
g_assert_no_error (error);
g_assert (reader != NULL);
reader = sysprof_capture_reader_new ("capture-cursor-file");
g_assert_nonnull (reader);
for (i = 0; i < 100; i++)
{

68
src/tests/test-capture.c
View File

@ -61,9 +61,8 @@ test_reader_basic (void)
sysprof_capture_writer_flush (writer);
reader = sysprof_capture_reader_new ("capture-file", &error);
g_assert_no_error (error);
g_assert (reader != NULL);
reader = sysprof_capture_reader_new ("capture-file");
g_assert_nonnull (reader);
for (i = 0; i < 100; i++)
{
@ -430,9 +429,8 @@ test_reader_basic (void)
g_clear_pointer (&writer, sysprof_capture_writer_unref);
g_clear_pointer (&reader, sysprof_capture_reader_unref);
reader = sysprof_capture_reader_new ("capture-file.bak", &error);
g_assert_no_error (error);
g_assert (reader != NULL);
reader = sysprof_capture_reader_new ("capture-file.bak");
g_assert_nonnull (reader);
for (i = 0; i < 2; i++)
{
@ -481,9 +479,8 @@ test_writer_splice (void)
g_clear_pointer (&writer1, sysprof_capture_writer_unref);
g_clear_pointer (&writer2, sysprof_capture_writer_unref);
reader = sysprof_capture_reader_new ("writer2.syscap", &error);
g_assert_no_error (error);
g_assert (reader != NULL);
reader = sysprof_capture_reader_new ("writer2.syscap");
g_assert_nonnull (reader);
for (i = 0; i < 1000; i++)
{
@ -511,7 +508,6 @@ test_reader_splice (void)
SysprofCaptureWriter *writer2;
SysprofCaptureReader *reader;
SysprofCaptureFrameType type;
GError *error = NULL;
guint i;
guint count;
gint r;
@ -527,9 +523,8 @@ test_reader_splice (void)
g_clear_pointer (&writer1, sysprof_capture_writer_unref);
reader = sysprof_capture_reader_new ("writer1.syscap", &error);
g_assert_no_error (error);
g_assert (reader != NULL);
reader = sysprof_capture_reader_new ("writer1.syscap");
g_assert_nonnull (reader);
/* advance to the end of the reader to non-start boundary for fd */
@ -546,14 +541,14 @@ test_reader_splice (void)
r = sysprof_capture_reader_peek_type (reader, &type);
g_assert_cmpint (r, ==, FALSE);
r = sysprof_capture_reader_splice (reader, writer2, &error);
g_assert_no_error (error);
g_assert_cmpint (r, ==, TRUE);
r = sysprof_capture_reader_splice (reader, writer2);
g_assert_true (r);
g_clear_pointer (&reader, sysprof_capture_reader_unref);
g_clear_pointer (&writer2, sysprof_capture_writer_unref);
reader = sysprof_capture_reader_new ("writer2.syscap", 0);
reader = sysprof_capture_reader_new ("writer2.syscap");
g_assert_nonnull (reader);
for (i = 0; i < 1000; i++)
{
@ -570,19 +565,16 @@ test_reader_splice (void)
g_clear_pointer (&reader, sysprof_capture_reader_unref);
reader = sysprof_capture_reader_new ("writer2.syscap", &error);
g_assert_no_error (error);
g_assert (reader != NULL);
reader = sysprof_capture_reader_new ("writer2.syscap");
g_assert_nonnull (reader);
r = sysprof_capture_reader_save_as (reader, "writer3.syscap", &error);
g_assert_no_error (error);
g_assert_cmpint (r, ==, TRUE);
r = sysprof_capture_reader_save_as (reader, "writer3.syscap");
g_assert_true (r);
g_clear_pointer (&reader, sysprof_capture_reader_unref);
reader = sysprof_capture_reader_new ("writer3.syscap", &error);
g_assert_no_error (error);
g_assert (reader != NULL);
reader = sysprof_capture_reader_new ("writer3.syscap");
g_assert_nonnull (reader);
count = 0;
while (sysprof_capture_reader_skip (reader))
@ -603,7 +595,6 @@ test_reader_writer_log (void)
SysprofCaptureReader *reader;
const SysprofCaptureLog *log;
SysprofCaptureFrameType type;
GError *error = NULL;
gint r;
writer = sysprof_capture_writer_new ("log1.syscap", 0);
@ -614,9 +605,8 @@ test_reader_writer_log (void)
g_clear_pointer (&writer, sysprof_capture_writer_unref);
reader = sysprof_capture_reader_new ("log1.syscap", &error);
g_assert_no_error (error);
g_assert (reader != NULL);
reader = sysprof_capture_reader_new ("log1.syscap");
g_assert_nonnull (reader);
log = sysprof_capture_reader_read_log (reader);
g_assert_nonnull (log);
@ -657,7 +647,6 @@ test_reader_writer_mark (void)
SysprofCaptureReader *reader;
const SysprofCaptureMark *mark;
SysprofCaptureFrameType type;
GError *error = NULL;
gint r;
writer = sysprof_capture_writer_new ("mark1.syscap", 0);
@ -667,9 +656,8 @@ test_reader_writer_mark (void)
g_clear_pointer (&writer, sysprof_capture_writer_unref);
reader = sysprof_capture_reader_new ("mark1.syscap", &error);
g_assert_no_error (error);
g_assert (reader != NULL);
reader = sysprof_capture_reader_new ("mark1.syscap");
g_assert_nonnull (reader);
mark = sysprof_capture_reader_read_mark (reader);
g_assert_nonnull (mark);
@ -704,7 +692,6 @@ test_reader_writer_metadata (void)
SysprofCaptureReader *reader;
const SysprofCaptureMetadata *metadata;
SysprofCaptureFrameType type;
GError *error = NULL;
gint r;
writer = sysprof_capture_writer_new ("metadata1.syscap", 0);
@ -717,9 +704,8 @@ test_reader_writer_metadata (void)
g_clear_pointer (&writer, sysprof_capture_writer_unref);
reader = sysprof_capture_reader_new ("metadata1.syscap", &error);
g_assert_no_error (error);
g_assert (reader != NULL);
reader = sysprof_capture_reader_new ("metadata1.syscap");
g_assert_nonnull (reader);
metadata = sysprof_capture_reader_read_metadata (reader);
g_assert_nonnull (metadata);
@ -752,7 +738,6 @@ test_reader_writer_file (void)
SysprofCaptureWriter *writer;
SysprofCaptureReader *reader;
SysprofCaptureFrameType type;
GError *error = NULL;
gsize data_len;
guint count = 0;
gint fd;
@ -775,9 +760,8 @@ test_reader_writer_file (void)
g_clear_pointer (&writer, sysprof_capture_writer_unref);
reader = sysprof_capture_reader_new ("file1.syscap", &error);
g_assert_no_error (error);
g_assert (reader != NULL);
reader = sysprof_capture_reader_new ("file1.syscap");
g_assert_nonnull (reader);
while (count < 2)
{

8
src/tests/test-resolvers.c
View File

@ -43,8 +43,12 @@ main (gint argc,
g_ptr_array_add (resolvers, sysprof_jitmap_symbol_resolver_new ());
g_ptr_array_add (resolvers, sysprof_kernel_symbol_resolver_new ());
if (!(reader = sysprof_capture_reader_new (filename, &error)))
g_error ("%s", error->message);
if (!(reader = sysprof_capture_reader_new (filename)))
{
int errsv = errno;
g_error ("%s", g_strerror (errsv));
return 1;
}
for (guint r = 0; r < resolvers->len; r++)
{