From 57255a1d29adc6672c2f5c38f7e270c50cf12947 Mon Sep 17 00:00:00 2001
From: Christian Hergert <chergert@redhat.com>
Date: Mon, 27 May 2019 22:19:38 -0700
Subject: [PATCH] libsysprof: remove lookaside from public API

---
 src/libsysprof/meson.build             |  3 +--
 src/libsysprof/sysprof-map-lookaside.h | 13 +++----------
 src/libsysprof/sysprof.h               | 16 +++++++---------
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/libsysprof/meson.build b/src/libsysprof/meson.build
index de960445..1d60a12f 100644
--- a/src/libsysprof/meson.build
+++ b/src/libsysprof/meson.build
@@ -9,7 +9,6 @@ libsysprof_public_sources = [
   'sysprof-kernel-symbol.c',
   'sysprof-kernel-symbol-resolver.c',
   'sysprof-local-profiler.c',
-  'sysprof-map-lookaside.c',
   'sysprof-process-model.c',
   'sysprof-process-model-item.c',
   'sysprof-profile.c',
@@ -32,7 +31,6 @@ libsysprof_public_headers = [
   'sysprof-kernel-symbol.h',
   'sysprof-kernel-symbol-resolver.h',
   'sysprof-local-profiler.h',
-  'sysprof-map-lookaside.h',
   'sysprof-process-model.h',
   'sysprof-process-model-item.h',
   'sysprof-profile.h',
@@ -54,6 +52,7 @@ libsysprof_private_sources = [
   'sysprof-helpers.c',
   'sysprof-kallsyms.c',
   'sysprof-line-reader.c',
+  'sysprof-map-lookaside.c',
   ipc_service_src,
   stackstash_sources,
   helpers_sources,
diff --git a/src/libsysprof/sysprof-map-lookaside.h b/src/libsysprof/sysprof-map-lookaside.h
index a8759285..e517a600 100644
--- a/src/libsysprof/sysprof-map-lookaside.h
+++ b/src/libsysprof/sysprof-map-lookaside.h
@@ -20,10 +20,6 @@
 
 #pragma once
 
-#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
-# error "Only <sysprof.h> can be included directly."
-#endif
-
 #include "sysprof-capture-types.h"
 
 G_BEGIN_DECLS
@@ -34,19 +30,16 @@ typedef struct
 {
   SysprofCaptureAddress  start;
   SysprofCaptureAddress  end;
-  off_t             offset;
-  ino_t             inode;
-  const gchar      *filename;
+  off_t                  offset;
+  ino_t                  inode;
+  const gchar           *filename;
 } SysprofMap;
 
-SYSPROF_AVAILABLE_IN_ALL
 SysprofMapLookaside *sysprof_map_lookaside_new    (void);
 void                 sysprof_map_lookaside_insert (SysprofMapLookaside   *self,
                                                    const SysprofMap      *map);
-SYSPROF_AVAILABLE_IN_ALL
 const SysprofMap    *sysprof_map_lookaside_lookup (SysprofMapLookaside   *self,
                                                    SysprofCaptureAddress  address);
-SYSPROF_AVAILABLE_IN_ALL
 void                 sysprof_map_lookaside_free   (SysprofMapLookaside   *self);
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (SysprofMapLookaside, sysprof_map_lookaside_free)
diff --git a/src/libsysprof/sysprof.h b/src/libsysprof/sysprof.h
index c748c28b..a124707f 100644
--- a/src/libsysprof/sysprof.h
+++ b/src/libsysprof/sysprof.h
@@ -26,22 +26,20 @@ G_BEGIN_DECLS
 
 # include "sysprof-callgraph-profile.h"
 # include "sysprof-capture-gobject.h"
-# include "sysprof-local-profiler.h"
-# include "sysprof-profile.h"
-# include "sysprof-profiler.h"
-# include "sysprof-map-lookaside.h"
-# include "sysprof-process-model.h"
-# include "sysprof-process-model-item.h"
-# include "sysprof-source.h"
 # include "sysprof-elf-symbol-resolver.h"
 # include "sysprof-jitmap-symbol-resolver.h"
 # include "sysprof-kernel-symbol-resolver.h"
 # include "sysprof-kernel-symbol.h"
+# include "sysprof-local-profiler.h"
+# include "sysprof-process-model-item.h"
+# include "sysprof-process-model.h"
+# include "sysprof-profile.h"
+# include "sysprof-profiler.h"
 # include "sysprof-proxy-source.h"
+# include "sysprof-selection.h"
+# include "sysprof-source.h"
 # include "sysprof-symbol-dirs.h"
 # include "sysprof-symbol-resolver.h"
-# include "sysprof-map-lookaside.h"
-# include "sysprof-selection.h"
 # include "sysprof-symbols-source.h"
 # include "sysprof-tracefd-source.h"