From dbb7833cbff98e24c4ebef10880f122ff351f450 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 19 Jul 2023 17:40:41 -0700 Subject: [PATCH] libsysprof: join libsysprof-analyze and libsysprof-profile This brings together the two libraries back into one now that the whole design is pretty well sorted out. They depend on roughly the same libraries anyway and it's way easier of the single library can both read and write the capture files (along with bringing in libsysprof-capture symbols in a single place). --- meson.build | 12 +- meson_options.txt | 3 + src/libsysprof-profile/meson.build | 122 ----------------- src/libsysprof-profile/sysprof-profile.h | 48 ------- src/libsysprof-profile/tests/meson.build | 31 ----- .../mapped-ring-buffer-source-private.h | 0 .../mapped-ring-buffer-source.c | 0 .../meson.build | 125 +++++++++++++----- .../sysprof-address-layout-private.h | 0 .../sysprof-address-layout.c | 0 .../sysprof-battery-charge.c | 0 .../sysprof-battery-charge.h | 0 .../sysprof-bundled-symbolizer-private.h | 0 .../sysprof-bundled-symbolizer.c | 0 .../sysprof-bundled-symbolizer.h | 0 .../sysprof-callgraph-frame-private.h | 0 .../sysprof-callgraph-frame.c | 0 .../sysprof-callgraph-frame.h | 0 .../sysprof-callgraph-private.h | 0 .../sysprof-callgraph-symbol-private.h | 0 .../sysprof-callgraph-symbol.c | 0 .../sysprof-callgraph-symbol.h | 0 .../sysprof-callgraph.c | 0 .../sysprof-callgraph.h | 0 .../sysprof-controlfd-instrument-private.h | 0 .../sysprof-controlfd-instrument.c | 0 .../sysprof-cpu-info-private.h | 0 .../sysprof-cpu-info.c | 0 .../sysprof-cpu-info.h | 0 .../sysprof-cpu-usage.c | 0 .../sysprof-cpu-usage.h | 0 .../sysprof-descendants-model-private.h | 0 .../sysprof-descendants-model.c | 0 .../sysprof-diagnostic-private.h | 0 .../sysprof-diagnostic.c | 0 .../sysprof-diagnostic.h | 0 .../sysprof-disk-usage.c | 0 .../sysprof-disk-usage.h | 0 .../sysprof-document-allocation.c | 0 .../sysprof-document-allocation.h | 0 .../sysprof-document-bitset-index-private.h | 0 .../sysprof-document-bitset-index.c | 0 .../sysprof-document-counter-private.h | 0 .../sysprof-document-counter-value-private.h | 0 .../sysprof-document-counter-value.c | 0 .../sysprof-document-counter-value.h | 0 .../sysprof-document-counter.c | 0 .../sysprof-document-counter.h | 0 .../sysprof-document-ctrdef.c | 0 .../sysprof-document-ctrdef.h | 0 .../sysprof-document-ctrset.c | 0 .../sysprof-document-ctrset.h | 0 .../sysprof-document-exit.c | 0 .../sysprof-document-exit.h | 0 .../sysprof-document-file-chunk.c | 0 .../sysprof-document-file-chunk.h | 0 .../sysprof-document-file-private.h | 0 .../sysprof-document-file.c | 0 .../sysprof-document-file.h | 0 .../sysprof-document-fork.c | 0 .../sysprof-document-fork.h | 0 .../sysprof-document-frame-private.h | 0 .../sysprof-document-frame.c | 0 .../sysprof-document-frame.h | 0 .../sysprof-document-jitmap.c | 0 .../sysprof-document-jitmap.h | 0 .../sysprof-document-loader.c | 0 .../sysprof-document-loader.h | 0 .../sysprof-document-log.c | 0 .../sysprof-document-log.h | 0 .../sysprof-document-mark.c | 0 .../sysprof-document-mark.h | 0 .../sysprof-document-metadata.c | 0 .../sysprof-document-metadata.h | 0 .../sysprof-document-mmap.c | 0 .../sysprof-document-mmap.h | 0 .../sysprof-document-overlay.c | 0 .../sysprof-document-overlay.h | 0 .../sysprof-document-private.h | 0 .../sysprof-document-process-private.h | 0 .../sysprof-document-process.c | 0 .../sysprof-document-process.h | 0 .../sysprof-document-sample.c | 0 .../sysprof-document-sample.h | 0 .../sysprof-document-symbols-private.h | 0 .../sysprof-document-symbols.c | 0 .../sysprof-document-traceable.c | 0 .../sysprof-document-traceable.h | 0 .../sysprof-document.c | 0 .../sysprof-document.h | 0 .../sysprof-elf-loader-private.h | 0 .../sysprof-elf-loader.c | 0 .../sysprof-elf-private.h | 0 .../sysprof-elf-symbolizer.c | 0 .../sysprof-elf-symbolizer.h | 0 .../sysprof-elf.c | 0 .../sysprof-energy-usage.c | 0 .../sysprof-energy-usage.h | 0 .../sysprof-instrument-private.h | 0 .../sysprof-instrument.c | 0 .../sysprof-instrument.h | 0 .../sysprof-jitmap-symbolizer.c | 0 .../sysprof-jitmap-symbolizer.h | 0 .../sysprof-journald-source.c | 0 .../sysprof-journald-source.h | 0 .../sysprof-kallsyms-symbolizer.c | 0 .../sysprof-kallsyms-symbolizer.h | 0 .../sysprof-linux-instrument-private.h | 0 .../sysprof-linux-instrument.c | 0 .../sysprof-malloc-tracing.c | 0 .../sysprof-malloc-tracing.h | 0 .../sysprof-maps-parser-private.h | 0 .../sysprof-maps-parser.c | 0 .../sysprof-mark-catalog-private.h | 0 .../sysprof-mark-catalog.c | 0 .../sysprof-mark-catalog.h | 0 .../sysprof-memory-usage.c | 0 .../sysprof-memory-usage.h | 0 .../sysprof-mount-device-private.h | 0 .../sysprof-mount-device.c | 0 .../sysprof-mount-namespace-private.h | 0 .../sysprof-mount-namespace.c | 0 .../sysprof-mount-private.h | 0 .../sysprof-mount.c | 0 .../sysprof-mount.h | 0 .../sysprof-multi-symbolizer.c | 0 .../sysprof-multi-symbolizer.h | 0 .../sysprof-network-usage.c | 0 .../sysprof-network-usage.h | 0 .../sysprof-no-symbolizer.c | 0 .../sysprof-no-symbolizer.h | 0 .../sysprof-perf-event-stream-private.h | 0 .../sysprof-perf-event-stream.c | 0 .../sysprof-podman-private.h | 0 .../sysprof-podman.c | 0 .../sysprof-polkit-private.h | 0 .../sysprof-polkit.c | 0 .../sysprof-power-profile.c | 0 .../sysprof-power-profile.h | 0 .../sysprof-process-info-private.h | 0 .../sysprof-process-info.c | 0 .../sysprof-profiler.c | 0 .../sysprof-profiler.h | 0 .../sysprof-proxied-instrument-private.h | 0 .../sysprof-proxied-instrument.c | 0 .../sysprof-proxied-instrument.h | 0 .../sysprof-recording-private.h | 0 .../sysprof-recording.c | 0 .../sysprof-recording.h | 0 .../sysprof-sampler.c | 0 .../sysprof-sampler.h | 0 .../sysprof-spawnable.c | 0 .../sysprof-spawnable.h | 0 .../sysprof-strings-private.h | 0 .../sysprof-strings.c | 0 .../sysprof-symbol-cache-private.h | 0 .../sysprof-symbol-cache.c | 0 .../sysprof-symbol-private.h | 0 .../sysprof-symbol.c | 0 .../sysprof-symbol.h | 0 .../sysprof-symbolizer-private.h | 0 .../sysprof-symbolizer.c | 0 .../sysprof-symbolizer.h | 0 .../sysprof-symbols-bundle.c | 2 +- .../sysprof-symbols-bundle.h | 0 .../sysprof-system-logs.c | 0 .../sysprof-system-logs.h | 0 .../sysprof-thread-info.c | 0 .../sysprof-thread-info.h | 0 .../sysprof-time-span.c | 0 .../sysprof-time-span.h | 0 .../sysprof-tracer.c | 0 .../sysprof-tracer.h | 0 .../sysprof.h} | 34 +++-- .../tests/meson.build | 21 +-- .../tests/test-callgraph.c | 2 +- .../tests/test-capture-model.c | 2 +- .../tests/test-elf-loader.c | 2 +- .../tests/test-list-address-layout.c | 2 +- .../tests/test-list-counters.c | 2 +- .../tests/test-list-cpu.c | 2 +- .../tests/test-list-files.c | 2 +- .../tests/test-list-jitmap.c | 2 +- .../tests/test-list-overlays.c | 2 +- .../tests/test-list-processes.c | 2 +- .../tests/test-maps-parser.c | 0 .../tests/test-mark-catalog.c | 2 +- .../tests/test-print-file.c | 2 +- .../tests/test-profiler.c | 2 +- .../tests/test-strings.c | 4 +- .../tests/test-symbol-cache.c | 8 +- .../tests/test-symbolize.c | 2 +- src/{libsysprof-analyze => libsysprof}/tree.h | 0 src/meson.build | 12 +- src/sysprof-agent/meson.build | 3 +- src/sysprof-agent/sysprof-agent.c | 2 +- src/sysprof-cli/meson.build | 3 +- src/sysprof-cli/sysprof-cli.c | 3 +- src/sysprof/meson.build | 4 +- src/sysprof/sysprof-callgraph-view.h | 2 +- src/sysprof/sysprof-column-layer.h | 2 +- src/sysprof/sysprof-line-layer.h | 2 +- src/sysprof/sysprof-mark-chart-item-private.h | 2 +- src/sysprof/sysprof-mark-chart-row.c | 2 +- src/sysprof/sysprof-mark-table.h | 2 +- src/sysprof/sysprof-process-dialog.h | 2 +- src/sysprof/sysprof-recording-pad.h | 2 +- src/sysprof/sysprof-session-model-item.h | 2 +- src/sysprof/sysprof-session-model.h | 2 +- src/sysprof/sysprof-session.h | 2 +- src/sysprof/sysprof-split-layer.h | 2 +- src/sysprof/sysprof-symbol-label-private.h | 2 +- src/sysprof/sysprof-time-filter-model.h | 2 +- src/sysprof/sysprof-time-scrubber.h | 2 +- src/sysprof/sysprof-window.h | 2 +- src/sysprof/sysprof-xy-layer.h | 2 +- src/sysprofd/meson.build | 4 +- 217 files changed, 187 insertions(+), 316 deletions(-) delete mode 100644 src/libsysprof-profile/meson.build delete mode 100644 src/libsysprof-profile/sysprof-profile.h delete mode 100644 src/libsysprof-profile/tests/meson.build rename src/{libsysprof-profile => libsysprof}/mapped-ring-buffer-source-private.h (100%) rename src/{libsysprof-profile => libsysprof}/mapped-ring-buffer-source.c (100%) rename src/{libsysprof-analyze => libsysprof}/meson.build (59%) rename src/{libsysprof-analyze => libsysprof}/sysprof-address-layout-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-address-layout.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-battery-charge.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-battery-charge.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-bundled-symbolizer-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-bundled-symbolizer.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-bundled-symbolizer.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-callgraph-frame-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-callgraph-frame.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-callgraph-frame.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-callgraph-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-callgraph-symbol-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-callgraph-symbol.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-callgraph-symbol.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-callgraph.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-callgraph.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-controlfd-instrument-private.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-controlfd-instrument.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-cpu-info-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-cpu-info.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-cpu-info.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-cpu-usage.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-cpu-usage.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-descendants-model-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-descendants-model.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-diagnostic-private.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-diagnostic.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-diagnostic.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-disk-usage.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-disk-usage.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-allocation.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-allocation.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-bitset-index-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-bitset-index.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-counter-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-counter-value-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-counter-value.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-counter-value.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-counter.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-counter.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-ctrdef.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-ctrdef.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-ctrset.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-ctrset.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-exit.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-exit.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-file-chunk.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-file-chunk.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-file-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-file.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-file.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-fork.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-fork.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-frame-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-frame.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-frame.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-jitmap.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-jitmap.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-loader.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-loader.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-log.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-log.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-mark.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-mark.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-metadata.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-metadata.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-mmap.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-mmap.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-overlay.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-overlay.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-process-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-process.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-process.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-sample.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-sample.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-symbols-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-symbols.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-traceable.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document-traceable.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-document.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-elf-loader-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-elf-loader.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-elf-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-elf-symbolizer.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-elf-symbolizer.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-elf.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-energy-usage.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-energy-usage.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-instrument-private.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-instrument.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-instrument.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-jitmap-symbolizer.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-jitmap-symbolizer.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-journald-source.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-journald-source.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-kallsyms-symbolizer.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-kallsyms-symbolizer.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-linux-instrument-private.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-linux-instrument.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-malloc-tracing.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-malloc-tracing.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-maps-parser-private.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-maps-parser.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-mark-catalog-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-mark-catalog.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-mark-catalog.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-memory-usage.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-memory-usage.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-mount-device-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-mount-device.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-mount-namespace-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-mount-namespace.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-mount-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-mount.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-mount.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-multi-symbolizer.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-multi-symbolizer.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-network-usage.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-network-usage.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-no-symbolizer.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-no-symbolizer.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-perf-event-stream-private.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-perf-event-stream.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-podman-private.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-podman.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-polkit-private.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-polkit.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-power-profile.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-power-profile.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-process-info-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-process-info.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-profiler.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-profiler.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-proxied-instrument-private.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-proxied-instrument.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-proxied-instrument.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-recording-private.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-recording.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-recording.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-sampler.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-sampler.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-spawnable.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-spawnable.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-strings-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-strings.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-symbol-cache-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-symbol-cache.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-symbol-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-symbol.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-symbol.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-symbolizer-private.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-symbolizer.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-symbolizer.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-symbols-bundle.c (99%) rename src/{libsysprof-profile => libsysprof}/sysprof-symbols-bundle.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-system-logs.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-system-logs.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-thread-info.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-thread-info.h (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-time-span.c (100%) rename src/{libsysprof-analyze => libsysprof}/sysprof-time-span.h (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-tracer.c (100%) rename src/{libsysprof-profile => libsysprof}/sysprof-tracer.h (100%) rename src/{libsysprof-analyze/sysprof-analyze.h => libsysprof/sysprof.h} (76%) rename src/{libsysprof-analyze => libsysprof}/tests/meson.build (68%) rename src/{libsysprof-analyze => libsysprof}/tests/test-callgraph.c (99%) rename src/{libsysprof-analyze => libsysprof}/tests/test-capture-model.c (99%) rename src/{libsysprof-analyze => libsysprof}/tests/test-elf-loader.c (99%) rename src/{libsysprof-analyze => libsysprof}/tests/test-list-address-layout.c (98%) rename src/{libsysprof-analyze => libsysprof}/tests/test-list-counters.c (99%) rename src/{libsysprof-analyze => libsysprof}/tests/test-list-cpu.c (98%) rename src/{libsysprof-analyze => libsysprof}/tests/test-list-files.c (98%) rename src/{libsysprof-analyze => libsysprof}/tests/test-list-jitmap.c (98%) rename src/{libsysprof-analyze => libsysprof}/tests/test-list-overlays.c (99%) rename src/{libsysprof-analyze => libsysprof}/tests/test-list-processes.c (99%) rename src/{libsysprof-profile => libsysprof}/tests/test-maps-parser.c (100%) rename src/{libsysprof-analyze => libsysprof}/tests/test-mark-catalog.c (98%) rename src/{libsysprof-analyze => libsysprof}/tests/test-print-file.c (98%) rename src/{libsysprof-profile => libsysprof}/tests/test-profiler.c (99%) rename src/{libsysprof-analyze => libsysprof}/tests/test-strings.c (93%) rename src/{libsysprof-analyze => libsysprof}/tests/test-symbol-cache.c (96%) rename src/{libsysprof-analyze => libsysprof}/tests/test-symbolize.c (99%) rename src/{libsysprof-analyze => libsysprof}/tree.h (100%) diff --git a/meson.build b/meson.build index 03ca9055..f41bc27c 100644 --- a/meson.build +++ b/meson.build @@ -38,13 +38,13 @@ need_gtk = get_option('gtk') need_glib = (need_gtk or get_option('examples') or get_option('sysprofd') != 'none' or - get_option('agent') or + get_option('tools') or get_option('tests')) - -# Determine what libraries to build -need_libsysprof_capture = true -need_libsysprof_profile = get_option('gtk') or get_option('agent') -need_libsysprof_analyze = get_option('gtk') or get_option('agent') +need_libsysprof = (need_gtk or + get_option('libsysprof') or + get_option('examples') or + get_option('tools') or + get_option('tests')) dex_req = '0.3' glib_req = '2.76.0' diff --git a/meson_options.txt b/meson_options.txt index 8861ea31..d36570ad 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -32,6 +32,9 @@ option('help', type: 'boolean') # Disable use of libunwind option('libunwind', type: 'boolean') +# Build libsysprof (required by tools, tests, sysprof, etc) +option('libsysprof', type: 'boolean') + # Optionally disable the tools (this is mostly only useful for building only # libsysprof-capture as a subproject) option('tools', type: 'boolean') diff --git a/src/libsysprof-profile/meson.build b/src/libsysprof-profile/meson.build deleted file mode 100644 index 9fad9874..00000000 --- a/src/libsysprof-profile/meson.build +++ /dev/null @@ -1,122 +0,0 @@ -libsysprof_profile_public_sources = [ - 'sysprof-battery-charge.c', - 'sysprof-cpu-usage.c', - 'sysprof-diagnostic.c', - 'sysprof-disk-usage.c', - 'sysprof-energy-usage.c', - 'sysprof-instrument.c', - 'sysprof-memory-usage.c', - 'sysprof-malloc-tracing.c', - 'sysprof-network-usage.c', - 'sysprof-power-profile.c', - 'sysprof-profiler.c', - 'sysprof-proxied-instrument.c', - 'sysprof-recording.c', - 'sysprof-sampler.c', - 'sysprof-spawnable.c', - 'sysprof-symbols-bundle.c', - 'sysprof-system-logs.c', - 'sysprof-tracer.c', -] - -libsysprof_profile_private_sources = [ - 'mapped-ring-buffer-source.c', - 'sysprof-controlfd-instrument.c', - 'sysprof-maps-parser.c', - 'sysprof-perf-event-stream.c', - 'sysprof-journald-source.c', - 'sysprof-podman.c', -] - -if polkit_dep.found() - libsysprof_profile_private_sources += ['sysprof-polkit.c'] -endif - -libsysprof_profile_public_headers = [ - 'sysprof-profile.h', - - 'sysprof-battery-charge.h', - 'sysprof-cpu-usage.h', - 'sysprof-diagnostic.h', - 'sysprof-disk-usage.h', - 'sysprof-energy-usage.h', - 'sysprof-instrument.h', - 'sysprof-memory-usage.h', - 'sysprof-malloc-tracing.h', - 'sysprof-network-usage.h', - 'sysprof-power-profile.h', - 'sysprof-profiler.h', - 'sysprof-proxied-instrument.h', - 'sysprof-recording.h', - 'sysprof-sampler.h', - 'sysprof-spawnable.h', - 'sysprof-symbols-bundle.h', - 'sysprof-system-logs.h', - 'sysprof-tracer.h', -] - -if host_machine.system() == 'linux' - libsysprof_profile_private_sources += [ - 'sysprof-linux-instrument.c', - ] -endif - -libsysprof_profile_deps = [ - dependency('gio-2.0', version: glib_req_version), - dependency('gio-unix-2.0', - version: glib_req_version, - required: host_machine.system() != 'windows'), - dependency('json-glib-1.0'), - dependency('libdex-1', version: dex_req_version), - libsystemd_dep, - polkit_dep, - - liblinereader_static_dep, - libsysprof_analyze_dep, -] - -libsysprof_profile_static = static_library( - 'sysprof-profile-@0@'.format(soname_major_version), - (libsysprof_profile_public_sources + - libsysprof_profile_private_sources + - mapped_ring_buffer_sources), - - include_directories: [include_directories('.'), - libsysprof_capture_include_dirs], - dependencies: libsysprof_profile_deps, - gnu_symbol_visibility: 'hidden', -) - -libsysprof_profile_static_dep = declare_dependency( - link_with: libsysprof_profile_static, - dependencies: libsysprof_profile_deps, - include_directories: [include_directories('.'), - libsysprof_capture_include_dirs], -) - -libsysprof_profile = library('sysprof-profile-@0@'.format(soname_major_version), - dependencies: [libsysprof_profile_static_dep], - gnu_symbol_visibility: 'hidden', - version: '@0@.0.0'.format(soname_major_version), - darwin_versions: '@0@.0'.format(soname_major_version), - install: true, -) - -libsysprof_profile_dep = declare_dependency( - link_with: libsysprof_profile, - dependencies: libsysprof_profile_deps, - include_directories: [include_directories('.'), libsysprof_capture_include_dirs], -) -meson.override_dependency('sysprof-profile-@0@'.format(soname_major_version), libsysprof_profile_dep) - -pkgconfig.generate(libsysprof_profile, - subdirs: [sysprof_header_subdir], - description: 'A library for recording profiles using various instruments', - install_dir: join_paths(get_option('libdir'), 'pkgconfig'), - requires: ['gio-2.0'], - variables: ['datadir=' + datadir_for_pc_file], -) - -install_headers(libsysprof_profile_public_headers, subdir: sysprof_header_subdir) - -subdir('tests') diff --git a/src/libsysprof-profile/sysprof-profile.h b/src/libsysprof-profile/sysprof-profile.h deleted file mode 100644 index daf107f4..00000000 --- a/src/libsysprof-profile/sysprof-profile.h +++ /dev/null @@ -1,48 +0,0 @@ -/* sysprof-profile.h - * - * Copyright 2023 Christian Hergert - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -#pragma once - -#include - -G_BEGIN_DECLS - -#define SYSPROF_PROFILE_INSIDE -# include "sysprof-battery-charge.h" -# include "sysprof-cpu-usage.h" -# include "sysprof-diagnostic.h" -# include "sysprof-disk-usage.h" -# include "sysprof-energy-usage.h" -# include "sysprof-instrument.h" -# include "sysprof-malloc-tracing.h" -# include "sysprof-memory-usage.h" -# include "sysprof-network-usage.h" -# include "sysprof-power-profile.h" -# include "sysprof-profiler.h" -# include "sysprof-proxied-instrument.h" -# include "sysprof-recording.h" -# include "sysprof-sampler.h" -# include "sysprof-spawnable.h" -# include "sysprof-symbols-bundle.h" -# include "sysprof-system-logs.h" -# include "sysprof-tracer.h" -#undef SYSPROF_PROFILE_INSIDE - -G_END_DECLS diff --git a/src/libsysprof-profile/tests/meson.build b/src/libsysprof-profile/tests/meson.build deleted file mode 100644 index 48b7343f..00000000 --- a/src/libsysprof-profile/tests/meson.build +++ /dev/null @@ -1,31 +0,0 @@ -libsysprof_profile_test_env = [ - 'G_DEBUG=gc-friendly', - 'GSETTINGS_BACKEND=memory', - 'MALLOC_CHECK_=2', -] - -libsysprof_profile_testsuite_c_args = [ - '-DG_LOG_DOMAIN="libsysprof-profile"', - '-DG_ENABLE_DEBUG', - '-UG_DISABLE_ASSERT', - '-UG_DISABLE_CAST_CHECKS', -] - -libsysprof_profile_testsuite = { - 'test-maps-parser' : {'skip': true}, - 'test-profiler' : {'skip': true}, -} - -libsysprof_profile_testsuite_deps = [ - libsysprof_profile_static_dep, -] - -foreach test, params: libsysprof_profile_testsuite - test_exe = executable(test, '@0@.c'.format(test), - c_args: libsysprof_profile_testsuite_c_args, - dependencies: libsysprof_profile_testsuite_deps, - ) - if not params.get('skip', false) - test(test, test_exe, env: libsysprof_profile_test_env) - endif -endforeach diff --git a/src/libsysprof-profile/mapped-ring-buffer-source-private.h b/src/libsysprof/mapped-ring-buffer-source-private.h similarity index 100% rename from src/libsysprof-profile/mapped-ring-buffer-source-private.h rename to src/libsysprof/mapped-ring-buffer-source-private.h diff --git a/src/libsysprof-profile/mapped-ring-buffer-source.c b/src/libsysprof/mapped-ring-buffer-source.c similarity index 100% rename from src/libsysprof-profile/mapped-ring-buffer-source.c rename to src/libsysprof/mapped-ring-buffer-source.c diff --git a/src/libsysprof-analyze/meson.build b/src/libsysprof/meson.build similarity index 59% rename from src/libsysprof-analyze/meson.build rename to src/libsysprof/meson.build index 8488c761..7908c562 100644 --- a/src/libsysprof-analyze/meson.build +++ b/src/libsysprof/meson.build @@ -1,18 +1,21 @@ -libsysprof_analyze_public_sources = [ +libsysprof_public_sources = [ + 'sysprof-battery-charge.c', 'sysprof-bundled-symbolizer.c', - 'sysprof-callgraph.c', 'sysprof-callgraph-frame.c', 'sysprof-callgraph-symbol.c', + 'sysprof-callgraph.c', 'sysprof-cpu-info.c', - 'sysprof-document.c', + 'sysprof-cpu-usage.c', + 'sysprof-diagnostic.c', + 'sysprof-disk-usage.c', 'sysprof-document-allocation.c', - 'sysprof-document-counter.c', 'sysprof-document-counter-value.c', + 'sysprof-document-counter.c', 'sysprof-document-ctrdef.c', 'sysprof-document-ctrset.c', 'sysprof-document-exit.c', - 'sysprof-document-file.c', 'sysprof-document-file-chunk.c', + 'sysprof-document-file.c', 'sysprof-document-fork.c', 'sysprof-document-frame.c', 'sysprof-document-jitmap.c', @@ -25,34 +28,52 @@ libsysprof_analyze_public_sources = [ 'sysprof-document-process.c', 'sysprof-document-sample.c', 'sysprof-document-traceable.c', + 'sysprof-document.c', 'sysprof-elf-symbolizer.c', + 'sysprof-energy-usage.c', + 'sysprof-instrument.c', 'sysprof-jitmap-symbolizer.c', 'sysprof-kallsyms-symbolizer.c', + 'sysprof-malloc-tracing.c', 'sysprof-mark-catalog.c', + 'sysprof-memory-usage.c', 'sysprof-multi-symbolizer.c', + 'sysprof-network-usage.c', 'sysprof-no-symbolizer.c', + 'sysprof-power-profile.c', + 'sysprof-profiler.c', + 'sysprof-proxied-instrument.c', + 'sysprof-recording.c', + 'sysprof-sampler.c', + 'sysprof-spawnable.c', 'sysprof-symbol.c', 'sysprof-symbolizer.c', + 'sysprof-symbols-bundle.c', + 'sysprof-system-logs.c', 'sysprof-thread-info.c', 'sysprof-time-span.c', + 'sysprof-tracer.c', ] -libsysprof_analyze_public_headers = [ - 'sysprof-analyze.h', +libsysprof_public_headers = [ + 'sysprof.h', + 'sysprof-battery-charge.h', 'sysprof-bundled-symbolizer.h', - 'sysprof-callgraph.h', 'sysprof-callgraph-frame.h', 'sysprof-callgraph-symbol.h', + 'sysprof-callgraph.h', 'sysprof-cpu-info.h', - 'sysprof-document.h', + 'sysprof-cpu-usage.h', + 'sysprof-diagnostic.h', + 'sysprof-disk-usage.h', 'sysprof-document-allocation.h', - 'sysprof-document-counter.h', 'sysprof-document-counter-value.h', + 'sysprof-document-counter.h', 'sysprof-document-ctrdef.h', 'sysprof-document-ctrset.h', 'sysprof-document-exit.h', - 'sysprof-document-file.h', 'sysprof-document-file-chunk.h', + 'sysprof-document-file.h', 'sysprof-document-fork.h', 'sysprof-document-frame.h', 'sysprof-document-jitmap.h', @@ -65,37 +86,73 @@ libsysprof_analyze_public_headers = [ 'sysprof-document-process.h', 'sysprof-document-sample.h', 'sysprof-document-traceable.h', + 'sysprof-document.h', 'sysprof-elf-symbolizer.h', + 'sysprof-energy-usage.h', + 'sysprof-instrument.h', 'sysprof-jitmap-symbolizer.h', 'sysprof-kallsyms-symbolizer.h', + 'sysprof-malloc-tracing.h', 'sysprof-mark-catalog.h', + 'sysprof-memory-usage.h', 'sysprof-mount.h', 'sysprof-multi-symbolizer.h', + 'sysprof-network-usage.h', 'sysprof-no-symbolizer.h', + 'sysprof-power-profile.h', + 'sysprof-profiler.h', + 'sysprof-proxied-instrument.h', + 'sysprof-recording.h', + 'sysprof-sampler.h', + 'sysprof-spawnable.h', 'sysprof-symbol.h', 'sysprof-symbolizer.h', + 'sysprof-symbols-bundle.h', + 'sysprof-system-logs.h', 'sysprof-thread-info.h', 'sysprof-time-span.h', + 'sysprof-tracer.h', ] -libsysprof_analyze_private_sources = [ +libsysprof_private_sources = [ + 'mapped-ring-buffer-source.c', 'sysprof-address-layout.c', + 'sysprof-controlfd-instrument.c', 'sysprof-descendants-model.c', 'sysprof-document-bitset-index.c', 'sysprof-document-symbols.c', - 'sysprof-elf.c', 'sysprof-elf-loader.c', - 'sysprof-mount.c', + 'sysprof-elf.c', + 'sysprof-journald-source.c', + 'sysprof-maps-parser.c', 'sysprof-mount-device.c', 'sysprof-mount-namespace.c', + 'sysprof-mount.c', + 'sysprof-perf-event-stream.c', + 'sysprof-podman.c', 'sysprof-process-info.c', 'sysprof-strings.c', 'sysprof-symbol-cache.c', ] -libsysprof_analyze_deps = [ +if polkit_dep.found() + libsysprof_private_sources += ['sysprof-polkit.c'] +endif + +if host_machine.system() == 'linux' + libsysprof_private_sources += ['sysprof-linux-instrument.c'] +endif + +libsysprof_deps = [ dependency('gio-2.0', version: glib_req_version), + dependency('gio-unix-2.0', + version: glib_req_version, + required: host_machine.system() != 'windows'), dependency('libdex-1', version: dex_req_version), + dependency('json-glib-1.0'), + + libsystemd_dep, + polkit_dep, libeggbitset_static_dep, libelfparser_static_dep, @@ -103,47 +160,49 @@ libsysprof_analyze_deps = [ libsysprof_capture_dep, ] -libsysprof_analyze_static = static_library( +libsysprof_static = static_library( 'sysprof-analyze-@0@'.format(soname_major_version), - libsysprof_analyze_public_sources + - libsysprof_analyze_private_sources, + libsysprof_public_sources + + libsysprof_private_sources, include_directories: [include_directories('.'), libsysprof_capture_include_dirs], - dependencies: libsysprof_analyze_deps, + dependencies: libsysprof_deps, gnu_symbol_visibility: 'hidden', ) -libsysprof_analyze_static_dep = declare_dependency( - link_with: libsysprof_analyze_static, - dependencies: libsysprof_analyze_deps, +libsysprof_static_dep = declare_dependency( + link_with: libsysprof_static, + dependencies: libsysprof_deps, include_directories: [include_directories('.'), libsysprof_capture_include_dirs], ) -libsysprof_analyze = library('sysprof-analyze-@0@'.format(soname_major_version), - dependencies: [libsysprof_analyze_static_dep], +libsysprof = library('sysprof-analyze-@0@'.format(soname_major_version), + dependencies: [libsysprof_static_dep], gnu_symbol_visibility: 'hidden', version: '@0@.0.0'.format(soname_major_version), darwin_versions: '@0@.0'.format(soname_major_version), - install: true, + install: get_option('libsysprof'), ) -libsysprof_analyze_dep = declare_dependency( - link_with: libsysprof_analyze, - dependencies: libsysprof_analyze_deps, +libsysprof_dep = declare_dependency( + link_with: libsysprof, + dependencies: libsysprof_deps, include_directories: [include_directories('.'), libsysprof_capture_include_dirs], ) -meson.override_dependency('sysprof-analyze-@0@'.format(soname_major_version), libsysprof_analyze_dep) +meson.override_dependency('sysprof-analyze-@0@'.format(soname_major_version), libsysprof_dep) -pkgconfig.generate(libsysprof_analyze, +pkgconfig.generate(libsysprof, subdirs: [sysprof_header_subdir], - description: 'A library for processing and analyzing Sysprof captures', + description: 'A library for recording and analyzing system performance', install_dir: join_paths(get_option('libdir'), 'pkgconfig'), requires: ['gio-2.0'], variables: ['datadir=' + datadir_for_pc_file], ) -install_headers(libsysprof_analyze_public_headers, subdir: sysprof_header_subdir) +install_headers(libsysprof_public_headers, subdir: sysprof_header_subdir) -subdir('tests') +if get_option('tests') + subdir('tests') +endif diff --git a/src/libsysprof-analyze/sysprof-address-layout-private.h b/src/libsysprof/sysprof-address-layout-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-address-layout-private.h rename to src/libsysprof/sysprof-address-layout-private.h diff --git a/src/libsysprof-analyze/sysprof-address-layout.c b/src/libsysprof/sysprof-address-layout.c similarity index 100% rename from src/libsysprof-analyze/sysprof-address-layout.c rename to src/libsysprof/sysprof-address-layout.c diff --git a/src/libsysprof-profile/sysprof-battery-charge.c b/src/libsysprof/sysprof-battery-charge.c similarity index 100% rename from src/libsysprof-profile/sysprof-battery-charge.c rename to src/libsysprof/sysprof-battery-charge.c diff --git a/src/libsysprof-profile/sysprof-battery-charge.h b/src/libsysprof/sysprof-battery-charge.h similarity index 100% rename from src/libsysprof-profile/sysprof-battery-charge.h rename to src/libsysprof/sysprof-battery-charge.h diff --git a/src/libsysprof-analyze/sysprof-bundled-symbolizer-private.h b/src/libsysprof/sysprof-bundled-symbolizer-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-bundled-symbolizer-private.h rename to src/libsysprof/sysprof-bundled-symbolizer-private.h diff --git a/src/libsysprof-analyze/sysprof-bundled-symbolizer.c b/src/libsysprof/sysprof-bundled-symbolizer.c similarity index 100% rename from src/libsysprof-analyze/sysprof-bundled-symbolizer.c rename to src/libsysprof/sysprof-bundled-symbolizer.c diff --git a/src/libsysprof-analyze/sysprof-bundled-symbolizer.h b/src/libsysprof/sysprof-bundled-symbolizer.h similarity index 100% rename from src/libsysprof-analyze/sysprof-bundled-symbolizer.h rename to src/libsysprof/sysprof-bundled-symbolizer.h diff --git a/src/libsysprof-analyze/sysprof-callgraph-frame-private.h b/src/libsysprof/sysprof-callgraph-frame-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-callgraph-frame-private.h rename to src/libsysprof/sysprof-callgraph-frame-private.h diff --git a/src/libsysprof-analyze/sysprof-callgraph-frame.c b/src/libsysprof/sysprof-callgraph-frame.c similarity index 100% rename from src/libsysprof-analyze/sysprof-callgraph-frame.c rename to src/libsysprof/sysprof-callgraph-frame.c diff --git a/src/libsysprof-analyze/sysprof-callgraph-frame.h b/src/libsysprof/sysprof-callgraph-frame.h similarity index 100% rename from src/libsysprof-analyze/sysprof-callgraph-frame.h rename to src/libsysprof/sysprof-callgraph-frame.h diff --git a/src/libsysprof-analyze/sysprof-callgraph-private.h b/src/libsysprof/sysprof-callgraph-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-callgraph-private.h rename to src/libsysprof/sysprof-callgraph-private.h diff --git a/src/libsysprof-analyze/sysprof-callgraph-symbol-private.h b/src/libsysprof/sysprof-callgraph-symbol-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-callgraph-symbol-private.h rename to src/libsysprof/sysprof-callgraph-symbol-private.h diff --git a/src/libsysprof-analyze/sysprof-callgraph-symbol.c b/src/libsysprof/sysprof-callgraph-symbol.c similarity index 100% rename from src/libsysprof-analyze/sysprof-callgraph-symbol.c rename to src/libsysprof/sysprof-callgraph-symbol.c diff --git a/src/libsysprof-analyze/sysprof-callgraph-symbol.h b/src/libsysprof/sysprof-callgraph-symbol.h similarity index 100% rename from src/libsysprof-analyze/sysprof-callgraph-symbol.h rename to src/libsysprof/sysprof-callgraph-symbol.h diff --git a/src/libsysprof-analyze/sysprof-callgraph.c b/src/libsysprof/sysprof-callgraph.c similarity index 100% rename from src/libsysprof-analyze/sysprof-callgraph.c rename to src/libsysprof/sysprof-callgraph.c diff --git a/src/libsysprof-analyze/sysprof-callgraph.h b/src/libsysprof/sysprof-callgraph.h similarity index 100% rename from src/libsysprof-analyze/sysprof-callgraph.h rename to src/libsysprof/sysprof-callgraph.h diff --git a/src/libsysprof-profile/sysprof-controlfd-instrument-private.h b/src/libsysprof/sysprof-controlfd-instrument-private.h similarity index 100% rename from src/libsysprof-profile/sysprof-controlfd-instrument-private.h rename to src/libsysprof/sysprof-controlfd-instrument-private.h diff --git a/src/libsysprof-profile/sysprof-controlfd-instrument.c b/src/libsysprof/sysprof-controlfd-instrument.c similarity index 100% rename from src/libsysprof-profile/sysprof-controlfd-instrument.c rename to src/libsysprof/sysprof-controlfd-instrument.c diff --git a/src/libsysprof-analyze/sysprof-cpu-info-private.h b/src/libsysprof/sysprof-cpu-info-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-cpu-info-private.h rename to src/libsysprof/sysprof-cpu-info-private.h diff --git a/src/libsysprof-analyze/sysprof-cpu-info.c b/src/libsysprof/sysprof-cpu-info.c similarity index 100% rename from src/libsysprof-analyze/sysprof-cpu-info.c rename to src/libsysprof/sysprof-cpu-info.c diff --git a/src/libsysprof-analyze/sysprof-cpu-info.h b/src/libsysprof/sysprof-cpu-info.h similarity index 100% rename from src/libsysprof-analyze/sysprof-cpu-info.h rename to src/libsysprof/sysprof-cpu-info.h diff --git a/src/libsysprof-profile/sysprof-cpu-usage.c b/src/libsysprof/sysprof-cpu-usage.c similarity index 100% rename from src/libsysprof-profile/sysprof-cpu-usage.c rename to src/libsysprof/sysprof-cpu-usage.c diff --git a/src/libsysprof-profile/sysprof-cpu-usage.h b/src/libsysprof/sysprof-cpu-usage.h similarity index 100% rename from src/libsysprof-profile/sysprof-cpu-usage.h rename to src/libsysprof/sysprof-cpu-usage.h diff --git a/src/libsysprof-analyze/sysprof-descendants-model-private.h b/src/libsysprof/sysprof-descendants-model-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-descendants-model-private.h rename to src/libsysprof/sysprof-descendants-model-private.h diff --git a/src/libsysprof-analyze/sysprof-descendants-model.c b/src/libsysprof/sysprof-descendants-model.c similarity index 100% rename from src/libsysprof-analyze/sysprof-descendants-model.c rename to src/libsysprof/sysprof-descendants-model.c diff --git a/src/libsysprof-profile/sysprof-diagnostic-private.h b/src/libsysprof/sysprof-diagnostic-private.h similarity index 100% rename from src/libsysprof-profile/sysprof-diagnostic-private.h rename to src/libsysprof/sysprof-diagnostic-private.h diff --git a/src/libsysprof-profile/sysprof-diagnostic.c b/src/libsysprof/sysprof-diagnostic.c similarity index 100% rename from src/libsysprof-profile/sysprof-diagnostic.c rename to src/libsysprof/sysprof-diagnostic.c diff --git a/src/libsysprof-profile/sysprof-diagnostic.h b/src/libsysprof/sysprof-diagnostic.h similarity index 100% rename from src/libsysprof-profile/sysprof-diagnostic.h rename to src/libsysprof/sysprof-diagnostic.h diff --git a/src/libsysprof-profile/sysprof-disk-usage.c b/src/libsysprof/sysprof-disk-usage.c similarity index 100% rename from src/libsysprof-profile/sysprof-disk-usage.c rename to src/libsysprof/sysprof-disk-usage.c diff --git a/src/libsysprof-profile/sysprof-disk-usage.h b/src/libsysprof/sysprof-disk-usage.h similarity index 100% rename from src/libsysprof-profile/sysprof-disk-usage.h rename to src/libsysprof/sysprof-disk-usage.h diff --git a/src/libsysprof-analyze/sysprof-document-allocation.c b/src/libsysprof/sysprof-document-allocation.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-allocation.c rename to src/libsysprof/sysprof-document-allocation.c diff --git a/src/libsysprof-analyze/sysprof-document-allocation.h b/src/libsysprof/sysprof-document-allocation.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-allocation.h rename to src/libsysprof/sysprof-document-allocation.h diff --git a/src/libsysprof-analyze/sysprof-document-bitset-index-private.h b/src/libsysprof/sysprof-document-bitset-index-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-bitset-index-private.h rename to src/libsysprof/sysprof-document-bitset-index-private.h diff --git a/src/libsysprof-analyze/sysprof-document-bitset-index.c b/src/libsysprof/sysprof-document-bitset-index.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-bitset-index.c rename to src/libsysprof/sysprof-document-bitset-index.c diff --git a/src/libsysprof-analyze/sysprof-document-counter-private.h b/src/libsysprof/sysprof-document-counter-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-counter-private.h rename to src/libsysprof/sysprof-document-counter-private.h diff --git a/src/libsysprof-analyze/sysprof-document-counter-value-private.h b/src/libsysprof/sysprof-document-counter-value-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-counter-value-private.h rename to src/libsysprof/sysprof-document-counter-value-private.h diff --git a/src/libsysprof-analyze/sysprof-document-counter-value.c b/src/libsysprof/sysprof-document-counter-value.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-counter-value.c rename to src/libsysprof/sysprof-document-counter-value.c diff --git a/src/libsysprof-analyze/sysprof-document-counter-value.h b/src/libsysprof/sysprof-document-counter-value.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-counter-value.h rename to src/libsysprof/sysprof-document-counter-value.h diff --git a/src/libsysprof-analyze/sysprof-document-counter.c b/src/libsysprof/sysprof-document-counter.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-counter.c rename to src/libsysprof/sysprof-document-counter.c diff --git a/src/libsysprof-analyze/sysprof-document-counter.h b/src/libsysprof/sysprof-document-counter.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-counter.h rename to src/libsysprof/sysprof-document-counter.h diff --git a/src/libsysprof-analyze/sysprof-document-ctrdef.c b/src/libsysprof/sysprof-document-ctrdef.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-ctrdef.c rename to src/libsysprof/sysprof-document-ctrdef.c diff --git a/src/libsysprof-analyze/sysprof-document-ctrdef.h b/src/libsysprof/sysprof-document-ctrdef.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-ctrdef.h rename to src/libsysprof/sysprof-document-ctrdef.h diff --git a/src/libsysprof-analyze/sysprof-document-ctrset.c b/src/libsysprof/sysprof-document-ctrset.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-ctrset.c rename to src/libsysprof/sysprof-document-ctrset.c diff --git a/src/libsysprof-analyze/sysprof-document-ctrset.h b/src/libsysprof/sysprof-document-ctrset.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-ctrset.h rename to src/libsysprof/sysprof-document-ctrset.h diff --git a/src/libsysprof-analyze/sysprof-document-exit.c b/src/libsysprof/sysprof-document-exit.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-exit.c rename to src/libsysprof/sysprof-document-exit.c diff --git a/src/libsysprof-analyze/sysprof-document-exit.h b/src/libsysprof/sysprof-document-exit.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-exit.h rename to src/libsysprof/sysprof-document-exit.h diff --git a/src/libsysprof-analyze/sysprof-document-file-chunk.c b/src/libsysprof/sysprof-document-file-chunk.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-file-chunk.c rename to src/libsysprof/sysprof-document-file-chunk.c diff --git a/src/libsysprof-analyze/sysprof-document-file-chunk.h b/src/libsysprof/sysprof-document-file-chunk.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-file-chunk.h rename to src/libsysprof/sysprof-document-file-chunk.h diff --git a/src/libsysprof-analyze/sysprof-document-file-private.h b/src/libsysprof/sysprof-document-file-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-file-private.h rename to src/libsysprof/sysprof-document-file-private.h diff --git a/src/libsysprof-analyze/sysprof-document-file.c b/src/libsysprof/sysprof-document-file.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-file.c rename to src/libsysprof/sysprof-document-file.c diff --git a/src/libsysprof-analyze/sysprof-document-file.h b/src/libsysprof/sysprof-document-file.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-file.h rename to src/libsysprof/sysprof-document-file.h diff --git a/src/libsysprof-analyze/sysprof-document-fork.c b/src/libsysprof/sysprof-document-fork.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-fork.c rename to src/libsysprof/sysprof-document-fork.c diff --git a/src/libsysprof-analyze/sysprof-document-fork.h b/src/libsysprof/sysprof-document-fork.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-fork.h rename to src/libsysprof/sysprof-document-fork.h diff --git a/src/libsysprof-analyze/sysprof-document-frame-private.h b/src/libsysprof/sysprof-document-frame-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-frame-private.h rename to src/libsysprof/sysprof-document-frame-private.h diff --git a/src/libsysprof-analyze/sysprof-document-frame.c b/src/libsysprof/sysprof-document-frame.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-frame.c rename to src/libsysprof/sysprof-document-frame.c diff --git a/src/libsysprof-analyze/sysprof-document-frame.h b/src/libsysprof/sysprof-document-frame.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-frame.h rename to src/libsysprof/sysprof-document-frame.h diff --git a/src/libsysprof-analyze/sysprof-document-jitmap.c b/src/libsysprof/sysprof-document-jitmap.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-jitmap.c rename to src/libsysprof/sysprof-document-jitmap.c diff --git a/src/libsysprof-analyze/sysprof-document-jitmap.h b/src/libsysprof/sysprof-document-jitmap.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-jitmap.h rename to src/libsysprof/sysprof-document-jitmap.h diff --git a/src/libsysprof-analyze/sysprof-document-loader.c b/src/libsysprof/sysprof-document-loader.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-loader.c rename to src/libsysprof/sysprof-document-loader.c diff --git a/src/libsysprof-analyze/sysprof-document-loader.h b/src/libsysprof/sysprof-document-loader.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-loader.h rename to src/libsysprof/sysprof-document-loader.h diff --git a/src/libsysprof-analyze/sysprof-document-log.c b/src/libsysprof/sysprof-document-log.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-log.c rename to src/libsysprof/sysprof-document-log.c diff --git a/src/libsysprof-analyze/sysprof-document-log.h b/src/libsysprof/sysprof-document-log.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-log.h rename to src/libsysprof/sysprof-document-log.h diff --git a/src/libsysprof-analyze/sysprof-document-mark.c b/src/libsysprof/sysprof-document-mark.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-mark.c rename to src/libsysprof/sysprof-document-mark.c diff --git a/src/libsysprof-analyze/sysprof-document-mark.h b/src/libsysprof/sysprof-document-mark.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-mark.h rename to src/libsysprof/sysprof-document-mark.h diff --git a/src/libsysprof-analyze/sysprof-document-metadata.c b/src/libsysprof/sysprof-document-metadata.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-metadata.c rename to src/libsysprof/sysprof-document-metadata.c diff --git a/src/libsysprof-analyze/sysprof-document-metadata.h b/src/libsysprof/sysprof-document-metadata.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-metadata.h rename to src/libsysprof/sysprof-document-metadata.h diff --git a/src/libsysprof-analyze/sysprof-document-mmap.c b/src/libsysprof/sysprof-document-mmap.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-mmap.c rename to src/libsysprof/sysprof-document-mmap.c diff --git a/src/libsysprof-analyze/sysprof-document-mmap.h b/src/libsysprof/sysprof-document-mmap.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-mmap.h rename to src/libsysprof/sysprof-document-mmap.h diff --git a/src/libsysprof-analyze/sysprof-document-overlay.c b/src/libsysprof/sysprof-document-overlay.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-overlay.c rename to src/libsysprof/sysprof-document-overlay.c diff --git a/src/libsysprof-analyze/sysprof-document-overlay.h b/src/libsysprof/sysprof-document-overlay.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-overlay.h rename to src/libsysprof/sysprof-document-overlay.h diff --git a/src/libsysprof-analyze/sysprof-document-private.h b/src/libsysprof/sysprof-document-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-private.h rename to src/libsysprof/sysprof-document-private.h diff --git a/src/libsysprof-analyze/sysprof-document-process-private.h b/src/libsysprof/sysprof-document-process-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-process-private.h rename to src/libsysprof/sysprof-document-process-private.h diff --git a/src/libsysprof-analyze/sysprof-document-process.c b/src/libsysprof/sysprof-document-process.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-process.c rename to src/libsysprof/sysprof-document-process.c diff --git a/src/libsysprof-analyze/sysprof-document-process.h b/src/libsysprof/sysprof-document-process.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-process.h rename to src/libsysprof/sysprof-document-process.h diff --git a/src/libsysprof-analyze/sysprof-document-sample.c b/src/libsysprof/sysprof-document-sample.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-sample.c rename to src/libsysprof/sysprof-document-sample.c diff --git a/src/libsysprof-analyze/sysprof-document-sample.h b/src/libsysprof/sysprof-document-sample.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-sample.h rename to src/libsysprof/sysprof-document-sample.h diff --git a/src/libsysprof-analyze/sysprof-document-symbols-private.h b/src/libsysprof/sysprof-document-symbols-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-symbols-private.h rename to src/libsysprof/sysprof-document-symbols-private.h diff --git a/src/libsysprof-analyze/sysprof-document-symbols.c b/src/libsysprof/sysprof-document-symbols.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-symbols.c rename to src/libsysprof/sysprof-document-symbols.c diff --git a/src/libsysprof-analyze/sysprof-document-traceable.c b/src/libsysprof/sysprof-document-traceable.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document-traceable.c rename to src/libsysprof/sysprof-document-traceable.c diff --git a/src/libsysprof-analyze/sysprof-document-traceable.h b/src/libsysprof/sysprof-document-traceable.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document-traceable.h rename to src/libsysprof/sysprof-document-traceable.h diff --git a/src/libsysprof-analyze/sysprof-document.c b/src/libsysprof/sysprof-document.c similarity index 100% rename from src/libsysprof-analyze/sysprof-document.c rename to src/libsysprof/sysprof-document.c diff --git a/src/libsysprof-analyze/sysprof-document.h b/src/libsysprof/sysprof-document.h similarity index 100% rename from src/libsysprof-analyze/sysprof-document.h rename to src/libsysprof/sysprof-document.h diff --git a/src/libsysprof-analyze/sysprof-elf-loader-private.h b/src/libsysprof/sysprof-elf-loader-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-elf-loader-private.h rename to src/libsysprof/sysprof-elf-loader-private.h diff --git a/src/libsysprof-analyze/sysprof-elf-loader.c b/src/libsysprof/sysprof-elf-loader.c similarity index 100% rename from src/libsysprof-analyze/sysprof-elf-loader.c rename to src/libsysprof/sysprof-elf-loader.c diff --git a/src/libsysprof-analyze/sysprof-elf-private.h b/src/libsysprof/sysprof-elf-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-elf-private.h rename to src/libsysprof/sysprof-elf-private.h diff --git a/src/libsysprof-analyze/sysprof-elf-symbolizer.c b/src/libsysprof/sysprof-elf-symbolizer.c similarity index 100% rename from src/libsysprof-analyze/sysprof-elf-symbolizer.c rename to src/libsysprof/sysprof-elf-symbolizer.c diff --git a/src/libsysprof-analyze/sysprof-elf-symbolizer.h b/src/libsysprof/sysprof-elf-symbolizer.h similarity index 100% rename from src/libsysprof-analyze/sysprof-elf-symbolizer.h rename to src/libsysprof/sysprof-elf-symbolizer.h diff --git a/src/libsysprof-analyze/sysprof-elf.c b/src/libsysprof/sysprof-elf.c similarity index 100% rename from src/libsysprof-analyze/sysprof-elf.c rename to src/libsysprof/sysprof-elf.c diff --git a/src/libsysprof-profile/sysprof-energy-usage.c b/src/libsysprof/sysprof-energy-usage.c similarity index 100% rename from src/libsysprof-profile/sysprof-energy-usage.c rename to src/libsysprof/sysprof-energy-usage.c diff --git a/src/libsysprof-profile/sysprof-energy-usage.h b/src/libsysprof/sysprof-energy-usage.h similarity index 100% rename from src/libsysprof-profile/sysprof-energy-usage.h rename to src/libsysprof/sysprof-energy-usage.h diff --git a/src/libsysprof-profile/sysprof-instrument-private.h b/src/libsysprof/sysprof-instrument-private.h similarity index 100% rename from src/libsysprof-profile/sysprof-instrument-private.h rename to src/libsysprof/sysprof-instrument-private.h diff --git a/src/libsysprof-profile/sysprof-instrument.c b/src/libsysprof/sysprof-instrument.c similarity index 100% rename from src/libsysprof-profile/sysprof-instrument.c rename to src/libsysprof/sysprof-instrument.c diff --git a/src/libsysprof-profile/sysprof-instrument.h b/src/libsysprof/sysprof-instrument.h similarity index 100% rename from src/libsysprof-profile/sysprof-instrument.h rename to src/libsysprof/sysprof-instrument.h diff --git a/src/libsysprof-analyze/sysprof-jitmap-symbolizer.c b/src/libsysprof/sysprof-jitmap-symbolizer.c similarity index 100% rename from src/libsysprof-analyze/sysprof-jitmap-symbolizer.c rename to src/libsysprof/sysprof-jitmap-symbolizer.c diff --git a/src/libsysprof-analyze/sysprof-jitmap-symbolizer.h b/src/libsysprof/sysprof-jitmap-symbolizer.h similarity index 100% rename from src/libsysprof-analyze/sysprof-jitmap-symbolizer.h rename to src/libsysprof/sysprof-jitmap-symbolizer.h diff --git a/src/libsysprof-profile/sysprof-journald-source.c b/src/libsysprof/sysprof-journald-source.c similarity index 100% rename from src/libsysprof-profile/sysprof-journald-source.c rename to src/libsysprof/sysprof-journald-source.c diff --git a/src/libsysprof-profile/sysprof-journald-source.h b/src/libsysprof/sysprof-journald-source.h similarity index 100% rename from src/libsysprof-profile/sysprof-journald-source.h rename to src/libsysprof/sysprof-journald-source.h diff --git a/src/libsysprof-analyze/sysprof-kallsyms-symbolizer.c b/src/libsysprof/sysprof-kallsyms-symbolizer.c similarity index 100% rename from src/libsysprof-analyze/sysprof-kallsyms-symbolizer.c rename to src/libsysprof/sysprof-kallsyms-symbolizer.c diff --git a/src/libsysprof-analyze/sysprof-kallsyms-symbolizer.h b/src/libsysprof/sysprof-kallsyms-symbolizer.h similarity index 100% rename from src/libsysprof-analyze/sysprof-kallsyms-symbolizer.h rename to src/libsysprof/sysprof-kallsyms-symbolizer.h diff --git a/src/libsysprof-profile/sysprof-linux-instrument-private.h b/src/libsysprof/sysprof-linux-instrument-private.h similarity index 100% rename from src/libsysprof-profile/sysprof-linux-instrument-private.h rename to src/libsysprof/sysprof-linux-instrument-private.h diff --git a/src/libsysprof-profile/sysprof-linux-instrument.c b/src/libsysprof/sysprof-linux-instrument.c similarity index 100% rename from src/libsysprof-profile/sysprof-linux-instrument.c rename to src/libsysprof/sysprof-linux-instrument.c diff --git a/src/libsysprof-profile/sysprof-malloc-tracing.c b/src/libsysprof/sysprof-malloc-tracing.c similarity index 100% rename from src/libsysprof-profile/sysprof-malloc-tracing.c rename to src/libsysprof/sysprof-malloc-tracing.c diff --git a/src/libsysprof-profile/sysprof-malloc-tracing.h b/src/libsysprof/sysprof-malloc-tracing.h similarity index 100% rename from src/libsysprof-profile/sysprof-malloc-tracing.h rename to src/libsysprof/sysprof-malloc-tracing.h diff --git a/src/libsysprof-profile/sysprof-maps-parser-private.h b/src/libsysprof/sysprof-maps-parser-private.h similarity index 100% rename from src/libsysprof-profile/sysprof-maps-parser-private.h rename to src/libsysprof/sysprof-maps-parser-private.h diff --git a/src/libsysprof-profile/sysprof-maps-parser.c b/src/libsysprof/sysprof-maps-parser.c similarity index 100% rename from src/libsysprof-profile/sysprof-maps-parser.c rename to src/libsysprof/sysprof-maps-parser.c diff --git a/src/libsysprof-analyze/sysprof-mark-catalog-private.h b/src/libsysprof/sysprof-mark-catalog-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-mark-catalog-private.h rename to src/libsysprof/sysprof-mark-catalog-private.h diff --git a/src/libsysprof-analyze/sysprof-mark-catalog.c b/src/libsysprof/sysprof-mark-catalog.c similarity index 100% rename from src/libsysprof-analyze/sysprof-mark-catalog.c rename to src/libsysprof/sysprof-mark-catalog.c diff --git a/src/libsysprof-analyze/sysprof-mark-catalog.h b/src/libsysprof/sysprof-mark-catalog.h similarity index 100% rename from src/libsysprof-analyze/sysprof-mark-catalog.h rename to src/libsysprof/sysprof-mark-catalog.h diff --git a/src/libsysprof-profile/sysprof-memory-usage.c b/src/libsysprof/sysprof-memory-usage.c similarity index 100% rename from src/libsysprof-profile/sysprof-memory-usage.c rename to src/libsysprof/sysprof-memory-usage.c diff --git a/src/libsysprof-profile/sysprof-memory-usage.h b/src/libsysprof/sysprof-memory-usage.h similarity index 100% rename from src/libsysprof-profile/sysprof-memory-usage.h rename to src/libsysprof/sysprof-memory-usage.h diff --git a/src/libsysprof-analyze/sysprof-mount-device-private.h b/src/libsysprof/sysprof-mount-device-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-mount-device-private.h rename to src/libsysprof/sysprof-mount-device-private.h diff --git a/src/libsysprof-analyze/sysprof-mount-device.c b/src/libsysprof/sysprof-mount-device.c similarity index 100% rename from src/libsysprof-analyze/sysprof-mount-device.c rename to src/libsysprof/sysprof-mount-device.c diff --git a/src/libsysprof-analyze/sysprof-mount-namespace-private.h b/src/libsysprof/sysprof-mount-namespace-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-mount-namespace-private.h rename to src/libsysprof/sysprof-mount-namespace-private.h diff --git a/src/libsysprof-analyze/sysprof-mount-namespace.c b/src/libsysprof/sysprof-mount-namespace.c similarity index 100% rename from src/libsysprof-analyze/sysprof-mount-namespace.c rename to src/libsysprof/sysprof-mount-namespace.c diff --git a/src/libsysprof-analyze/sysprof-mount-private.h b/src/libsysprof/sysprof-mount-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-mount-private.h rename to src/libsysprof/sysprof-mount-private.h diff --git a/src/libsysprof-analyze/sysprof-mount.c b/src/libsysprof/sysprof-mount.c similarity index 100% rename from src/libsysprof-analyze/sysprof-mount.c rename to src/libsysprof/sysprof-mount.c diff --git a/src/libsysprof-analyze/sysprof-mount.h b/src/libsysprof/sysprof-mount.h similarity index 100% rename from src/libsysprof-analyze/sysprof-mount.h rename to src/libsysprof/sysprof-mount.h diff --git a/src/libsysprof-analyze/sysprof-multi-symbolizer.c b/src/libsysprof/sysprof-multi-symbolizer.c similarity index 100% rename from src/libsysprof-analyze/sysprof-multi-symbolizer.c rename to src/libsysprof/sysprof-multi-symbolizer.c diff --git a/src/libsysprof-analyze/sysprof-multi-symbolizer.h b/src/libsysprof/sysprof-multi-symbolizer.h similarity index 100% rename from src/libsysprof-analyze/sysprof-multi-symbolizer.h rename to src/libsysprof/sysprof-multi-symbolizer.h diff --git a/src/libsysprof-profile/sysprof-network-usage.c b/src/libsysprof/sysprof-network-usage.c similarity index 100% rename from src/libsysprof-profile/sysprof-network-usage.c rename to src/libsysprof/sysprof-network-usage.c diff --git a/src/libsysprof-profile/sysprof-network-usage.h b/src/libsysprof/sysprof-network-usage.h similarity index 100% rename from src/libsysprof-profile/sysprof-network-usage.h rename to src/libsysprof/sysprof-network-usage.h diff --git a/src/libsysprof-analyze/sysprof-no-symbolizer.c b/src/libsysprof/sysprof-no-symbolizer.c similarity index 100% rename from src/libsysprof-analyze/sysprof-no-symbolizer.c rename to src/libsysprof/sysprof-no-symbolizer.c diff --git a/src/libsysprof-analyze/sysprof-no-symbolizer.h b/src/libsysprof/sysprof-no-symbolizer.h similarity index 100% rename from src/libsysprof-analyze/sysprof-no-symbolizer.h rename to src/libsysprof/sysprof-no-symbolizer.h diff --git a/src/libsysprof-profile/sysprof-perf-event-stream-private.h b/src/libsysprof/sysprof-perf-event-stream-private.h similarity index 100% rename from src/libsysprof-profile/sysprof-perf-event-stream-private.h rename to src/libsysprof/sysprof-perf-event-stream-private.h diff --git a/src/libsysprof-profile/sysprof-perf-event-stream.c b/src/libsysprof/sysprof-perf-event-stream.c similarity index 100% rename from src/libsysprof-profile/sysprof-perf-event-stream.c rename to src/libsysprof/sysprof-perf-event-stream.c diff --git a/src/libsysprof-profile/sysprof-podman-private.h b/src/libsysprof/sysprof-podman-private.h similarity index 100% rename from src/libsysprof-profile/sysprof-podman-private.h rename to src/libsysprof/sysprof-podman-private.h diff --git a/src/libsysprof-profile/sysprof-podman.c b/src/libsysprof/sysprof-podman.c similarity index 100% rename from src/libsysprof-profile/sysprof-podman.c rename to src/libsysprof/sysprof-podman.c diff --git a/src/libsysprof-profile/sysprof-polkit-private.h b/src/libsysprof/sysprof-polkit-private.h similarity index 100% rename from src/libsysprof-profile/sysprof-polkit-private.h rename to src/libsysprof/sysprof-polkit-private.h diff --git a/src/libsysprof-profile/sysprof-polkit.c b/src/libsysprof/sysprof-polkit.c similarity index 100% rename from src/libsysprof-profile/sysprof-polkit.c rename to src/libsysprof/sysprof-polkit.c diff --git a/src/libsysprof-profile/sysprof-power-profile.c b/src/libsysprof/sysprof-power-profile.c similarity index 100% rename from src/libsysprof-profile/sysprof-power-profile.c rename to src/libsysprof/sysprof-power-profile.c diff --git a/src/libsysprof-profile/sysprof-power-profile.h b/src/libsysprof/sysprof-power-profile.h similarity index 100% rename from src/libsysprof-profile/sysprof-power-profile.h rename to src/libsysprof/sysprof-power-profile.h diff --git a/src/libsysprof-analyze/sysprof-process-info-private.h b/src/libsysprof/sysprof-process-info-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-process-info-private.h rename to src/libsysprof/sysprof-process-info-private.h diff --git a/src/libsysprof-analyze/sysprof-process-info.c b/src/libsysprof/sysprof-process-info.c similarity index 100% rename from src/libsysprof-analyze/sysprof-process-info.c rename to src/libsysprof/sysprof-process-info.c diff --git a/src/libsysprof-profile/sysprof-profiler.c b/src/libsysprof/sysprof-profiler.c similarity index 100% rename from src/libsysprof-profile/sysprof-profiler.c rename to src/libsysprof/sysprof-profiler.c diff --git a/src/libsysprof-profile/sysprof-profiler.h b/src/libsysprof/sysprof-profiler.h similarity index 100% rename from src/libsysprof-profile/sysprof-profiler.h rename to src/libsysprof/sysprof-profiler.h diff --git a/src/libsysprof-profile/sysprof-proxied-instrument-private.h b/src/libsysprof/sysprof-proxied-instrument-private.h similarity index 100% rename from src/libsysprof-profile/sysprof-proxied-instrument-private.h rename to src/libsysprof/sysprof-proxied-instrument-private.h diff --git a/src/libsysprof-profile/sysprof-proxied-instrument.c b/src/libsysprof/sysprof-proxied-instrument.c similarity index 100% rename from src/libsysprof-profile/sysprof-proxied-instrument.c rename to src/libsysprof/sysprof-proxied-instrument.c diff --git a/src/libsysprof-profile/sysprof-proxied-instrument.h b/src/libsysprof/sysprof-proxied-instrument.h similarity index 100% rename from src/libsysprof-profile/sysprof-proxied-instrument.h rename to src/libsysprof/sysprof-proxied-instrument.h diff --git a/src/libsysprof-profile/sysprof-recording-private.h b/src/libsysprof/sysprof-recording-private.h similarity index 100% rename from src/libsysprof-profile/sysprof-recording-private.h rename to src/libsysprof/sysprof-recording-private.h diff --git a/src/libsysprof-profile/sysprof-recording.c b/src/libsysprof/sysprof-recording.c similarity index 100% rename from src/libsysprof-profile/sysprof-recording.c rename to src/libsysprof/sysprof-recording.c diff --git a/src/libsysprof-profile/sysprof-recording.h b/src/libsysprof/sysprof-recording.h similarity index 100% rename from src/libsysprof-profile/sysprof-recording.h rename to src/libsysprof/sysprof-recording.h diff --git a/src/libsysprof-profile/sysprof-sampler.c b/src/libsysprof/sysprof-sampler.c similarity index 100% rename from src/libsysprof-profile/sysprof-sampler.c rename to src/libsysprof/sysprof-sampler.c diff --git a/src/libsysprof-profile/sysprof-sampler.h b/src/libsysprof/sysprof-sampler.h similarity index 100% rename from src/libsysprof-profile/sysprof-sampler.h rename to src/libsysprof/sysprof-sampler.h diff --git a/src/libsysprof-profile/sysprof-spawnable.c b/src/libsysprof/sysprof-spawnable.c similarity index 100% rename from src/libsysprof-profile/sysprof-spawnable.c rename to src/libsysprof/sysprof-spawnable.c diff --git a/src/libsysprof-profile/sysprof-spawnable.h b/src/libsysprof/sysprof-spawnable.h similarity index 100% rename from src/libsysprof-profile/sysprof-spawnable.h rename to src/libsysprof/sysprof-spawnable.h diff --git a/src/libsysprof-analyze/sysprof-strings-private.h b/src/libsysprof/sysprof-strings-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-strings-private.h rename to src/libsysprof/sysprof-strings-private.h diff --git a/src/libsysprof-analyze/sysprof-strings.c b/src/libsysprof/sysprof-strings.c similarity index 100% rename from src/libsysprof-analyze/sysprof-strings.c rename to src/libsysprof/sysprof-strings.c diff --git a/src/libsysprof-analyze/sysprof-symbol-cache-private.h b/src/libsysprof/sysprof-symbol-cache-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-symbol-cache-private.h rename to src/libsysprof/sysprof-symbol-cache-private.h diff --git a/src/libsysprof-analyze/sysprof-symbol-cache.c b/src/libsysprof/sysprof-symbol-cache.c similarity index 100% rename from src/libsysprof-analyze/sysprof-symbol-cache.c rename to src/libsysprof/sysprof-symbol-cache.c diff --git a/src/libsysprof-analyze/sysprof-symbol-private.h b/src/libsysprof/sysprof-symbol-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-symbol-private.h rename to src/libsysprof/sysprof-symbol-private.h diff --git a/src/libsysprof-analyze/sysprof-symbol.c b/src/libsysprof/sysprof-symbol.c similarity index 100% rename from src/libsysprof-analyze/sysprof-symbol.c rename to src/libsysprof/sysprof-symbol.c diff --git a/src/libsysprof-analyze/sysprof-symbol.h b/src/libsysprof/sysprof-symbol.h similarity index 100% rename from src/libsysprof-analyze/sysprof-symbol.h rename to src/libsysprof/sysprof-symbol.h diff --git a/src/libsysprof-analyze/sysprof-symbolizer-private.h b/src/libsysprof/sysprof-symbolizer-private.h similarity index 100% rename from src/libsysprof-analyze/sysprof-symbolizer-private.h rename to src/libsysprof/sysprof-symbolizer-private.h diff --git a/src/libsysprof-analyze/sysprof-symbolizer.c b/src/libsysprof/sysprof-symbolizer.c similarity index 100% rename from src/libsysprof-analyze/sysprof-symbolizer.c rename to src/libsysprof/sysprof-symbolizer.c diff --git a/src/libsysprof-analyze/sysprof-symbolizer.h b/src/libsysprof/sysprof-symbolizer.h similarity index 100% rename from src/libsysprof-analyze/sysprof-symbolizer.h rename to src/libsysprof/sysprof-symbolizer.h diff --git a/src/libsysprof-profile/sysprof-symbols-bundle.c b/src/libsysprof/sysprof-symbols-bundle.c similarity index 99% rename from src/libsysprof-profile/sysprof-symbols-bundle.c rename to src/libsysprof/sysprof-symbols-bundle.c index 2602f514..651e2197 100644 --- a/src/libsysprof-profile/sysprof-symbols-bundle.c +++ b/src/libsysprof/sysprof-symbols-bundle.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include "sysprof-instrument-private.h" #include "sysprof-recording-private.h" diff --git a/src/libsysprof-profile/sysprof-symbols-bundle.h b/src/libsysprof/sysprof-symbols-bundle.h similarity index 100% rename from src/libsysprof-profile/sysprof-symbols-bundle.h rename to src/libsysprof/sysprof-symbols-bundle.h diff --git a/src/libsysprof-profile/sysprof-system-logs.c b/src/libsysprof/sysprof-system-logs.c similarity index 100% rename from src/libsysprof-profile/sysprof-system-logs.c rename to src/libsysprof/sysprof-system-logs.c diff --git a/src/libsysprof-profile/sysprof-system-logs.h b/src/libsysprof/sysprof-system-logs.h similarity index 100% rename from src/libsysprof-profile/sysprof-system-logs.h rename to src/libsysprof/sysprof-system-logs.h diff --git a/src/libsysprof-analyze/sysprof-thread-info.c b/src/libsysprof/sysprof-thread-info.c similarity index 100% rename from src/libsysprof-analyze/sysprof-thread-info.c rename to src/libsysprof/sysprof-thread-info.c diff --git a/src/libsysprof-analyze/sysprof-thread-info.h b/src/libsysprof/sysprof-thread-info.h similarity index 100% rename from src/libsysprof-analyze/sysprof-thread-info.h rename to src/libsysprof/sysprof-thread-info.h diff --git a/src/libsysprof-analyze/sysprof-time-span.c b/src/libsysprof/sysprof-time-span.c similarity index 100% rename from src/libsysprof-analyze/sysprof-time-span.c rename to src/libsysprof/sysprof-time-span.c diff --git a/src/libsysprof-analyze/sysprof-time-span.h b/src/libsysprof/sysprof-time-span.h similarity index 100% rename from src/libsysprof-analyze/sysprof-time-span.h rename to src/libsysprof/sysprof-time-span.h diff --git a/src/libsysprof-profile/sysprof-tracer.c b/src/libsysprof/sysprof-tracer.c similarity index 100% rename from src/libsysprof-profile/sysprof-tracer.c rename to src/libsysprof/sysprof-tracer.c diff --git a/src/libsysprof-profile/sysprof-tracer.h b/src/libsysprof/sysprof-tracer.h similarity index 100% rename from src/libsysprof-profile/sysprof-tracer.h rename to src/libsysprof/sysprof-tracer.h diff --git a/src/libsysprof-analyze/sysprof-analyze.h b/src/libsysprof/sysprof.h similarity index 76% rename from src/libsysprof-analyze/sysprof-analyze.h rename to src/libsysprof/sysprof.h index f7f389b7..db007357 100644 --- a/src/libsysprof-analyze/sysprof-analyze.h +++ b/src/libsysprof/sysprof.h @@ -1,4 +1,4 @@ -/* sysprof-analyze.h +/* sysprof.h * * Copyright 2023 Christian Hergert * @@ -24,25 +24,28 @@ G_BEGIN_DECLS -#define SYSPROF_ANALYZE_INSIDE +#define SYSPROF_INSIDE +# include "sysprof-battery-charge.h" # include "sysprof-bundled-symbolizer.h" -# include "sysprof-callgraph.h" # include "sysprof-callgraph-frame.h" # include "sysprof-callgraph-symbol.h" +# include "sysprof-callgraph.h" # include "sysprof-cpu-info.h" -# include "sysprof-document.h" +# include "sysprof-cpu-usage.h" +# include "sysprof-diagnostic.h" +# include "sysprof-disk-usage.h" # include "sysprof-document-allocation.h" -# include "sysprof-document-counter.h" # include "sysprof-document-counter-value.h" +# include "sysprof-document-counter.h" # include "sysprof-document-ctrdef.h" # include "sysprof-document-ctrset.h" # include "sysprof-document-exit.h" -# include "sysprof-document-file.h" # include "sysprof-document-file-chunk.h" +# include "sysprof-document-file.h" # include "sysprof-document-fork.h" # include "sysprof-document-frame.h" -# include "sysprof-document-loader.h" # include "sysprof-document-jitmap.h" +# include "sysprof-document-loader.h" # include "sysprof-document-log.h" # include "sysprof-document-mark.h" # include "sysprof-document-metadata.h" @@ -51,17 +54,32 @@ G_BEGIN_DECLS # include "sysprof-document-process.h" # include "sysprof-document-sample.h" # include "sysprof-document-traceable.h" +# include "sysprof-document.h" # include "sysprof-elf-symbolizer.h" +# include "sysprof-energy-usage.h" +# include "sysprof-instrument.h" # include "sysprof-jitmap-symbolizer.h" # include "sysprof-kallsyms-symbolizer.h" +# include "sysprof-malloc-tracing.h" # include "sysprof-mark-catalog.h" +# include "sysprof-memory-usage.h" # include "sysprof-mount.h" # include "sysprof-multi-symbolizer.h" +# include "sysprof-network-usage.h" # include "sysprof-no-symbolizer.h" +# include "sysprof-power-profile.h" +# include "sysprof-profiler.h" +# include "sysprof-proxied-instrument.h" +# include "sysprof-recording.h" +# include "sysprof-sampler.h" +# include "sysprof-spawnable.h" # include "sysprof-symbol.h" # include "sysprof-symbolizer.h" +# include "sysprof-symbols-bundle.h" +# include "sysprof-system-logs.h" # include "sysprof-thread-info.h" # include "sysprof-time-span.h" -#undef SYSPROF_ANALYZE_INSIDE +# include "sysprof-tracer.h" +#undef SYSPROF_INSIDE G_END_DECLS diff --git a/src/libsysprof-analyze/tests/meson.build b/src/libsysprof/tests/meson.build similarity index 68% rename from src/libsysprof-analyze/tests/meson.build rename to src/libsysprof/tests/meson.build index 921b22b7..bcb40772 100644 --- a/src/libsysprof-analyze/tests/meson.build +++ b/src/libsysprof/tests/meson.build @@ -1,17 +1,16 @@ -libsysprof_analyze_test_env = [ +libsysprof_test_env = [ 'G_DEBUG=gc-friendly', 'GSETTINGS_BACKEND=memory', 'MALLOC_CHECK_=2', ] -libsysprof_analyze_testsuite_c_args = [ - '-DG_LOG_DOMAIN="libsysprof-analyze"', +libsysprof_testsuite_c_args = [ '-DG_ENABLE_DEBUG', '-UG_DISABLE_ASSERT', '-UG_DISABLE_CAST_CHECKS', ] -libsysprof_analyze_testsuite = { +libsysprof_testsuite = { 'test-callgraph' : {'skip': true}, 'test-capture-model' : {'skip': true}, 'test-elf-loader' : {'skip': true}, @@ -20,8 +19,10 @@ libsysprof_analyze_testsuite = { 'test-list-files' : {'skip': true}, 'test-list-jitmap' : {'skip': true}, 'test-list-overlays' : {'skip': true}, + 'test-maps-parser' : {'skip': true}, 'test-mark-catalog' : {'skip': true}, 'test-print-file' : {'skip': true}, + 'test-profiler' : {'skip': true}, 'test-list-processes' : {'skip': true}, 'test-list-address-layout' : {'skip': true}, 'test-symbolize' : {'skip': true}, @@ -29,16 +30,16 @@ libsysprof_analyze_testsuite = { 'test-symbol-cache' : {}, } -libsysprof_analyze_testsuite_deps = [ - libsysprof_analyze_static_dep, +libsysprof_testsuite_deps = [ + libsysprof_static_dep, ] -foreach test, params: libsysprof_analyze_testsuite +foreach test, params: libsysprof_testsuite test_exe = executable(test, '@0@.c'.format(test), - c_args: libsysprof_analyze_testsuite_c_args, - dependencies: libsysprof_analyze_testsuite_deps, + c_args: libsysprof_testsuite_c_args, + dependencies: libsysprof_testsuite_deps, ) if not params.get('skip', false) - test(test, test_exe, env: libsysprof_analyze_test_env) + test(test, test_exe, env: libsysprof_test_env) endif endforeach diff --git a/src/libsysprof-analyze/tests/test-callgraph.c b/src/libsysprof/tests/test-callgraph.c similarity index 99% rename from src/libsysprof-analyze/tests/test-callgraph.c rename to src/libsysprof/tests/test-callgraph.c index 43a1d310..f90ebe8b 100644 --- a/src/libsysprof-analyze/tests/test-callgraph.c +++ b/src/libsysprof/tests/test-callgraph.c @@ -23,7 +23,7 @@ #include #include -#include +#include typedef struct _Augment { diff --git a/src/libsysprof-analyze/tests/test-capture-model.c b/src/libsysprof/tests/test-capture-model.c similarity index 99% rename from src/libsysprof-analyze/tests/test-capture-model.c rename to src/libsysprof/tests/test-capture-model.c index d9356adc..c509c6d8 100644 --- a/src/libsysprof-analyze/tests/test-capture-model.c +++ b/src/libsysprof/tests/test-capture-model.c @@ -1,7 +1,7 @@ #include #include -#include +#include #include "sysprof-document-private.h" diff --git a/src/libsysprof-analyze/tests/test-elf-loader.c b/src/libsysprof/tests/test-elf-loader.c similarity index 99% rename from src/libsysprof-analyze/tests/test-elf-loader.c rename to src/libsysprof/tests/test-elf-loader.c index 0b0e0c95..41874c22 100644 --- a/src/libsysprof-analyze/tests/test-elf-loader.c +++ b/src/libsysprof/tests/test-elf-loader.c @@ -18,7 +18,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#include +#include #include "sysprof-document-process-private.h" #include "sysprof-elf-loader-private.h" diff --git a/src/libsysprof-analyze/tests/test-list-address-layout.c b/src/libsysprof/tests/test-list-address-layout.c similarity index 98% rename from src/libsysprof-analyze/tests/test-list-address-layout.c rename to src/libsysprof/tests/test-list-address-layout.c index 2881d22d..37b9fdbd 100644 --- a/src/libsysprof-analyze/tests/test-list-address-layout.c +++ b/src/libsysprof/tests/test-list-address-layout.c @@ -18,7 +18,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#include +#include #include "sysprof-document-private.h" diff --git a/src/libsysprof-analyze/tests/test-list-counters.c b/src/libsysprof/tests/test-list-counters.c similarity index 99% rename from src/libsysprof-analyze/tests/test-list-counters.c rename to src/libsysprof/tests/test-list-counters.c index aa9bf112..579fd296 100644 --- a/src/libsysprof-analyze/tests/test-list-counters.c +++ b/src/libsysprof/tests/test-list-counters.c @@ -18,7 +18,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#include +#include #include "sysprof-document-private.h" diff --git a/src/libsysprof-analyze/tests/test-list-cpu.c b/src/libsysprof/tests/test-list-cpu.c similarity index 98% rename from src/libsysprof-analyze/tests/test-list-cpu.c rename to src/libsysprof/tests/test-list-cpu.c index 23872b53..d5da5255 100644 --- a/src/libsysprof-analyze/tests/test-list-cpu.c +++ b/src/libsysprof/tests/test-list-cpu.c @@ -18,7 +18,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#include +#include #include "sysprof-document-private.h" diff --git a/src/libsysprof-analyze/tests/test-list-files.c b/src/libsysprof/tests/test-list-files.c similarity index 98% rename from src/libsysprof-analyze/tests/test-list-files.c rename to src/libsysprof/tests/test-list-files.c index 78b3ae06..5559dec7 100644 --- a/src/libsysprof-analyze/tests/test-list-files.c +++ b/src/libsysprof/tests/test-list-files.c @@ -18,7 +18,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#include +#include #include "sysprof-document-private.h" diff --git a/src/libsysprof-analyze/tests/test-list-jitmap.c b/src/libsysprof/tests/test-list-jitmap.c similarity index 98% rename from src/libsysprof-analyze/tests/test-list-jitmap.c rename to src/libsysprof/tests/test-list-jitmap.c index 1029ff52..9ae637ef 100644 --- a/src/libsysprof-analyze/tests/test-list-jitmap.c +++ b/src/libsysprof/tests/test-list-jitmap.c @@ -18,7 +18,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#include +#include #include "sysprof-document-private.h" diff --git a/src/libsysprof-analyze/tests/test-list-overlays.c b/src/libsysprof/tests/test-list-overlays.c similarity index 99% rename from src/libsysprof-analyze/tests/test-list-overlays.c rename to src/libsysprof/tests/test-list-overlays.c index e89958e8..43c24f10 100644 --- a/src/libsysprof-analyze/tests/test-list-overlays.c +++ b/src/libsysprof/tests/test-list-overlays.c @@ -18,7 +18,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#include +#include #include "sysprof-document-private.h" diff --git a/src/libsysprof-analyze/tests/test-list-processes.c b/src/libsysprof/tests/test-list-processes.c similarity index 99% rename from src/libsysprof-analyze/tests/test-list-processes.c rename to src/libsysprof/tests/test-list-processes.c index 995b5fa7..3e571ddb 100644 --- a/src/libsysprof-analyze/tests/test-list-processes.c +++ b/src/libsysprof/tests/test-list-processes.c @@ -18,7 +18,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#include +#include #include "sysprof-document-private.h" diff --git a/src/libsysprof-profile/tests/test-maps-parser.c b/src/libsysprof/tests/test-maps-parser.c similarity index 100% rename from src/libsysprof-profile/tests/test-maps-parser.c rename to src/libsysprof/tests/test-maps-parser.c diff --git a/src/libsysprof-analyze/tests/test-mark-catalog.c b/src/libsysprof/tests/test-mark-catalog.c similarity index 98% rename from src/libsysprof-analyze/tests/test-mark-catalog.c rename to src/libsysprof/tests/test-mark-catalog.c index 615f26be..3452d5a5 100644 --- a/src/libsysprof-analyze/tests/test-mark-catalog.c +++ b/src/libsysprof/tests/test-mark-catalog.c @@ -18,7 +18,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#include +#include #include "sysprof-document-private.h" diff --git a/src/libsysprof-analyze/tests/test-print-file.c b/src/libsysprof/tests/test-print-file.c similarity index 98% rename from src/libsysprof-analyze/tests/test-print-file.c rename to src/libsysprof/tests/test-print-file.c index 1e49f19d..ae0c193b 100644 --- a/src/libsysprof-analyze/tests/test-print-file.c +++ b/src/libsysprof/tests/test-print-file.c @@ -18,7 +18,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#include +#include #include "sysprof-document-private.h" diff --git a/src/libsysprof-profile/tests/test-profiler.c b/src/libsysprof/tests/test-profiler.c similarity index 99% rename from src/libsysprof-profile/tests/test-profiler.c rename to src/libsysprof/tests/test-profiler.c index 1ac31e10..a7a6d5e6 100644 --- a/src/libsysprof-profile/tests/test-profiler.c +++ b/src/libsysprof/tests/test-profiler.c @@ -23,7 +23,7 @@ #include #include -#include +#include static GMainLoop *main_loop; static char *capture_file; diff --git a/src/libsysprof-analyze/tests/test-strings.c b/src/libsysprof/tests/test-strings.c similarity index 93% rename from src/libsysprof-analyze/tests/test-strings.c rename to src/libsysprof/tests/test-strings.c index 3f1dfbd7..dacf7ed7 100644 --- a/src/libsysprof-analyze/tests/test-strings.c +++ b/src/libsysprof/tests/test-strings.c @@ -20,7 +20,7 @@ #include "config.h" -#include +#include #include "sysprof-strings-private.h" @@ -43,6 +43,6 @@ main (int argc, char *argv[]) { g_test_init (&argc, &argv, NULL); - g_test_add_func ("/libsysprof-analyze/Strings/basic", test_basic); + g_test_add_func ("/libsysprof/Strings/basic", test_basic); return g_test_run (); } diff --git a/src/libsysprof-analyze/tests/test-symbol-cache.c b/src/libsysprof/tests/test-symbol-cache.c similarity index 96% rename from src/libsysprof-analyze/tests/test-symbol-cache.c rename to src/libsysprof/tests/test-symbol-cache.c index 99f11192..61c0c4a5 100644 --- a/src/libsysprof-analyze/tests/test-symbol-cache.c +++ b/src/libsysprof/tests/test-symbol-cache.c @@ -20,7 +20,7 @@ #include -#include +#include #include "sysprof-symbol-private.h" #include "sysprof-symbol-cache-private.h" @@ -234,11 +234,11 @@ main (int argc, char *argv[]) { g_test_init (&argc, &argv, NULL); - g_test_add_func ("/libsysprof-analyze/SysprofSymbolCache/interval-tree", + g_test_add_func ("/libsysprof/SysprofSymbolCache/interval-tree", test_interval_tree); - g_test_add_func ("/libsysprof-analyze/SysprofSymbolCache/jitmap", + g_test_add_func ("/libsysprof/SysprofSymbolCache/jitmap", test_jitmap); - g_test_add_func ("/libsysprof-analyze/SysprofSymbolCache/collision", + g_test_add_func ("/libsysprof/SysprofSymbolCache/collision", test_collision); return g_test_run (); } diff --git a/src/libsysprof-analyze/tests/test-symbolize.c b/src/libsysprof/tests/test-symbolize.c similarity index 99% rename from src/libsysprof-analyze/tests/test-symbolize.c rename to src/libsysprof/tests/test-symbolize.c index 31b6b1ab..d3fdd2c2 100644 --- a/src/libsysprof-analyze/tests/test-symbolize.c +++ b/src/libsysprof/tests/test-symbolize.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include #include "sysprof-document-private.h" diff --git a/src/libsysprof-analyze/tree.h b/src/libsysprof/tree.h similarity index 100% rename from src/libsysprof-analyze/tree.h rename to src/libsysprof/tree.h diff --git a/src/meson.build b/src/meson.build index eed90e32..01849e8f 100644 --- a/src/meson.build +++ b/src/meson.build @@ -10,16 +10,10 @@ sysprof_version_conf.set('MINOR_VERSION', sysprof_version[1]) sysprof_version_conf.set('MICRO_VERSION', sysprof_version[2]) sysprof_version_conf.set('VERSION', meson.project_version()) -if need_libsysprof_capture - subdir('libsysprof-capture') -endif +subdir('libsysprof-capture') -if need_libsysprof_analyze - subdir('libsysprof-analyze') -endif - -if need_libsysprof_profile - subdir('libsysprof-profile') +if need_libsysprof + subdir('libsysprof') subdir('preload') endif diff --git a/src/sysprof-agent/meson.build b/src/sysprof-agent/meson.build index 84a2659e..7713abce 100644 --- a/src/sysprof-agent/meson.build +++ b/src/sysprof-agent/meson.build @@ -13,8 +13,7 @@ sysprof_agent_c_args = [ ] sysprof_agent_deps = [ - libsysprof_analyze_static_dep, - libsysprof_profile_static_dep, + libsysprof_static_dep, ] sysprof_agent = executable('sysprof-agent', sysprof_agent_sources, diff --git a/src/sysprof-agent/sysprof-agent.c b/src/sysprof-agent/sysprof-agent.c index d8ee907e..458273e2 100644 --- a/src/sysprof-agent/sysprof-agent.c +++ b/src/sysprof-agent/sysprof-agent.c @@ -30,7 +30,7 @@ #include #include -#include +#include #include "ipc-agent.h" diff --git a/src/sysprof-cli/meson.build b/src/sysprof-cli/meson.build index 61ecf520..4bf0acc6 100644 --- a/src/sysprof-cli/meson.build +++ b/src/sysprof-cli/meson.build @@ -8,8 +8,7 @@ sysprof_cli_c_args = [ sysprof_cli_deps = [ dependency('polkit-agent-1'), - libsysprof_analyze_static_dep, - libsysprof_profile_static_dep, + libsysprof_static_dep, ] sysprof_cli = executable('sysprof-cli', sysprof_cli_sources, diff --git a/src/sysprof-cli/sysprof-cli.c b/src/sysprof-cli/sysprof-cli.c index e37f72e3..d9b7560a 100644 --- a/src/sysprof-cli/sysprof-cli.c +++ b/src/sysprof-cli/sysprof-cli.c @@ -30,8 +30,7 @@ #include #include -#include -#include +#include #define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE #include diff --git a/src/sysprof/meson.build b/src/sysprof/meson.build index 4b0690c5..c18e0fc0 100644 --- a/src/sysprof/meson.build +++ b/src/sysprof/meson.build @@ -68,8 +68,8 @@ sysprof_deps = [ dependency('gtk4', version: gtk_req_version), dependency('libadwaita-1', version: '>= 1.4.alpha'), dependency('libpanel-1', version: '>= 1.3.0'), - libsysprof_analyze_static_dep, - libsysprof_profile_static_dep, + + libsysprof_static_dep, ] sysprof = executable('sysprof', sysprof_resources + sysprof_sources, diff --git a/src/sysprof/sysprof-callgraph-view.h b/src/sysprof/sysprof-callgraph-view.h index ca638b33..f234acdb 100644 --- a/src/sysprof/sysprof-callgraph-view.h +++ b/src/sysprof/sysprof-callgraph-view.h @@ -23,7 +23,7 @@ #include #include -#include +#include G_BEGIN_DECLS diff --git a/src/sysprof/sysprof-column-layer.h b/src/sysprof/sysprof-column-layer.h index 8e26ac76..6b0dc486 100644 --- a/src/sysprof/sysprof-column-layer.h +++ b/src/sysprof/sysprof-column-layer.h @@ -22,7 +22,7 @@ #include -#include +#include #include "sysprof-axis.h" #include "sysprof-xy-layer.h" diff --git a/src/sysprof/sysprof-line-layer.h b/src/sysprof/sysprof-line-layer.h index aade6f9b..fe5de457 100644 --- a/src/sysprof/sysprof-line-layer.h +++ b/src/sysprof/sysprof-line-layer.h @@ -21,7 +21,7 @@ #pragma once -#include +#include #include "sysprof-xy-layer.h" diff --git a/src/sysprof/sysprof-mark-chart-item-private.h b/src/sysprof/sysprof-mark-chart-item-private.h index 433657fa..4800e900 100644 --- a/src/sysprof/sysprof-mark-chart-item-private.h +++ b/src/sysprof/sysprof-mark-chart-item-private.h @@ -20,7 +20,7 @@ #pragma once -#include +#include #include "sysprof-session.h" #include "sysprof-time-series.h" diff --git a/src/sysprof/sysprof-mark-chart-row.c b/src/sysprof/sysprof-mark-chart-row.c index 112658cd..5d41ad81 100644 --- a/src/sysprof/sysprof-mark-chart-row.c +++ b/src/sysprof/sysprof-mark-chart-row.c @@ -20,7 +20,7 @@ #include "config.h" -#include +#include #include "sysprof-mark-chart-row-private.h" #include "sysprof-chart.h" diff --git a/src/sysprof/sysprof-mark-table.h b/src/sysprof/sysprof-mark-table.h index 3495bef4..20c1c277 100644 --- a/src/sysprof/sysprof-mark-table.h +++ b/src/sysprof/sysprof-mark-table.h @@ -22,7 +22,7 @@ #include -#include +#include #include "sysprof-session.h" diff --git a/src/sysprof/sysprof-process-dialog.h b/src/sysprof/sysprof-process-dialog.h index fa1dc0cf..c7bedc8c 100644 --- a/src/sysprof/sysprof-process-dialog.h +++ b/src/sysprof/sysprof-process-dialog.h @@ -22,7 +22,7 @@ #include -#include +#include G_BEGIN_DECLS diff --git a/src/sysprof/sysprof-recording-pad.h b/src/sysprof/sysprof-recording-pad.h index 8cb96bda..e7080ed2 100644 --- a/src/sysprof/sysprof-recording-pad.h +++ b/src/sysprof/sysprof-recording-pad.h @@ -22,7 +22,7 @@ #include -#include +#include G_BEGIN_DECLS diff --git a/src/sysprof/sysprof-session-model-item.h b/src/sysprof/sysprof-session-model-item.h index 42712cf5..6b5cdf52 100644 --- a/src/sysprof/sysprof-session-model-item.h +++ b/src/sysprof/sysprof-session-model-item.h @@ -20,7 +20,7 @@ #pragma once -#include +#include #include "sysprof-session.h" diff --git a/src/sysprof/sysprof-session-model.h b/src/sysprof/sysprof-session-model.h index 41e196b0..cb0053af 100644 --- a/src/sysprof/sysprof-session-model.h +++ b/src/sysprof/sysprof-session-model.h @@ -20,7 +20,7 @@ #pragma once -#include +#include #include "sysprof-session.h" diff --git a/src/sysprof/sysprof-session.h b/src/sysprof/sysprof-session.h index 0cc8702a..0e7417dd 100644 --- a/src/sysprof/sysprof-session.h +++ b/src/sysprof/sysprof-session.h @@ -22,7 +22,7 @@ #include -#include +#include #include "sysprof-axis.h" #include "sysprof-time-span.h" diff --git a/src/sysprof/sysprof-split-layer.h b/src/sysprof/sysprof-split-layer.h index 41126b10..3333c63e 100644 --- a/src/sysprof/sysprof-split-layer.h +++ b/src/sysprof/sysprof-split-layer.h @@ -23,7 +23,7 @@ #include "sysprof-chart-layer.h" -#include +#include G_BEGIN_DECLS diff --git a/src/sysprof/sysprof-symbol-label-private.h b/src/sysprof/sysprof-symbol-label-private.h index 6bbc4c38..b5642287 100644 --- a/src/sysprof/sysprof-symbol-label-private.h +++ b/src/sysprof/sysprof-symbol-label-private.h @@ -22,7 +22,7 @@ #include -#include +#include G_BEGIN_DECLS diff --git a/src/sysprof/sysprof-time-filter-model.h b/src/sysprof/sysprof-time-filter-model.h index cd75fbad..bb1f8902 100644 --- a/src/sysprof/sysprof-time-filter-model.h +++ b/src/sysprof/sysprof-time-filter-model.h @@ -22,7 +22,7 @@ #include -#include +#include G_BEGIN_DECLS diff --git a/src/sysprof/sysprof-time-scrubber.h b/src/sysprof/sysprof-time-scrubber.h index d7657cb1..6b2b6a33 100644 --- a/src/sysprof/sysprof-time-scrubber.h +++ b/src/sysprof/sysprof-time-scrubber.h @@ -22,7 +22,7 @@ #include -#include +#include G_BEGIN_DECLS diff --git a/src/sysprof/sysprof-window.h b/src/sysprof/sysprof-window.h index 405383f4..649d3fc8 100644 --- a/src/sysprof/sysprof-window.h +++ b/src/sysprof/sysprof-window.h @@ -22,7 +22,7 @@ #include -#include +#include #include "sysprof-application.h" #include "sysprof-session.h" diff --git a/src/sysprof/sysprof-xy-layer.h b/src/sysprof/sysprof-xy-layer.h index 7654a9f9..ab069bb5 100644 --- a/src/sysprof/sysprof-xy-layer.h +++ b/src/sysprof/sysprof-xy-layer.h @@ -20,7 +20,7 @@ #pragma once -#include +#include #include "sysprof-axis.h" #include "sysprof-chart-layer.h" diff --git a/src/sysprofd/meson.build b/src/sysprofd/meson.build index b46eae4e..456d7a9a 100644 --- a/src/sysprofd/meson.build +++ b/src/sysprofd/meson.build @@ -1,11 +1,11 @@ ipc_profiler_src = gnome.gdbus_codegen('ipc-profiler', - sources: '../org.gnome.Sysprof3.Profiler.xml', + sources: 'org.gnome.Sysprof3.Profiler.xml', interface_prefix: 'org.gnome.Sysprof3.', namespace: 'Ipc', ) ipc_service_src = gnome.gdbus_codegen('ipc-service', - sources: '../org.gnome.Sysprof3.Service.xml', + sources: 'org.gnome.Sysprof3.Service.xml', interface_prefix: 'org.gnome.Sysprof3.', namespace: 'Ipc', )