GNOME.org
 

[sysprof/wip/chergert/mem-preload] memprof: rename to memprof profile

commit dfcd0cd05ac867b3c3f00ac04f8a3e2f549a0be5
Author: Christian Hergert <chergert redhat com>
Date:   Tue Feb 4 15:19:30 2020 -0800

    memprof: rename to memprof profile

 src/libsysprof-ui/sysprof-memprof-page.c           |  32 +++---
 src/libsysprof-ui/sysprof-memprof-page.h           |  12 +--
 src/libsysprof/meson.build                         |   4 +-
 ...-memory-profile.c => sysprof-memprof-profile.c} | 120 ++++++++++-----------
 ...-memory-profile.h => sysprof-memprof-profile.h} |  20 ++--
 src/libsysprof/sysprof.h                           |   2 +-
 src/tests/show-page-usage.c                        |   6 +-
 7 files changed, 98 insertions(+), 98 deletions(-)
---
diff --git a/src/libsysprof-ui/sysprof-memprof-page.c b/src/libsysprof-ui/sysprof-memprof-page.c
index 0220923..02c061b 100644
--- a/src/libsysprof-ui/sysprof-memprof-page.c
+++ b/src/libsysprof-ui/sysprof-memprof-page.c
@@ -50,7 +50,7 @@
 
 typedef struct
 {
-  SysprofMemoryProfile  *profile;
+  SysprofMemprofProfile    *profile;
 
   GtkTreeView              *callers_view;
   GtkTreeView              *functions_view;
@@ -107,7 +107,7 @@ sysprof_memprof_page_get_profile_size (SysprofMemprofPage *self)
   if (priv->profile == NULL)
     return 0;
 
-  if (NULL == (stash = sysprof_memory_profile_get_stash (priv->profile)))
+  if (NULL == (stash = sysprof_memprof_profile_get_stash (priv->profile)))
     return 0;
 
   for (node = stack_stash_get_root (stash); node != NULL; node = node->siblings)
@@ -153,7 +153,7 @@ build_functions_store (StackNode *node,
 
 static void
 sysprof_memprof_page_load (SysprofMemprofPage    *self,
-                          SysprofMemoryProfile *profile)
+                          SysprofMemprofProfile *profile)
 {
   SysprofMemprofPagePrivate *priv = sysprof_memprof_page_get_instance_private (self);
   GtkListStore *functions;
@@ -166,7 +166,7 @@ sysprof_memprof_page_load (SysprofMemprofPage    *self,
   } state = { 0 };
 
   g_assert (SYSPROF_IS_MEMPROF_PAGE (self));
-  g_assert (SYSPROF_IS_MEMORY_PROFILE (profile));
+  g_assert (SYSPROF_IS_MEMPROF_PROFILE (profile));
 
   /*
    * TODO: This is probably the type of thing we want to do off the main
@@ -180,10 +180,10 @@ sysprof_memprof_page_load (SysprofMemprofPage    *self,
   if (!g_set_object (&priv->profile, profile))
     return;
 
-  if (sysprof_memory_profile_is_empty (profile))
+  if (sysprof_memprof_profile_is_empty (profile))
     return;
 
-  stash = sysprof_memory_profile_get_stash (profile);
+  stash = sysprof_memprof_profile_get_stash (profile);
 
   for (n = stack_stash_get_root (stash); n; n = n->siblings)
     state.profile_size += n->total;
@@ -230,7 +230,7 @@ sysprof_memprof_page_unload (SysprofMemprofPage *self)
   SysprofMemprofPagePrivate *priv = sysprof_memprof_page_get_instance_private (self);
 
   g_assert (SYSPROF_IS_MEMPROF_PAGE (self));
-  g_assert (SYSPROF_IS_MEMORY_PROFILE (priv->profile));
+  g_assert (SYSPROF_IS_MEMPROF_PROFILE (priv->profile));
 
   g_queue_clear (priv->history);
   g_clear_object (&priv->profile);
@@ -246,9 +246,9 @@ sysprof_memprof_page_unload (SysprofMemprofPage *self)
 /**
  * sysprof_memprof_page_get_profile:
  *
- * Returns: (transfer none): An #SysprofMemoryProfile.
+ * Returns: (transfer none): An #SysprofMemprofProfile.
  */
-SysprofMemoryProfile *
+SysprofMemprofProfile *
 sysprof_memprof_page_get_profile (SysprofMemprofPage *self)
 {
   SysprofMemprofPagePrivate *priv = sysprof_memprof_page_get_instance_private (self);
@@ -260,12 +260,12 @@ sysprof_memprof_page_get_profile (SysprofMemprofPage *self)
 
 void
 sysprof_memprof_page_set_profile (SysprofMemprofPage    *self,
-                                 SysprofMemoryProfile *profile)
+                                  SysprofMemprofProfile *profile)
 {
   SysprofMemprofPagePrivate *priv = sysprof_memprof_page_get_instance_private (self);
 
   g_return_if_fail (SYSPROF_IS_MEMPROF_PAGE (self));
-  g_return_if_fail (!profile || SYSPROF_IS_MEMORY_PROFILE (profile));
+  g_return_if_fail (!profile || SYSPROF_IS_MEMPROF_PROFILE (profile));
 
   if (profile != priv->profile)
     {
@@ -643,7 +643,7 @@ sysprof_memprof_page_tag_data_func (GtkTreeViewColumn *column,
     {
       GQuark tag;
 
-      tag = sysprof_memory_profile_get_tag (priv->profile, GSIZE_TO_POINTER (node->data));
+      tag = sysprof_memprof_profile_get_tag (priv->profile, GSIZE_TO_POINTER (node->data));
       if (tag != 0)
         str = g_quark_to_string (tag);
     }
@@ -789,7 +789,7 @@ sysprof_memprof_page_generate_cb (GObject      *object,
   if (!sysprof_profile_generate_finish (profile, result, &error))
     g_task_return_error (task, g_steal_pointer (&error));
   else
-    sysprof_memprof_page_set_profile (self, SYSPROF_MEMORY_PROFILE (profile));
+    sysprof_memprof_page_set_profile (self, SYSPROF_MEMPROF_PROFILE (profile));
 }
 
 static void
@@ -816,7 +816,7 @@ sysprof_memprof_page_load_async (SysprofPage             *page,
 
   copy = sysprof_capture_reader_copy (reader);
 
-  profile = sysprof_memory_profile_new_with_selection (selection);
+  profile = sysprof_memprof_profile_new_with_selection (selection);
   sysprof_profile_set_reader (profile, reader);
   sysprof_profile_generate (profile,
                             cancellable,
@@ -907,7 +907,7 @@ sysprof_memprof_page_class_init (SysprofMemprofPageClass *klass)
     g_param_spec_object ("profile",
                          "Profile",
                          "The callgraph profile to view",
-                         SYSPROF_TYPE_MEMORY_PROFILE,
+                         SYSPROF_TYPE_MEMPROF_PROFILE,
                          (G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_properties (object_class, N_PROPS, properties);
@@ -1160,7 +1160,7 @@ sysprof_memprof_page_update_descendants (SysprofMemprofPage *self,
   {
     StackStash *stash;
 
-    stash = sysprof_memory_profile_get_stash (priv->profile);
+    stash = sysprof_memprof_profile_get_stash (priv->profile);
     if (stash != NULL)
       {
         Descendant *tree;
diff --git a/src/libsysprof-ui/sysprof-memprof-page.h b/src/libsysprof-ui/sysprof-memprof-page.h
index 8b5b749..1b3f7af 100644
--- a/src/libsysprof-ui/sysprof-memprof-page.h
+++ b/src/libsysprof-ui/sysprof-memprof-page.h
@@ -41,11 +41,11 @@ struct _SysprofMemprofPageClass
   gpointer _reserved[16];
 };
 
-GtkWidget            *sysprof_memprof_page_new             (void);
-SysprofMemoryProfile *sysprof_memprof_page_get_profile     (SysprofMemprofPage    *self);
-void                  sysprof_memprof_page_set_profile     (SysprofMemprofPage    *self,
-                                                           SysprofMemoryProfile *profile);
-gchar                *sysprof_memprof_page_screenshot      (SysprofMemprofPage    *self);
-guint                 sysprof_memprof_page_get_n_functions (SysprofMemprofPage    *self);
+GtkWidget             *sysprof_memprof_page_new             (void);
+SysprofMemprofProfile *sysprof_memprof_page_get_profile     (SysprofMemprofPage    *self);
+void                   sysprof_memprof_page_set_profile     (SysprofMemprofPage    *self,
+                                                             SysprofMemprofProfile *profile);
+gchar                 *sysprof_memprof_page_screenshot      (SysprofMemprofPage    *self);
+guint                  sysprof_memprof_page_get_n_functions (SysprofMemprofPage    *self);
 
 G_END_DECLS
diff --git a/src/libsysprof/meson.build b/src/libsysprof/meson.build
index 1e5430e..a7c52bd 100644
--- a/src/libsysprof/meson.build
+++ b/src/libsysprof/meson.build
@@ -16,7 +16,7 @@ libsysprof_public_sources = [
   'sysprof-kernel-symbol.c',
   'sysprof-kernel-symbol-resolver.c',
   'sysprof-local-profiler.c',
-  'sysprof-memory-profile.c',
+  'sysprof-memprof-profile.c',
   'sysprof-memprof-source.c',
   'sysprof-netdev-source.c',
   'sysprof-process-model.c',
@@ -47,7 +47,7 @@ libsysprof_public_headers = [
   'sysprof-kernel-symbol.h',
   'sysprof-kernel-symbol-resolver.h',
   'sysprof-local-profiler.h',
-  'sysprof-memory-profile.h',
+  'sysprof-memprof-profile.h',
   'sysprof-memprof-source.h',
   'sysprof-process-model.h',
   'sysprof-process-model-item.h',
diff --git a/src/libsysprof/sysprof-memory-profile.c b/src/libsysprof/sysprof-memprof-profile.c
similarity index 74%
rename from src/libsysprof/sysprof-memory-profile.c
rename to src/libsysprof/sysprof-memprof-profile.c
index 521e92c..08566ee 100644
--- a/src/libsysprof/sysprof-memory-profile.c
+++ b/src/libsysprof/sysprof-memprof-profile.c
@@ -1,4 +1,4 @@
-/* sysprof-memory-profile.c
+/* sysprof-memprof-profile.c
  *
  * Copyright 2020 Christian Hergert <chergert redhat com>
  *
@@ -18,7 +18,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-#define G_LOG_DOMAIN "sysprof-memory-profile"
+#define G_LOG_DOMAIN "sysprof-memprof-profile"
 
 #include "config.h"
 
@@ -27,7 +27,7 @@
 #include "sysprof-capture-symbol-resolver.h"
 #include "sysprof-elf-symbol-resolver.h"
 #include "sysprof-kernel-symbol-resolver.h"
-#include "sysprof-memory-profile.h"
+#include "sysprof-memprof-profile.h"
 #include "sysprof-symbol-resolver.h"
 
 #include "rax.h"
@@ -45,7 +45,7 @@ typedef struct
   GArray               *resolved;
 } Generate;
 
-struct _SysprofMemoryProfile
+struct _SysprofMemprofProfile
 {
   GObject               parent_instance;
   SysprofSelection     *selection;
@@ -55,7 +55,7 @@ struct _SysprofMemoryProfile
 
 static void profile_iface_init (SysprofProfileInterface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (SysprofMemoryProfile, sysprof_memory_profile, G_TYPE_OBJECT,
+G_DEFINE_TYPE_WITH_CODE (SysprofMemprofProfile, sysprof_memprof_profile, G_TYPE_OBJECT,
                          G_IMPLEMENT_INTERFACE (SYSPROF_TYPE_PROFILE, profile_iface_init))
 
 enum {
@@ -93,24 +93,24 @@ generate_unref (Generate *g)
 }
 
 static void
-sysprof_memory_profile_finalize (GObject *object)
+sysprof_memprof_profile_finalize (GObject *object)
 {
-  SysprofMemoryProfile *self = (SysprofMemoryProfile *)object;
+  SysprofMemprofProfile *self = (SysprofMemprofProfile *)object;
 
   g_clear_pointer (&self->g, generate_unref);
   g_clear_pointer (&self->reader, sysprof_capture_reader_unref);
   g_clear_object (&self->selection);
 
-  G_OBJECT_CLASS (sysprof_memory_profile_parent_class)->finalize (object);
+  G_OBJECT_CLASS (sysprof_memprof_profile_parent_class)->finalize (object);
 }
 
 static void
-sysprof_memory_profile_get_property (GObject    *object,
-                                     guint       prop_id,
-                                     GValue     *value,
-                                     GParamSpec *pspec)
+sysprof_memprof_profile_get_property (GObject    *object,
+                                      guint       prop_id,
+                                      GValue     *value,
+                                      GParamSpec *pspec)
 {
-  SysprofMemoryProfile *self = SYSPROF_MEMORY_PROFILE (object);
+  SysprofMemprofProfile *self = SYSPROF_MEMPROF_PROFILE (object);
 
   switch (prop_id)
     {
@@ -124,12 +124,12 @@ sysprof_memory_profile_get_property (GObject    *object,
 }
 
 static void
-sysprof_memory_profile_set_property (GObject      *object,
-                                     guint         prop_id,
-                                     const GValue *value,
-                                     GParamSpec   *pspec)
+sysprof_memprof_profile_set_property (GObject      *object,
+                                      guint         prop_id,
+                                      const GValue *value,
+                                      GParamSpec   *pspec)
 {
-  SysprofMemoryProfile *self = SYSPROF_MEMORY_PROFILE (object);
+  SysprofMemprofProfile *self = SYSPROF_MEMPROF_PROFILE (object);
 
   switch (prop_id)
     {
@@ -143,13 +143,13 @@ sysprof_memory_profile_set_property (GObject      *object,
 }
 
 static void
-sysprof_memory_profile_class_init (SysprofMemoryProfileClass *klass)
+sysprof_memprof_profile_class_init (SysprofMemprofProfileClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  object_class->finalize = sysprof_memory_profile_finalize;
-  object_class->get_property = sysprof_memory_profile_get_property;
-  object_class->set_property = sysprof_memory_profile_set_property;
+  object_class->finalize = sysprof_memprof_profile_finalize;
+  object_class->get_property = sysprof_memprof_profile_get_property;
+  object_class->set_property = sysprof_memprof_profile_set_property;
 
   properties [PROP_SELECTION] =
     g_param_spec_object ("selection",
@@ -162,23 +162,23 @@ sysprof_memory_profile_class_init (SysprofMemoryProfileClass *klass)
 }
 
 static void
-sysprof_memory_profile_init (SysprofMemoryProfile *self)
+sysprof_memprof_profile_init (SysprofMemprofProfile *self)
 {
 }
 
 SysprofProfile *
-sysprof_memory_profile_new (void)
+sysprof_memprof_profile_new (void)
 {
-  return g_object_new (SYSPROF_TYPE_MEMORY_PROFILE, NULL);
+  return g_object_new (SYSPROF_TYPE_MEMPROF_PROFILE, NULL);
 }
 
 static void
-sysprof_memory_profile_set_reader (SysprofProfile       *profile,
-                                   SysprofCaptureReader *reader)
+sysprof_memprof_profile_set_reader (SysprofProfile       *profile,
+                                    SysprofCaptureReader *reader)
 {
-  SysprofMemoryProfile *self = (SysprofMemoryProfile *)profile;
+  SysprofMemprofProfile *self = (SysprofMemprofProfile *)profile;
 
-  g_assert (SYSPROF_IS_MEMORY_PROFILE (self));
+  g_assert (SYSPROF_IS_MEMPROF_PROFILE (self));
   g_assert (reader != NULL);
 
   if (reader != self->reader)
@@ -308,10 +308,10 @@ cursor_foreach_cb (const SysprofCaptureFrame *frame,
 }
 
 static void
-sysprof_memory_profile_generate_worker (GTask        *task,
-                                        gpointer      source_object,
-                                        gpointer      task_data,
-                                        GCancellable *cancellable)
+sysprof_memprof_profile_generate_worker (GTask        *task,
+                                         gpointer      source_object,
+                                         gpointer      task_data,
+                                         GCancellable *cancellable)
 {
   SysprofCaptureCursor *cursor;
   Generate *g = task_data;
@@ -346,20 +346,20 @@ sysprof_memory_profile_generate_worker (GTask        *task,
 }
 
 static void
-sysprof_memory_profile_generate (SysprofProfile      *profile,
-                                 GCancellable        *cancellable,
-                                 GAsyncReadyCallback  callback,
-                                 gpointer             user_data)
+sysprof_memprof_profile_generate (SysprofProfile      *profile,
+                                  GCancellable        *cancellable,
+                                  GAsyncReadyCallback  callback,
+                                  gpointer             user_data)
 {
-  SysprofMemoryProfile *self = (SysprofMemoryProfile *)profile;
+  SysprofMemprofProfile *self = (SysprofMemprofProfile *)profile;
   g_autoptr(GTask) task = NULL;
   Generate *g;
 
-  g_assert (SYSPROF_IS_MEMORY_PROFILE (self));
+  g_assert (SYSPROF_IS_MEMPROF_PROFILE (self));
   g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
 
   task = g_task_new (self, cancellable, callback, user_data);
-  g_task_set_source_tag (task, sysprof_memory_profile_generate);
+  g_task_set_source_tag (task, sysprof_memprof_profile_generate);
 
   if (self->reader == NULL)
     {
@@ -385,17 +385,17 @@ sysprof_memory_profile_generate (SysprofProfile      *profile,
   g_ptr_array_add (g->resolvers, sysprof_elf_symbol_resolver_new ());
 
   g_task_set_task_data (task, g, (GDestroyNotify) generate_unref);
-  g_task_run_in_thread (task, sysprof_memory_profile_generate_worker);
+  g_task_run_in_thread (task, sysprof_memprof_profile_generate_worker);
 }
 
 static gboolean
-sysprof_memory_profile_generate_finish (SysprofProfile  *profile,
-                                        GAsyncResult    *result,
-                                        GError         **error)
+sysprof_memprof_profile_generate_finish (SysprofProfile  *profile,
+                                         GAsyncResult    *result,
+                                         GError         **error)
 {
-  SysprofMemoryProfile *self = (SysprofMemoryProfile *)profile;
+  SysprofMemprofProfile *self = (SysprofMemprofProfile *)profile;
 
-  g_assert (SYSPROF_IS_MEMORY_PROFILE (self));
+  g_assert (SYSPROF_IS_MEMPROF_PROFILE (self));
   g_assert (G_IS_TASK (result));
 
   g_clear_pointer (&self->g, generate_unref);
@@ -413,15 +413,15 @@ sysprof_memory_profile_generate_finish (SysprofProfile  *profile,
 static void
 profile_iface_init (SysprofProfileInterface *iface)
 {
-  iface->set_reader = sysprof_memory_profile_set_reader;
-  iface->generate = sysprof_memory_profile_generate;
-  iface->generate_finish = sysprof_memory_profile_generate_finish;
+  iface->set_reader = sysprof_memprof_profile_set_reader;
+  iface->generate = sysprof_memprof_profile_generate;
+  iface->generate_finish = sysprof_memprof_profile_generate_finish;
 }
 
 gpointer
-sysprof_memory_profile_get_native (SysprofMemoryProfile *self)
+sysprof_memprof_profile_get_native (SysprofMemprofProfile *self)
 {
-  g_return_val_if_fail (SYSPROF_IS_MEMORY_PROFILE (self), NULL);
+  g_return_val_if_fail (SYSPROF_IS_MEMPROF_PROFILE (self), NULL);
 
   if (self->g != NULL)
     return self->g->rax;
@@ -430,9 +430,9 @@ sysprof_memory_profile_get_native (SysprofMemoryProfile *self)
 }
 
 gpointer
-sysprof_memory_profile_get_stash (SysprofMemoryProfile *self)
+sysprof_memprof_profile_get_stash (SysprofMemprofProfile *self)
 {
-  g_return_val_if_fail (SYSPROF_IS_MEMORY_PROFILE (self), NULL);
+  g_return_val_if_fail (SYSPROF_IS_MEMPROF_PROFILE (self), NULL);
 
   if (self->g != NULL)
     return self->g->stash;
@@ -441,11 +441,11 @@ sysprof_memory_profile_get_stash (SysprofMemoryProfile *self)
 }
 
 gboolean
-sysprof_memory_profile_is_empty (SysprofMemoryProfile *self)
+sysprof_memprof_profile_is_empty (SysprofMemprofProfile *self)
 {
   StackNode *root;
 
-  g_return_val_if_fail (SYSPROF_IS_MEMORY_PROFILE (self), FALSE);
+  g_return_val_if_fail (SYSPROF_IS_MEMPROF_PROFILE (self), FALSE);
 
   return (self->g == NULL ||
           self->g->stash == NULL ||
@@ -454,10 +454,10 @@ sysprof_memory_profile_is_empty (SysprofMemoryProfile *self)
 }
 
 GQuark
-sysprof_memory_profile_get_tag (SysprofMemoryProfile *self,
-                                const gchar          *symbol)
+sysprof_memprof_profile_get_tag (SysprofMemprofProfile *self,
+                                 const gchar          *symbol)
 {
-  g_return_val_if_fail (SYSPROF_IS_MEMORY_PROFILE (self), 0);
+  g_return_val_if_fail (SYSPROF_IS_MEMPROF_PROFILE (self), 0);
 
   if (self->g != NULL)
     return GPOINTER_TO_SIZE (g_hash_table_lookup (self->g->tags, symbol));
@@ -466,9 +466,9 @@ sysprof_memory_profile_get_tag (SysprofMemoryProfile *self,
 }
 
 SysprofProfile *
-sysprof_memory_profile_new_with_selection (SysprofSelection *selection)
+sysprof_memprof_profile_new_with_selection (SysprofSelection *selection)
 {
-  return g_object_new (SYSPROF_TYPE_MEMORY_PROFILE,
+  return g_object_new (SYSPROF_TYPE_MEMPROF_PROFILE,
                        "selection", selection,
                        NULL);
 }
diff --git a/src/libsysprof/sysprof-memory-profile.h b/src/libsysprof/sysprof-memprof-profile.h
similarity index 59%
rename from src/libsysprof/sysprof-memory-profile.h
rename to src/libsysprof/sysprof-memprof-profile.h
index 2ab0767..aaae18c 100644
--- a/src/libsysprof/sysprof-memory-profile.h
+++ b/src/libsysprof/sysprof-memprof-profile.h
@@ -1,4 +1,4 @@
-/* sysprof-memory-profile.h
+/* sysprof-memprof-profile.h
  *
  * Copyright 2020 Christian Hergert <chergert redhat com>
  *
@@ -31,23 +31,23 @@
 
 G_BEGIN_DECLS
 
-#define SYSPROF_TYPE_MEMORY_PROFILE (sysprof_memory_profile_get_type())
+#define SYSPROF_TYPE_MEMPROF_PROFILE (sysprof_memprof_profile_get_type())
 
 SYSPROF_AVAILABLE_IN_ALL
-G_DECLARE_FINAL_TYPE (SysprofMemoryProfile, sysprof_memory_profile, SYSPROF, MEMORY_PROFILE, GObject)
+G_DECLARE_FINAL_TYPE (SysprofMemprofProfile, sysprof_memprof_profile, SYSPROF, MEMPROF_PROFILE, GObject)
 
 SYSPROF_AVAILABLE_IN_3_36
-SysprofProfile *sysprof_memory_profile_new                (void);
+SysprofProfile *sysprof_memprof_profile_new                (void);
 SYSPROF_AVAILABLE_IN_3_36
-SysprofProfile *sysprof_memory_profile_new_with_selection (SysprofSelection *selection);
+SysprofProfile *sysprof_memprof_profile_new_with_selection (SysprofSelection *selection);
 SYSPROF_AVAILABLE_IN_3_36
-gpointer        sysprof_memory_profile_get_native         (SysprofMemoryProfile *self);
+gpointer        sysprof_memprof_profile_get_native         (SysprofMemprofProfile *self);
 SYSPROF_AVAILABLE_IN_3_36
-gpointer        sysprof_memory_profile_get_stash          (SysprofMemoryProfile *self);
+gpointer        sysprof_memprof_profile_get_stash          (SysprofMemprofProfile *self);
 SYSPROF_AVAILABLE_IN_3_36
-gboolean        sysprof_memory_profile_is_empty           (SysprofMemoryProfile *self);
+gboolean        sysprof_memprof_profile_is_empty           (SysprofMemprofProfile *self);
 SYSPROF_AVAILABLE_IN_3_36
-GQuark          sysprof_memory_profile_get_tag            (SysprofMemoryProfile *self,
-                                                           const gchar          *symbol);
+GQuark          sysprof_memprof_profile_get_tag            (SysprofMemprofProfile *self,
+                                                            const gchar          *symbol);
 
 G_END_DECLS
diff --git a/src/libsysprof/sysprof.h b/src/libsysprof/sysprof.h
index f25fdc1..bd81a83 100644
--- a/src/libsysprof/sysprof.h
+++ b/src/libsysprof/sysprof.h
@@ -36,7 +36,7 @@ G_BEGIN_DECLS
 # include "sysprof-kernel-symbol-resolver.h"
 # include "sysprof-kernel-symbol.h"
 # include "sysprof-local-profiler.h"
-# include "sysprof-memory-profile.h"
+# include "sysprof-memprof-profile.h"
 # include "sysprof-memprof-source.h"
 # include "sysprof-netdev-source.h"
 # include "sysprof-process-model-item.h"
diff --git a/src/tests/show-page-usage.c b/src/tests/show-page-usage.c
index 2b4d4b7..536f7bc 100644
--- a/src/tests/show-page-usage.c
+++ b/src/tests/show-page-usage.c
@@ -58,7 +58,7 @@ generate_cb (GObject      *object,
   rax *r;
   gpointer k,v;
 
-  g_assert (SYSPROF_IS_MEMORY_PROFILE (profile));
+  g_assert (SYSPROF_IS_MEMPROF_PROFILE (profile));
   g_assert (G_IS_ASYNC_RESULT (result));
 
   if (!sysprof_profile_generate_finish (profile, result, &error))
@@ -67,7 +67,7 @@ generate_cb (GObject      *object,
       exit (EXIT_FAILURE);
     }
 
-  r = sysprof_memory_profile_get_native (SYSPROF_MEMORY_PROFILE (profile));
+  r = sysprof_memprof_profile_get_native (SYSPROF_MEMPROF_PROFILE (profile));
   seen = g_hash_table_new (NULL, NULL);
 
   raxStart (&it, r);
@@ -183,7 +183,7 @@ main (gint   argc,
       return EXIT_FAILURE;
     }
 
-  memprof = sysprof_memory_profile_new ();
+  memprof = sysprof_memprof_profile_new ();
   sysprof_profile_set_reader (memprof, reader);
   sysprof_profile_generate (memprof, NULL, generate_cb, NULL);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]