From c9e313bc594f40a86eed237dce222c0fc99c957f Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 15 Dec 2021 15:13:05 -0500 Subject: [PATCH] Rename C++ header files to .hpp MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Rename all C++ header files (include/**/*-internal.h, src/**/*.h except argpar and msgpack, some headers in tests) to have the .hpp extension. Doing so highlights that we include some C++ header files in some test files still compiled as C. This is ok for now, as the files they include don't actually contain C++ code incompatible with C yet, but they could eventually. This is something we can fix later. Change-Id: I8bf326b6b2946a3e26704f3ef3ac5831bbe9bc26 Signed-off-by: Simon Marchi Signed-off-by: Jérémie Galarneau --- .../notification-client.cpp | 2 +- include/Makefile.am | 94 ++++---- ...{action-internal.h => action-internal.hpp} | 10 +- .../{list-internal.h => list-internal.hpp} | 2 +- ...{notify-internal.h => notify-internal.hpp} | 2 +- .../{path-internal.h => path-internal.hpp} | 8 +- ...cy-internal.h => rate-policy-internal.hpp} | 4 +- ...internal.h => rotate-session-internal.hpp} | 2 +- ...ternal.h => snapshot-session-internal.hpp} | 2 +- ...-internal.h => start-session-internal.hpp} | 2 +- ...n-internal.h => stop-session-internal.hpp} | 2 +- ...hannel-internal.h => channel-internal.hpp} | 7 +- ...e-internal.h => buffer-usage-internal.hpp} | 8 +- ...tion-internal.h => condition-internal.hpp} | 6 +- ...ion-internal.h => evaluation-internal.hpp} | 2 +- ...rnal.h => event-rule-matches-internal.hpp} | 12 +- ...l.h => session-consumed-size-internal.hpp} | 8 +- ...ternal.h => session-rotation-internal.hpp} | 8 +- ...{domain-internal.h => domain-internal.hpp} | 2 +- ...point-internal.h => endpoint-internal.hpp} | 2 +- ...ry-internal.h => error-query-internal.hpp} | 6 +- ...xpr-internal.h => event-expr-internal.hpp} | 2 +- ...ernal.h => event-field-value-internal.hpp} | 2 +- .../{event-internal.h => event-internal.hpp} | 2 +- ...ule-internal.h => event-rule-internal.hpp} | 6 +- ...ng-internal.h => jul-logging-internal.hpp} | 10 +- ...-internal.h => kernel-kprobe-internal.hpp} | 6 +- ...internal.h => kernel-syscall-internal.hpp} | 6 +- ...ernal.h => kernel-tracepoint-internal.hpp} | 8 +- ...-internal.h => kernel-uprobe-internal.hpp} | 6 +- ...-internal.h => log4j-logging-internal.hpp} | 10 +- ...internal.h => python-logging-internal.hpp} | 10 +- ...nternal.h => user-tracepoint-internal.hpp} | 10 +- ...{health-internal.h => health-internal.hpp} | 4 +- ...e-internal.h => kernel-probe-internal.hpp} | 4 +- .../{load-internal.h => load-internal.hpp} | 4 +- ...ation-internal.h => location-internal.hpp} | 6 +- ...internal.h => log-level-rule-internal.hpp} | 10 +- ...hannel-internal.h => channel-internal.hpp} | 4 +- ...n-internal.h => notification-internal.hpp} | 2 +- .../{ref-internal.h => ref-internal.hpp} | 0 ...{rotate-internal.h => rotate-internal.hpp} | 2 +- .../{save-internal.h => save-internal.hpp} | 2 +- ...rnal.h => session-descriptor-internal.hpp} | 6 +- ...ession-internal.h => session-internal.hpp} | 2 +- ...pshot-internal.h => snapshot-internal.hpp} | 2 +- ...rigger-internal.h => trigger-internal.hpp} | 8 +- ...nternal.h => userspace-probe-internal.hpp} | 4 +- include/{version.h => version.hpp} | 0 src/bin/lttng-consumerd/Makefile.am | 4 +- src/bin/lttng-consumerd/health-consumerd.cpp | 20 +- ...ealth-consumerd.h => health-consumerd.hpp} | 2 +- src/bin/lttng-consumerd/lttng-consumerd.cpp | 22 +- ...{lttng-consumerd.h => lttng-consumerd.hpp} | 0 .../{testpoint.h => testpoint.hpp} | 2 +- src/bin/lttng-crash/lttng-crash.cpp | 10 +- src/bin/lttng-relayd/Makefile.am | 34 +-- .../backward-compatibility-group-by.cpp | 10 +- ....h => backward-compatibility-group-by.hpp} | 0 src/bin/lttng-relayd/cmd-2-1.cpp | 10 +- .../lttng-relayd/{cmd-2-1.h => cmd-2-1.hpp} | 4 +- src/bin/lttng-relayd/cmd-2-11.cpp | 12 +- .../lttng-relayd/{cmd-2-11.h => cmd-2-11.hpp} | 6 +- src/bin/lttng-relayd/cmd-2-2.cpp | 14 +- .../lttng-relayd/{cmd-2-2.h => cmd-2-2.hpp} | 4 +- src/bin/lttng-relayd/cmd-2-4.cpp | 12 +- .../lttng-relayd/{cmd-2-4.h => cmd-2-4.hpp} | 4 +- src/bin/lttng-relayd/{cmd.h => cmd.hpp} | 8 +- src/bin/lttng-relayd/connection.cpp | 8 +- .../{connection.h => connection.hpp} | 10 +- src/bin/lttng-relayd/ctf-trace.cpp | 10 +- .../{ctf-trace.h => ctf-trace.hpp} | 8 +- src/bin/lttng-relayd/health-relayd.cpp | 24 +-- .../{health-relayd.h => health-relayd.hpp} | 2 +- src/bin/lttng-relayd/index.cpp | 16 +- src/bin/lttng-relayd/{index.h => index.hpp} | 4 +- src/bin/lttng-relayd/live.cpp | 52 ++--- src/bin/lttng-relayd/{live.h => live.hpp} | 4 +- .../{lttng-relayd.h => lttng-relayd.hpp} | 4 +- ...ttng-viewer-abi.h => lttng-viewer-abi.hpp} | 2 +- src/bin/lttng-relayd/main.cpp | 78 +++---- src/bin/lttng-relayd/session.cpp | 26 +-- .../lttng-relayd/{session.h => session.hpp} | 8 +- .../lttng-relayd/sessiond-trace-chunks.cpp | 16 +- ...ace-chunks.h => sessiond-trace-chunks.hpp} | 4 +- src/bin/lttng-relayd/stream.cpp | 18 +- src/bin/lttng-relayd/{stream.h => stream.hpp} | 12 +- src/bin/lttng-relayd/tcp_keep_alive.cpp | 10 +- .../{tcp_keep_alive.h => tcp_keep_alive.hpp} | 2 +- .../{testpoint.h => testpoint.hpp} | 2 +- src/bin/lttng-relayd/tracefile-array.cpp | 8 +- ...{tracefile-array.h => tracefile-array.hpp} | 0 src/bin/lttng-relayd/utils.cpp | 12 +- src/bin/lttng-relayd/{utils.h => utils.hpp} | 0 src/bin/lttng-relayd/viewer-session.cpp | 14 +- .../{viewer-session.h => viewer-session.hpp} | 8 +- src/bin/lttng-relayd/viewer-stream.cpp | 12 +- .../{viewer-stream.h => viewer-stream.hpp} | 8 +- src/bin/lttng-sessiond/Makefile.am | 96 ++++----- src/bin/lttng-sessiond/action-executor.cpp | 30 +-- ...{action-executor.h => action-executor.hpp} | 0 src/bin/lttng-sessiond/agent-thread.cpp | 28 +-- .../{agent-thread.h => agent-thread.hpp} | 0 src/bin/lttng-sessiond/agent.cpp | 20 +- src/bin/lttng-sessiond/{agent.h => agent.hpp} | 2 +- src/bin/lttng-sessiond/buffer-registry.cpp | 18 +- ...{buffer-registry.h => buffer-registry.hpp} | 8 +- src/bin/lttng-sessiond/channel.cpp | 24 +-- .../lttng-sessiond/{channel.h => channel.hpp} | 4 +- src/bin/lttng-sessiond/clear.cpp | 18 +- src/bin/lttng-sessiond/{clear.h => clear.hpp} | 2 +- src/bin/lttng-sessiond/client.cpp | 56 ++--- .../lttng-sessiond/{client.h => client.hpp} | 2 +- src/bin/lttng-sessiond/cmd.cpp | 96 +++++---- src/bin/lttng-sessiond/{cmd.h => cmd.hpp} | 8 +- src/bin/lttng-sessiond/condition-internal.cpp | 20 +- ...tion-internal.h => condition-internal.hpp} | 0 src/bin/lttng-sessiond/consumer.cpp | 22 +- .../{consumer.h => consumer.hpp} | 6 +- src/bin/lttng-sessiond/context.cpp | 16 +- .../lttng-sessiond/{context.h => context.hpp} | 6 +- src/bin/lttng-sessiond/dispatch.cpp | 20 +- .../{dispatch.h => dispatch.hpp} | 2 +- .../event-notifier-error-accounting.cpp | 20 +- ....h => event-notifier-error-accounting.hpp} | 2 +- src/bin/lttng-sessiond/event.cpp | 38 ++-- src/bin/lttng-sessiond/{event.h => event.hpp} | 2 +- src/bin/lttng-sessiond/fd-limit.cpp | 6 +- .../{fd-limit.h => fd-limit.hpp} | 0 src/bin/lttng-sessiond/globals.cpp | 4 +- ...{health-sessiond.h => health-sessiond.hpp} | 2 +- src/bin/lttng-sessiond/health.cpp | 16 +- .../{kern-modules.h => kern-modules.hpp} | 0 src/bin/lttng-sessiond/kernel-consumer.cpp | 20 +- ...{kernel-consumer.h => kernel-consumer.hpp} | 4 +- src/bin/lttng-sessiond/kernel.cpp | 54 ++--- .../lttng-sessiond/{kernel.h => kernel.hpp} | 6 +- .../{lttng-sessiond.h => lttng-sessiond.hpp} | 20 +- src/bin/lttng-sessiond/lttng-syscall.cpp | 12 +- .../{lttng-syscall.h => lttng-syscall.hpp} | 4 +- .../{lttng-ust-abi.h => lttng-ust-abi.hpp} | 2 +- .../{lttng-ust-ctl.h => lttng-ust-ctl.hpp} | 2 +- ...{lttng-ust-error.h => lttng-ust-error.hpp} | 2 +- src/bin/lttng-sessiond/main.cpp | 95 ++++----- src/bin/lttng-sessiond/manage-apps.cpp | 10 +- .../{manage-apps.h => manage-apps.hpp} | 2 +- src/bin/lttng-sessiond/manage-consumer.cpp | 18 +- ...{manage-consumer.h => manage-consumer.hpp} | 2 +- src/bin/lttng-sessiond/manage-kernel.cpp | 20 +- .../{manage-kernel.h => manage-kernel.hpp} | 2 +- src/bin/lttng-sessiond/modprobe.cpp | 10 +- .../{modprobe.h => modprobe.hpp} | 0 .../notification-thread-commands.cpp | 6 +- ...nds.h => notification-thread-commands.hpp} | 8 +- .../notification-thread-events.cpp | 58 ++--- ...vents.h => notification-thread-events.hpp} | 2 +- ...nal.h => notification-thread-internal.hpp} | 12 +- .../lttng-sessiond/notification-thread.cpp | 38 ++-- ...ation-thread.h => notification-thread.hpp} | 10 +- src/bin/lttng-sessiond/notify-apps.cpp | 20 +- .../{notify-apps.h => notify-apps.hpp} | 0 src/bin/lttng-sessiond/process-utils.cpp | 2 +- src/bin/lttng-sessiond/register.cpp | 22 +- .../{register.h => register.hpp} | 2 +- src/bin/lttng-sessiond/rotate.cpp | 42 ++-- .../lttng-sessiond/{rotate.h => rotate.hpp} | 2 +- src/bin/lttng-sessiond/rotation-thread.cpp | 48 ++--- ...{rotation-thread.h => rotation-thread.hpp} | 10 +- src/bin/lttng-sessiond/save.cpp | 26 +-- src/bin/lttng-sessiond/{save.h => save.hpp} | 2 +- src/bin/lttng-sessiond/session.cpp | 26 +-- .../lttng-sessiond/{session.h => session.hpp} | 10 +- src/bin/lttng-sessiond/sessiond-config.cpp | 18 +- ...{sessiond-config.h => sessiond-config.hpp} | 2 +- src/bin/lttng-sessiond/snapshot.cpp | 6 +- .../{snapshot.h => snapshot.hpp} | 8 +- .../{testpoint.h => testpoint.hpp} | 2 +- src/bin/lttng-sessiond/thread-utils.cpp | 6 +- src/bin/lttng-sessiond/thread.cpp | 8 +- .../lttng-sessiond/{thread.h => thread.hpp} | 0 src/bin/lttng-sessiond/timer.cpp | 8 +- src/bin/lttng-sessiond/{timer.h => timer.hpp} | 2 +- src/bin/lttng-sessiond/trace-kernel.cpp | 30 +-- .../{trace-kernel.h => trace-kernel.hpp} | 10 +- src/bin/lttng-sessiond/trace-ust.cpp | 20 +- .../{trace-ust.h => trace-ust.hpp} | 10 +- src/bin/lttng-sessiond/tracker.cpp | 16 +- .../lttng-sessiond/{tracker.h => tracker.hpp} | 2 +- .../lttng-sessiond/trigger-error-query.cpp | 8 +- ...st-abi-internal.h => ust-abi-internal.hpp} | 2 +- src/bin/lttng-sessiond/ust-app.cpp | 50 ++--- .../lttng-sessiond/{ust-app.h => ust-app.hpp} | 10 +- .../{ust-clock.h => ust-clock.hpp} | 4 +- src/bin/lttng-sessiond/ust-consumer.cpp | 24 +-- .../{ust-consumer.h => ust-consumer.hpp} | 6 +- ...st-ctl-internal.h => ust-ctl-internal.hpp} | 2 +- ...rror-internal.h => ust-error-internal.hpp} | 2 +- src/bin/lttng-sessiond/ust-field-utils.cpp | 2 +- ...{ust-field-utils.h => ust-field-utils.hpp} | 2 +- src/bin/lttng-sessiond/ust-metadata.cpp | 10 +- src/bin/lttng-sessiond/ust-registry.cpp | 16 +- .../{ust-registry.h => ust-registry.hpp} | 6 +- src/bin/lttng-sessiond/ust-sigbus.cpp | 2 +- .../{ust-sigbus.h => ust-sigbus.hpp} | 0 src/bin/lttng-sessiond/utils.cpp | 8 +- src/bin/lttng-sessiond/{utils.h => utils.hpp} | 0 src/bin/lttng/Makefile.am | 8 +- src/bin/lttng/{command.h => command.hpp} | 8 +- src/bin/lttng/commands/add_context.cpp | 6 +- src/bin/lttng/commands/add_trigger.cpp | 26 +-- src/bin/lttng/commands/clear.cpp | 8 +- src/bin/lttng/commands/create.cpp | 18 +- src/bin/lttng/commands/destroy.cpp | 8 +- src/bin/lttng/commands/disable_channels.cpp | 6 +- src/bin/lttng/commands/disable_events.cpp | 6 +- src/bin/lttng/commands/disable_rotation.cpp | 6 +- src/bin/lttng/commands/enable_channels.cpp | 12 +- src/bin/lttng/commands/enable_events.cpp | 22 +- src/bin/lttng/commands/enable_rotation.cpp | 8 +- src/bin/lttng/commands/help.cpp | 4 +- src/bin/lttng/commands/list.cpp | 10 +- src/bin/lttng/commands/list_triggers.cpp | 18 +- src/bin/lttng/commands/load.cpp | 6 +- src/bin/lttng/commands/metadata.cpp | 4 +- src/bin/lttng/commands/regenerate.cpp | 4 +- src/bin/lttng/commands/remove_trigger.cpp | 6 +- src/bin/lttng/commands/rotate.cpp | 6 +- src/bin/lttng/commands/save.cpp | 4 +- src/bin/lttng/commands/set_session.cpp | 4 +- src/bin/lttng/commands/snapshot.cpp | 6 +- src/bin/lttng/commands/start.cpp | 6 +- src/bin/lttng/commands/status.cpp | 4 +- src/bin/lttng/commands/stop.cpp | 6 +- src/bin/lttng/commands/track-untrack.cpp | 12 +- src/bin/lttng/commands/version.cpp | 6 +- src/bin/lttng/commands/view.cpp | 4 +- src/bin/lttng/conf.cpp | 8 +- src/bin/lttng/{conf.h => conf.hpp} | 0 src/bin/lttng/loglevel.cpp | 2 +- src/bin/lttng/{loglevel.h => loglevel.hpp} | 2 +- src/bin/lttng/lttng.cpp | 10 +- src/bin/lttng/uprobe.cpp | 12 +- src/bin/lttng/{uprobe.h => uprobe.hpp} | 2 +- src/bin/lttng/utils.cpp | 12 +- src/bin/lttng/{utils.h => utils.hpp} | 2 +- src/common/Makefile.am | 200 +++++++++--------- src/common/actions/action.cpp | 22 +- src/common/actions/list.cpp | 16 +- src/common/actions/notify.cpp | 12 +- src/common/actions/path.cpp | 2 +- src/common/actions/rate-policy.cpp | 16 +- src/common/actions/rotate-session.cpp | 12 +- src/common/actions/snapshot-session.cpp | 20 +- src/common/actions/start-session.cpp | 12 +- src/common/actions/stop-session.cpp | 12 +- src/common/{align.h => align.hpp} | 2 +- src/common/argpar-utils/argpar-utils.cpp | 6 +- .../{argpar-utils.h => argpar-utils.hpp} | 4 +- src/common/buffer-view.cpp | 6 +- src/common/{buffer-view.h => buffer-view.hpp} | 2 +- src/common/{bug.h => bug.hpp} | 0 src/common/bytecode/bytecode.cpp | 4 +- .../bytecode/{bytecode.h => bytecode.hpp} | 4 +- src/common/channel.cpp | 18 +- src/common/{common.h => common.hpp} | 10 +- src/common/compat/compat-fcntl.cpp | 4 +- src/common/compat/directory-handle.cpp | 12 +- ...irectory-handle.h => directory-handle.hpp} | 4 +- src/common/compat/{dirent.h => dirent.hpp} | 0 src/common/compat/{endian.h => endian.hpp} | 0 src/common/compat/{errno.h => errno.hpp} | 0 src/common/compat/{fcntl.h => fcntl.hpp} | 2 +- src/common/compat/{getenv.h => getenv.hpp} | 2 +- src/common/compat/{mman.h => mman.hpp} | 0 src/common/compat/{netdb.h => netdb.hpp} | 0 src/common/compat/{path.h => path.hpp} | 0 src/common/compat/{paths.h => paths.hpp} | 0 src/common/compat/poll.cpp | 10 +- src/common/compat/{poll.h => poll.hpp} | 4 +- src/common/compat/{pthread.h => pthread.hpp} | 2 +- src/common/compat/{socket.h => socket.hpp} | 4 +- src/common/compat/{string.h => string.hpp} | 0 src/common/compat/{tid.h => tid.hpp} | 0 src/common/compat/{time.h => time.hpp} | 2 +- src/common/conditions/buffer-usage.cpp | 10 +- src/common/conditions/condition.cpp | 22 +- src/common/conditions/event-rule-matches.cpp | 16 +- .../conditions/session-consumed-size.cpp | 10 +- src/common/conditions/session-rotation.cpp | 12 +- ...{config-internal.h => config-internal.hpp} | 0 ...g-session-abi.h => config-session-abi.hpp} | 0 src/common/config/session-config.cpp | 16 +- .../{session-config.h => session-config.hpp} | 4 +- .../consumer/consumer-metadata-cache.cpp | 12 +- ...ta-cache.h => consumer-metadata-cache.hpp} | 4 +- src/common/consumer/consumer-stream.cpp | 32 +-- ...{consumer-stream.h => consumer-stream.hpp} | 2 +- ...mer-testpoint.h => consumer-testpoint.hpp} | 2 +- src/common/consumer/consumer-timer.cpp | 18 +- .../{consumer-timer.h => consumer-timer.hpp} | 2 +- src/common/consumer/consumer.cpp | 53 +++-- .../consumer/{consumer.h => consumer.hpp} | 20 +- src/common/consumer/metadata-bucket.cpp | 12 +- ...{metadata-bucket.h => metadata-bucket.hpp} | 2 +- src/common/context.cpp | 6 +- src/common/{context.h => context.hpp} | 2 +- src/common/credentials.cpp | 2 +- src/common/{credentials.h => credentials.hpp} | 4 +- src/common/daemonize.cpp | 6 +- src/common/{daemonize.h => daemonize.hpp} | 2 +- src/common/defaults.cpp | 6 +- src/common/{defaults.h => defaults.hpp} | 2 +- src/common/domain.cpp | 4 +- src/common/dynamic-array.cpp | 2 +- .../{dynamic-array.h => dynamic-array.hpp} | 2 +- src/common/dynamic-buffer.cpp | 6 +- .../{dynamic-buffer.h => dynamic-buffer.hpp} | 2 +- src/common/endpoint.cpp | 2 +- src/common/error-query.cpp | 20 +- src/common/error.cpp | 10 +- src/common/{error.h => error.hpp} | 10 +- src/common/evaluation.cpp | 16 +- src/common/event-expr/event-expr.cpp | 10 +- src/common/event-field-value.cpp | 6 +- src/common/event-rule/event-rule.cpp | 32 +-- src/common/event-rule/jul-logging.cpp | 26 +-- src/common/event-rule/kernel-kprobe.cpp | 24 +-- src/common/event-rule/kernel-syscall.cpp | 24 +-- src/common/event-rule/kernel-tracepoint.cpp | 26 +-- src/common/event-rule/kernel-uprobe.cpp | 24 +-- src/common/event-rule/log4j-logging.cpp | 26 +-- src/common/event-rule/python-logging.cpp | 26 +-- src/common/event-rule/user-tracepoint.cpp | 26 +-- src/common/event.cpp | 26 ++- src/common/fd-handle.cpp | 4 +- src/common/{fd-handle.h => fd-handle.hpp} | 2 +- src/common/fd-tracker/fd-tracker.cpp | 20 +- .../{fd-tracker.h => fd-tracker.hpp} | 4 +- src/common/fd-tracker/inode.cpp | 16 +- src/common/fd-tracker/{inode.h => inode.hpp} | 2 +- src/common/fd-tracker/utils-poll.cpp | 4 +- src/common/fd-tracker/utils.cpp | 6 +- src/common/fd-tracker/{utils.h => utils.hpp} | 6 +- src/common/filter-grammar-test.cpp | 6 +- src/common/filter.cpp | 2 +- src/common/{filter.h => filter.hpp} | 2 +- .../filter/{filter-ast.h => filter-ast.hpp} | 0 .../filter/{filter-ir.h => filter-ir.hpp} | 2 +- src/common/filter/filter-lexer.lpp | 2 +- src/common/filter/filter-parser.ypp | 12 +- .../{filter-symbols.h => filter-symbols.hpp} | 0 .../filter-visitor-generate-bytecode.cpp | 22 +- .../filter/filter-visitor-generate-ir.cpp | 10 +- ...ter-visitor-ir-check-binary-comparator.cpp | 6 +- ...ter-visitor-ir-check-binary-op-nesting.cpp | 8 +- ...ter-visitor-ir-normalize-glob-patterns.cpp | 10 +- .../filter-visitor-ir-validate-globbing.cpp | 8 +- .../filter-visitor-ir-validate-string.cpp | 8 +- src/common/filter/filter-visitor-xml.cpp | 6 +- .../filter/{memstream.h => memstream.hpp} | 2 +- ...ndle-internal.h => fs-handle-internal.hpp} | 0 src/common/fs-handle.cpp | 6 +- src/common/{fs-handle.h => fs-handle.hpp} | 2 +- src/common/futex.cpp | 4 +- src/common/{futex.h => futex.hpp} | 0 ...htable-symbols.h => hashtable-symbols.hpp} | 0 src/common/hashtable/hashtable.cpp | 8 +- .../hashtable/{hashtable.h => hashtable.hpp} | 2 +- src/common/hashtable/seed.cpp | 4 +- src/common/hashtable/utils.cpp | 8 +- src/common/hashtable/{utils.h => utils.hpp} | 0 src/common/health/health.cpp | 10 +- src/common/index-allocator.cpp | 6 +- ...{index-allocator.h => index-allocator.hpp} | 0 .../index/{ctf-index.h => ctf-index.hpp} | 4 +- src/common/index/index.cpp | 10 +- src/common/index/{index.h => index.hpp} | 6 +- src/common/ini-config/ini-config.cpp | 12 +- .../{ini-config.h => ini-config.hpp} | 0 src/common/ini-config/ini.cpp | 4 +- src/common/ini-config/{ini.h => ini.hpp} | 0 .../kernel-consumer/kernel-consumer.cpp | 38 ++-- ...{kernel-consumer.h => kernel-consumer.hpp} | 2 +- src/common/kernel-ctl/kernel-ctl.cpp | 12 +- .../{kernel-ctl.h => kernel-ctl.hpp} | 6 +- .../{kernel-ioctl.h => kernel-ioctl.hpp} | 0 src/common/kernel-probe.cpp | 16 +- src/common/location.cpp | 6 +- src/common/log-level-rule.cpp | 14 +- src/common/lttng-elf.cpp | 10 +- src/common/{lttng-elf.h => lttng-elf.hpp} | 0 ...ttng-kernel-old.h => lttng-kernel-old.hpp} | 2 +- .../{lttng-kernel.h => lttng-kernel.hpp} | 2 +- src/common/{macros.h => macros.hpp} | 2 +- src/common/mi-lttng.cpp | 10 +- src/common/{mi-lttng.h => mi-lttng.hpp} | 6 +- src/common/notification.cpp | 12 +- src/common/{optional.h => optional.hpp} | 0 src/common/path.cpp | 6 +- src/common/{path.h => path.hpp} | 0 src/common/payload-view.cpp | 8 +- .../{payload-view.h => payload-view.hpp} | 4 +- src/common/payload.cpp | 8 +- src/common/{payload.h => payload.hpp} | 6 +- src/common/pipe.cpp | 4 +- src/common/{pipe.h => pipe.hpp} | 2 +- src/common/readwrite.cpp | 4 +- src/common/{readwrite.h => readwrite.hpp} | 2 +- src/common/relayd/relayd.cpp | 20 +- src/common/relayd/{relayd.h => relayd.hpp} | 8 +- src/common/runas.cpp | 28 +-- src/common/{runas.h => runas.hpp} | 4 +- src/common/session-descriptor.cpp | 10 +- .../sessiond-comm/{agent.h => agent.hpp} | 2 +- src/common/sessiond-comm/inet.cpp | 10 +- src/common/sessiond-comm/{inet.h => inet.hpp} | 2 +- src/common/sessiond-comm/inet6.cpp | 10 +- .../sessiond-comm/{inet6.h => inet6.hpp} | 2 +- .../sessiond-comm/{relayd.h => relayd.hpp} | 10 +- src/common/sessiond-comm/sessiond-comm.cpp | 12 +- .../{sessiond-comm.h => sessiond-comm.hpp} | 28 +-- src/common/shm.cpp | 4 +- src/common/{shm.h => shm.hpp} | 0 src/common/snapshot.cpp | 12 +- src/common/{snapshot.h => snapshot.hpp} | 2 +- src/common/spawn-viewer.cpp | 8 +- .../{spawn-viewer.h => spawn-viewer.hpp} | 0 .../string-utils/{format.h => format.hpp} | 0 src/common/string-utils/string-utils.cpp | 4 +- .../{string-utils.h => string-utils.hpp} | 4 +- src/common/testpoint/testpoint.cpp | 2 +- .../testpoint/{testpoint.h => testpoint.hpp} | 0 src/common/thread.cpp | 4 +- src/common/{thread.h => thread.hpp} | 2 +- src/common/time.cpp | 10 +- src/common/{time.h => time.hpp} | 4 +- ...nk-registry.h => trace-chunk-registry.hpp} | 4 +- src/common/trace-chunk.cpp | 34 +-- src/common/{trace-chunk.h => trace-chunk.hpp} | 8 +- src/common/tracker.cpp | 10 +- src/common/{tracker.h => tracker.hpp} | 8 +- src/common/trigger.cpp | 28 +-- src/common/unix.cpp | 10 +- src/common/{unix.h => unix.hpp} | 8 +- src/common/uri.cpp | 10 +- src/common/{uri.h => uri.hpp} | 2 +- src/common/userspace-probe.cpp | 20 +- src/common/ust-consumer/ust-consumer.cpp | 32 +-- .../{ust-consumer.h => ust-consumer.hpp} | 4 +- src/common/utils.cpp | 35 ++- src/common/{utils.h => utils.hpp} | 2 +- src/common/uuid.cpp | 4 +- src/common/{uuid.h => uuid.hpp} | 2 +- src/common/waiter.cpp | 4 +- src/common/{waiter.h => waiter.hpp} | 2 +- src/lib/lttng-ctl/Makefile.am | 2 +- src/lib/lttng-ctl/channel.cpp | 26 +-- src/lib/lttng-ctl/clear.cpp | 16 +- src/lib/lttng-ctl/destruction-handle.cpp | 20 +- src/lib/lttng-ctl/event.cpp | 8 +- src/lib/lttng-ctl/load.cpp | 16 +- src/lib/lttng-ctl/lttng-ctl-health.cpp | 16 +- ...ttng-ctl-helper.h => lttng-ctl-helper.hpp} | 2 +- src/lib/lttng-ctl/lttng-ctl.cpp | 52 ++--- src/lib/lttng-ctl/rotate.cpp | 10 +- src/lib/lttng-ctl/save.cpp | 6 +- src/lib/lttng-ctl/snapshot.cpp | 6 +- src/lib/lttng-ctl/tracker.cpp | 12 +- src/vendor/msgpack/lttng-config.h | 2 +- tests/regression/kernel/select_poll_epoll.cpp | 31 +-- tests/regression/tools/live/live_test.cpp | 12 +- .../notification/consumer_testpoints.cpp | 8 +- .../notification/default_pipe_size_getter.cpp | 4 +- .../tools/notification/notification.cpp | 4 +- .../notification/sessiond_testpoints.cpp | 8 +- .../tools/trigger/hidden/hidden_trigger.cpp | 2 +- .../tools/trigger/name/trigger_name.cpp | 2 +- .../trigger/utils/register-some-triggers.cpp | 4 +- .../lttng-ust-clock-override-test.c | 2 +- .../lttng-ust-getcpu-override-test.c | 2 +- tests/regression/ust/ust-dl/prog.c | 2 +- tests/unit/ini_config/ini_config.cpp | 6 +- tests/unit/test_action.cpp | 8 +- tests/unit/test_buffer_view.cpp | 2 +- tests/unit/test_condition.cpp | 8 +- tests/unit/test_directory_handle.cpp | 6 +- tests/unit/test_event_expr_to_bytecode.cpp | 4 +- tests/unit/test_event_rule.cpp | 24 +-- tests/unit/test_fd_tracker.cpp | 10 +- tests/unit/test_kernel_data.cpp | 6 +- tests/unit/test_kernel_probe.cpp | 6 +- tests/unit/test_log_level_rule.cpp | 6 +- tests/unit/test_notification.cpp | 2 +- tests/unit/test_payload.cpp | 6 +- tests/unit/test_rate_policy.cpp | 6 +- ...elayd_backward_compat_group_by_session.cpp | 4 +- tests/unit/test_session.cpp | 18 +- tests/unit/test_string_utils.cpp | 2 +- tests/unit/test_unix_socket.cpp | 16 +- tests/unit/test_uri.cpp | 2 +- tests/unit/test_ust_data.cpp | 12 +- tests/unit/test_utils_compat_poll.cpp | 8 +- tests/unit/test_utils_compat_pthread.cpp | 2 +- tests/unit/test_utils_expand_path.cpp | 6 +- tests/unit/test_utils_parse_size_suffix.cpp | 2 +- tests/unit/test_utils_parse_time_suffix.cpp | 2 +- tests/unit/test_uuid.cpp | 2 +- tests/utils/testapp/Makefile.am | 2 +- .../testapp/gen-ns-events/gen-ns-events.cpp | 6 +- .../gen-syscall-events/gen-syscall-events.cpp | 4 +- .../gen-ust-events-ns/gen-ust-events-ns.cpp | 6 +- .../testapp/gen-ust-events/gen-ust-events.cpp | 2 +- .../gen-ust-nevents-str.cpp | 2 +- .../gen-ust-nevents/gen-ust-nevents.cpp | 2 +- .../testapp/gen-ust-tracef/gen-ust-tracef.cpp | 4 +- .../{signal-helper.h => signal-helper.hpp} | 0 .../Makefile.am | 2 +- .../test_class.cpp | 2 +- .../{test_class.h => test_class.hpp} | 0 .../userspace-probe-elf-cxx-binary.cpp | 2 +- tests/utils/utils.cpp | 8 +- tests/utils/xml-utils/extract_xml.cpp | 2 +- tests/utils/xml-utils/validate_xml.cpp | 4 +- 523 files changed, 2566 insertions(+), 2573 deletions(-) rename include/lttng/action/{action-internal.h => action-internal.hpp} (96%) rename include/lttng/action/{list-internal.h => list-internal.hpp} (97%) rename include/lttng/action/{notify-internal.h => notify-internal.hpp} (91%) rename include/lttng/action/{path-internal.h => path-internal.hpp} (85%) rename include/lttng/action/{rate-policy-internal.h => rate-policy-internal.hpp} (94%) rename include/lttng/action/{rotate-session-internal.h => rotate-session-internal.hpp} (95%) rename include/lttng/action/{snapshot-session-internal.h => snapshot-session-internal.hpp} (95%) rename include/lttng/action/{start-session-internal.h => start-session-internal.hpp} (95%) rename include/lttng/action/{stop-session-internal.h => stop-session-internal.hpp} (95%) rename include/lttng/{channel-internal.h => channel-internal.hpp} (91%) rename include/lttng/condition/{buffer-usage-internal.h => buffer-usage-internal.hpp} (92%) rename include/lttng/condition/{condition-internal.h => condition-internal.hpp} (96%) rename include/lttng/condition/{evaluation-internal.h => evaluation-internal.hpp} (97%) rename include/lttng/condition/{event-rule-matches-internal.h => event-rule-matches-internal.hpp} (91%) rename include/lttng/condition/{session-consumed-size-internal.h => session-consumed-size-internal.hpp} (89%) rename include/lttng/condition/{session-rotation-internal.h => session-rotation-internal.hpp} (91%) rename include/lttng/{domain-internal.h => domain-internal.hpp} (91%) rename include/lttng/{endpoint-internal.h => endpoint-internal.hpp} (94%) rename include/lttng/{error-query-internal.h => error-query-internal.hpp} (96%) rename include/lttng/{event-expr-internal.h => event-expr-internal.hpp} (98%) rename include/lttng/{event-field-value-internal.h => event-field-value-internal.hpp} (99%) rename include/lttng/{event-internal.h => event-internal.hpp} (99%) rename include/lttng/event-rule/{event-rule-internal.h => event-rule-internal.hpp} (97%) rename include/lttng/event-rule/{jul-logging-internal.h => jul-logging-internal.hpp} (86%) rename include/lttng/event-rule/{kernel-kprobe-internal.h => kernel-kprobe-internal.hpp} (88%) rename include/lttng/event-rule/{kernel-syscall-internal.h => kernel-syscall-internal.hpp} (91%) rename include/lttng/event-rule/{kernel-tracepoint-internal.h => kernel-tracepoint-internal.hpp} (88%) rename include/lttng/event-rule/{kernel-uprobe-internal.h => kernel-uprobe-internal.hpp} (90%) rename include/lttng/event-rule/{log4j-logging-internal.h => log4j-logging-internal.hpp} (86%) rename include/lttng/event-rule/{python-logging-internal.h => python-logging-internal.hpp} (87%) rename include/lttng/event-rule/{user-tracepoint-internal.h => user-tracepoint-internal.hpp} (88%) rename include/lttng/{health-internal.h => health-internal.hpp} (98%) rename include/lttng/{kernel-probe-internal.h => kernel-probe-internal.hpp} (98%) rename include/lttng/{load-internal.h => load-internal.hpp} (93%) rename include/lttng/{location-internal.h => location-internal.hpp} (96%) rename include/lttng/{log-level-rule-internal.h => log-level-rule-internal.hpp} (90%) rename include/lttng/notification/{channel-internal.h => channel-internal.hpp} (98%) rename include/lttng/notification/{notification-internal.h => notification-internal.hpp} (97%) rename include/lttng/{ref-internal.h => ref-internal.hpp} (100%) rename include/lttng/{rotate-internal.h => rotate-internal.hpp} (98%) rename include/lttng/{save-internal.h => save-internal.hpp} (96%) rename include/lttng/{session-descriptor-internal.h => session-descriptor-internal.hpp} (96%) rename include/lttng/{session-internal.h => session-internal.hpp} (93%) rename include/lttng/{snapshot-internal.h => snapshot-internal.hpp} (97%) rename include/lttng/trigger/{trigger-internal.h => trigger-internal.hpp} (98%) rename include/lttng/{userspace-probe-internal.h => userspace-probe-internal.hpp} (98%) rename include/{version.h => version.hpp} (100%) rename src/bin/lttng-consumerd/{health-consumerd.h => health-consumerd.hpp} (94%) rename src/bin/lttng-consumerd/{lttng-consumerd.h => lttng-consumerd.hpp} (100%) rename src/bin/lttng-consumerd/{testpoint.h => testpoint.hpp} (88%) rename src/bin/lttng-relayd/{backward-compatibility-group-by.h => backward-compatibility-group-by.hpp} (100%) rename src/bin/lttng-relayd/{cmd-2-1.h => cmd-2-1.hpp} (87%) rename src/bin/lttng-relayd/{cmd-2-11.h => cmd-2-11.hpp} (89%) rename src/bin/lttng-relayd/{cmd-2-2.h => cmd-2-2.hpp} (88%) rename src/bin/lttng-relayd/{cmd-2-4.h => cmd-2-4.hpp} (88%) rename src/bin/lttng-relayd/{cmd.h => cmd.hpp} (77%) rename src/bin/lttng-relayd/{connection.h => connection.hpp} (95%) rename src/bin/lttng-relayd/{ctf-trace.h => ctf-trace.hpp} (93%) rename src/bin/lttng-relayd/{health-relayd.h => health-relayd.hpp} (95%) rename src/bin/lttng-relayd/{index.h => index.hpp} (96%) rename src/bin/lttng-relayd/{live.h => live.hpp} (89%) rename src/bin/lttng-relayd/{lttng-relayd.h => lttng-relayd.hpp} (94%) rename src/bin/lttng-relayd/{lttng-viewer-abi.h => lttng-viewer-abi.hpp} (99%) rename src/bin/lttng-relayd/{session.h => session.hpp} (97%) rename src/bin/lttng-relayd/{sessiond-trace-chunks.h => sessiond-trace-chunks.hpp} (97%) rename src/bin/lttng-relayd/{stream.h => stream.hpp} (97%) rename src/bin/lttng-relayd/{tcp_keep_alive.h => tcp_keep_alive.hpp} (90%) rename src/bin/lttng-relayd/{testpoint.h => testpoint.hpp} (93%) rename src/bin/lttng-relayd/{tracefile-array.h => tracefile-array.hpp} (100%) rename src/bin/lttng-relayd/{utils.h => utils.hpp} (100%) rename src/bin/lttng-relayd/{viewer-session.h => viewer-session.hpp} (95%) rename src/bin/lttng-relayd/{viewer-stream.h => viewer-stream.hpp} (95%) rename src/bin/lttng-sessiond/{action-executor.h => action-executor.hpp} (100%) rename src/bin/lttng-sessiond/{agent-thread.h => agent-thread.hpp} (100%) rename src/bin/lttng-sessiond/{agent.h => agent.hpp} (99%) rename src/bin/lttng-sessiond/{buffer-registry.h => buffer-registry.hpp} (97%) rename src/bin/lttng-sessiond/{channel.h => channel.hpp} (95%) rename src/bin/lttng-sessiond/{clear.h => clear.hpp} (91%) rename src/bin/lttng-sessiond/{client.h => client.hpp} (94%) rename src/bin/lttng-sessiond/{cmd.h => cmd.hpp} (98%) rename src/bin/lttng-sessiond/{condition-internal.h => condition-internal.hpp} (100%) rename src/bin/lttng-sessiond/{consumer.h => consumer.hpp} (99%) rename src/bin/lttng-sessiond/{context.h => context.hpp} (85%) rename src/bin/lttng-sessiond/{dispatch.h => dispatch.hpp} (94%) rename src/bin/lttng-sessiond/{event-notifier-error-accounting.h => event-notifier-error-accounting.hpp} (99%) rename src/bin/lttng-sessiond/{event.h => event.hpp} (98%) rename src/bin/lttng-sessiond/{fd-limit.h => fd-limit.hpp} (100%) rename src/bin/lttng-sessiond/{health-sessiond.h => health-sessiond.hpp} (95%) rename src/bin/lttng-sessiond/{kern-modules.h => kern-modules.hpp} (100%) rename src/bin/lttng-sessiond/{kernel-consumer.h => kernel-consumer.hpp} (91%) rename src/bin/lttng-sessiond/{kernel.h => kernel.hpp} (98%) rename src/bin/lttng-sessiond/{lttng-sessiond.h => lttng-sessiond.hpp} (93%) rename src/bin/lttng-sessiond/{lttng-syscall.h => lttng-syscall.hpp} (93%) rename src/bin/lttng-sessiond/{lttng-ust-abi.h => lttng-ust-abi.hpp} (92%) rename src/bin/lttng-sessiond/{lttng-ust-ctl.h => lttng-ust-ctl.hpp} (92%) rename src/bin/lttng-sessiond/{lttng-ust-error.h => lttng-ust-error.hpp} (91%) rename src/bin/lttng-sessiond/{manage-apps.h => manage-apps.hpp} (94%) rename src/bin/lttng-sessiond/{manage-consumer.h => manage-consumer.hpp} (94%) rename src/bin/lttng-sessiond/{manage-kernel.h => manage-kernel.hpp} (93%) rename src/bin/lttng-sessiond/{modprobe.h => modprobe.hpp} (100%) rename src/bin/lttng-sessiond/{notification-thread-commands.h => notification-thread-commands.hpp} (97%) rename src/bin/lttng-sessiond/{notification-thread-events.h => notification-thread-events.hpp} (97%) rename src/bin/lttng-sessiond/{notification-thread-internal.h => notification-thread-internal.hpp} (97%) rename src/bin/lttng-sessiond/{notification-thread.h => notification-thread.hpp} (98%) rename src/bin/lttng-sessiond/{notify-apps.h => notify-apps.hpp} (100%) rename src/bin/lttng-sessiond/{register.h => register.hpp} (94%) rename src/bin/lttng-sessiond/{rotate.h => rotate.hpp} (95%) rename src/bin/lttng-sessiond/{rotation-thread.h => rotation-thread.hpp} (89%) rename src/bin/lttng-sessiond/{save.h => save.hpp} (89%) rename src/bin/lttng-sessiond/{session.h => session.hpp} (98%) rename src/bin/lttng-sessiond/{sessiond-config.h => sessiond-config.hpp} (98%) rename src/bin/lttng-sessiond/{snapshot.h => snapshot.hpp} (94%) rename src/bin/lttng-sessiond/{testpoint.h => testpoint.hpp} (95%) rename src/bin/lttng-sessiond/{thread.h => thread.hpp} (100%) rename src/bin/lttng-sessiond/{timer.h => timer.hpp} (97%) rename src/bin/lttng-sessiond/{trace-kernel.h => trace-kernel.hpp} (97%) rename src/bin/lttng-sessiond/{trace-ust.h => trace-ust.hpp} (98%) rename src/bin/lttng-sessiond/{tracker.h => tracker.hpp} (97%) rename src/bin/lttng-sessiond/{ust-abi-internal.h => ust-abi-internal.hpp} (99%) rename src/bin/lttng-sessiond/{ust-app.h => ust-app.hpp} (99%) rename src/bin/lttng-sessiond/{ust-clock.h => ust-clock.hpp} (96%) rename src/bin/lttng-sessiond/{ust-consumer.h => ust-consumer.hpp} (93%) rename src/bin/lttng-sessiond/{ust-ctl-internal.h => ust-ctl-internal.hpp} (99%) rename src/bin/lttng-sessiond/{ust-error-internal.h => ust-error-internal.hpp} (97%) rename src/bin/lttng-sessiond/{ust-field-utils.h => ust-field-utils.hpp} (96%) rename src/bin/lttng-sessiond/{ust-registry.h => ust-registry.hpp} (99%) rename src/bin/lttng-sessiond/{ust-sigbus.h => ust-sigbus.hpp} (100%) rename src/bin/lttng-sessiond/{utils.h => utils.hpp} (100%) rename src/bin/lttng/{command.h => command.hpp} (94%) rename src/bin/lttng/{conf.h => conf.hpp} (100%) rename src/bin/lttng/{loglevel.h => loglevel.hpp} (97%) rename src/bin/lttng/{uprobe.h => uprobe.hpp} (92%) rename src/bin/lttng/{utils.h => utils.hpp} (97%) rename src/common/{align.h => align.hpp} (99%) rename src/common/argpar-utils/{argpar-utils.h => argpar-utils.hpp} (96%) rename src/common/{buffer-view.h => buffer-view.hpp} (98%) rename src/common/{bug.h => bug.hpp} (100%) rename src/common/bytecode/{bytecode.h => bytecode.hpp} (98%) rename src/common/{common.h => common.hpp} (67%) rename src/common/compat/{directory-handle.h => directory-handle.hpp} (99%) rename src/common/compat/{dirent.h => dirent.hpp} (100%) rename src/common/compat/{endian.h => endian.hpp} (100%) rename src/common/compat/{errno.h => errno.hpp} (100%) rename src/common/compat/{fcntl.h => fcntl.hpp} (98%) rename src/common/compat/{getenv.h => getenv.hpp} (95%) rename src/common/compat/{mman.h => mman.hpp} (100%) rename src/common/compat/{netdb.h => netdb.hpp} (100%) rename src/common/compat/{path.h => path.hpp} (100%) rename src/common/compat/{paths.h => paths.hpp} (100%) rename src/common/compat/{poll.h => poll.hpp} (99%) rename src/common/compat/{pthread.h => pthread.hpp} (98%) rename src/common/compat/{socket.h => socket.hpp} (98%) rename src/common/compat/{string.h => string.hpp} (100%) rename src/common/compat/{tid.h => tid.hpp} (100%) rename src/common/compat/{time.h => time.hpp} (97%) rename src/common/config/{config-internal.h => config-internal.hpp} (100%) rename src/common/config/{config-session-abi.h => config-session-abi.hpp} (100%) rename src/common/config/{session-config.h => session-config.hpp} (98%) rename src/common/consumer/{consumer-metadata-cache.h => consumer-metadata-cache.hpp} (96%) rename src/common/consumer/{consumer-stream.h => consumer-stream.hpp} (99%) rename src/common/consumer/{consumer-testpoint.h => consumer-testpoint.hpp} (93%) rename src/common/consumer/{consumer-timer.h => consumer-timer.hpp} (98%) rename src/common/consumer/{consumer.h => consumer.hpp} (98%) rename src/common/consumer/{metadata-bucket.h => metadata-bucket.hpp} (95%) rename src/common/{context.h => context.hpp} (96%) rename src/common/{credentials.h => credentials.hpp} (94%) rename src/common/{daemonize.h => daemonize.hpp} (96%) rename src/common/{defaults.h => defaults.hpp} (99%) rename src/common/{dynamic-array.h => dynamic-array.hpp} (99%) rename src/common/{dynamic-buffer.h => dynamic-buffer.hpp} (99%) rename src/common/{error.h => error.hpp} (97%) rename src/common/{fd-handle.h => fd-handle.hpp} (97%) rename src/common/fd-tracker/{fd-tracker.h => fd-tracker.hpp} (98%) rename src/common/fd-tracker/{inode.h => inode.hpp} (97%) rename src/common/fd-tracker/{utils.h => utils.hpp} (91%) rename src/common/{filter.h => filter.hpp} (94%) rename src/common/filter/{filter-ast.h => filter-ast.hpp} (100%) rename src/common/filter/{filter-ir.h => filter-ir.hpp} (99%) rename src/common/filter/{filter-symbols.h => filter-symbols.hpp} (100%) rename src/common/filter/{memstream.h => memstream.hpp} (98%) rename src/common/{fs-handle-internal.h => fs-handle-internal.hpp} (100%) rename src/common/{fs-handle.h => fs-handle.hpp} (98%) rename src/common/{futex.h => futex.hpp} (100%) rename src/common/hashtable/{hashtable-symbols.h => hashtable-symbols.hpp} (100%) rename src/common/hashtable/{hashtable.h => hashtable.hpp} (99%) rename src/common/hashtable/{utils.h => utils.hpp} (100%) rename src/common/{index-allocator.h => index-allocator.hpp} (100%) rename src/common/index/{ctf-index.h => ctf-index.hpp} (97%) rename src/common/index/{index.h => index.hpp} (94%) rename src/common/ini-config/{ini-config.h => ini-config.hpp} (100%) rename src/common/ini-config/{ini.h => ini.hpp} (100%) rename src/common/kernel-consumer/{kernel-consumer.h => kernel-consumer.hpp} (96%) rename src/common/kernel-ctl/{kernel-ctl.h => kernel-ctl.hpp} (96%) rename src/common/kernel-ctl/{kernel-ioctl.h => kernel-ioctl.hpp} (100%) rename src/common/{lttng-elf.h => lttng-elf.hpp} (100%) rename src/common/{lttng-kernel-old.h => lttng-kernel-old.hpp} (98%) rename src/common/{lttng-kernel.h => lttng-kernel.hpp} (99%) rename src/common/{macros.h => macros.hpp} (99%) rename src/common/{mi-lttng.h => mi-lttng.hpp} (99%) rename src/common/{optional.h => optional.hpp} (100%) rename src/common/{path.h => path.hpp} (100%) rename src/common/{payload-view.h => payload-view.hpp} (98%) rename src/common/{payload.h => payload.hpp} (93%) rename src/common/{pipe.h => pipe.hpp} (98%) rename src/common/{readwrite.h => readwrite.hpp} (96%) rename src/common/relayd/{relayd.h => relayd.hpp} (94%) rename src/common/{runas.h => runas.hpp} (97%) rename src/common/sessiond-comm/{agent.h => agent.hpp} (98%) rename src/common/sessiond-comm/{inet.h => inet.hpp} (98%) rename src/common/sessiond-comm/{inet6.h => inet6.hpp} (97%) rename src/common/sessiond-comm/{relayd.h => relayd.hpp} (98%) rename src/common/sessiond-comm/{sessiond-comm.h => sessiond-comm.hpp} (98%) rename src/common/{shm.h => shm.hpp} (100%) rename src/common/{snapshot.h => snapshot.hpp} (96%) rename src/common/{spawn-viewer.h => spawn-viewer.hpp} (100%) rename src/common/string-utils/{format.h => format.hpp} (100%) rename src/common/string-utils/{string-utils.h => string-utils.hpp} (94%) rename src/common/testpoint/{testpoint.h => testpoint.hpp} (100%) rename src/common/{thread.h => thread.hpp} (93%) rename src/common/{time.h => time.hpp} (96%) rename src/common/{trace-chunk-registry.h => trace-chunk-registry.hpp} (98%) rename src/common/{trace-chunk.h => trace-chunk.hpp} (97%) rename src/common/{tracker.h => tracker.hpp} (93%) rename src/common/{unix.h => unix.hpp} (93%) rename src/common/{uri.h => uri.hpp} (98%) rename src/common/ust-consumer/{ust-consumer.h => ust-consumer.hpp} (99%) rename src/common/{utils.h => utils.hpp} (98%) rename src/common/{uuid.h => uuid.hpp} (98%) rename src/common/{waiter.h => waiter.hpp} (97%) rename src/lib/lttng-ctl/{lttng-ctl-helper.h => lttng-ctl-helper.hpp} (97%) rename tests/utils/testapp/{signal-helper.h => signal-helper.hpp} (100%) rename tests/utils/testapp/userspace-probe-elf-cxx-binary/{test_class.h => test_class.hpp} (100%) diff --git a/doc/examples/trigger-condition-event-matches/notification-client.cpp b/doc/examples/trigger-condition-event-matches/notification-client.cpp index 4a2515569..d1d5d8721 100644 --- a/doc/examples/trigger-condition-event-matches/notification-client.cpp +++ b/doc/examples/trigger-condition-event-matches/notification-client.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include static int print_capture(const struct lttng_condition *condition, const struct lttng_event_field_value *capture, diff --git a/include/Makefile.am b/include/Makefile.am index 6fe724b3a..d840d58dc 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -163,51 +163,51 @@ lttngeventruleinclude_HEADERS= \ lttng/event-rule/user-tracepoint.h noinst_HEADERS = \ - lttng/action/action-internal.h \ - lttng/action/list-internal.h \ - lttng/action/notify-internal.h \ - lttng/action/path-internal.h \ - lttng/action/rotate-session-internal.h \ - lttng/action/snapshot-session-internal.h \ - lttng/action/start-session-internal.h \ - lttng/action/stop-session-internal.h \ - lttng/action/rate-policy-internal.h \ - lttng/channel-internal.h \ - lttng/condition/buffer-usage-internal.h \ - lttng/condition/condition-internal.h \ - lttng/condition/evaluation-internal.h \ - lttng/condition/event-rule-matches-internal.h \ - lttng/condition/session-consumed-size-internal.h \ - lttng/condition/session-rotation-internal.h \ - lttng/domain-internal.h \ - lttng/endpoint-internal.h \ - lttng/error-query-internal.h \ - lttng/event-expr-internal.h \ - lttng/event-field-value-internal.h \ - lttng/event-internal.h \ - lttng/event-rule/event-rule-internal.h \ - lttng/event-rule/jul-logging-internal.h \ - lttng/event-rule/kernel-kprobe-internal.h \ - lttng/event-rule/kernel-syscall-internal.h \ - lttng/event-rule/kernel-tracepoint-internal.h \ - lttng/event-rule/kernel-uprobe-internal.h \ - lttng/event-rule/log4j-logging-internal.h \ - lttng/event-rule/python-logging-internal.h \ - lttng/event-rule/user-tracepoint-internal.h \ - lttng/health-internal.h \ - lttng/kernel-probe-internal.h \ - lttng/load-internal.h \ - lttng/location-internal.h \ - lttng/log-level-rule-internal.h \ - lttng/notification/channel-internal.h \ - lttng/notification/notification-internal.h \ - lttng/ref-internal.h \ - lttng/rotate-internal.h \ - lttng/save-internal.h \ - lttng/session-descriptor-internal.h \ - lttng/session-internal.h \ - lttng/snapshot-internal.h \ - lttng/trigger/trigger-internal.h \ - lttng/userspace-probe-internal.h \ - version.h \ + lttng/action/action-internal.hpp \ + lttng/action/list-internal.hpp \ + lttng/action/notify-internal.hpp \ + lttng/action/path-internal.hpp \ + lttng/action/rotate-session-internal.hpp \ + lttng/action/snapshot-session-internal.hpp \ + lttng/action/start-session-internal.hpp \ + lttng/action/stop-session-internal.hpp \ + lttng/action/rate-policy-internal.hpp \ + lttng/channel-internal.hpp \ + lttng/condition/buffer-usage-internal.hpp \ + lttng/condition/condition-internal.hpp \ + lttng/condition/evaluation-internal.hpp \ + lttng/condition/event-rule-matches-internal.hpp \ + lttng/condition/session-consumed-size-internal.hpp \ + lttng/condition/session-rotation-internal.hpp \ + lttng/domain-internal.hpp \ + lttng/endpoint-internal.hpp \ + lttng/error-query-internal.hpp \ + lttng/event-expr-internal.hpp \ + lttng/event-field-value-internal.hpp \ + lttng/event-internal.hpp \ + lttng/event-rule/event-rule-internal.hpp \ + lttng/event-rule/jul-logging-internal.hpp \ + lttng/event-rule/kernel-kprobe-internal.hpp \ + lttng/event-rule/kernel-syscall-internal.hpp \ + lttng/event-rule/kernel-tracepoint-internal.hpp \ + lttng/event-rule/kernel-uprobe-internal.hpp \ + lttng/event-rule/log4j-logging-internal.hpp \ + lttng/event-rule/python-logging-internal.hpp \ + lttng/event-rule/user-tracepoint-internal.hpp \ + lttng/health-internal.hpp \ + lttng/kernel-probe-internal.hpp \ + lttng/load-internal.hpp \ + lttng/location-internal.hpp \ + lttng/log-level-rule-internal.hpp \ + lttng/notification/channel-internal.hpp \ + lttng/notification/notification-internal.hpp \ + lttng/ref-internal.hpp \ + lttng/rotate-internal.hpp \ + lttng/save-internal.hpp \ + lttng/session-descriptor-internal.hpp \ + lttng/session-internal.hpp \ + lttng/snapshot-internal.hpp \ + lttng/trigger/trigger-internal.hpp \ + lttng/userspace-probe-internal.hpp \ + version.hpp \ version.i diff --git a/include/lttng/action/action-internal.h b/include/lttng/action/action-internal.hpp similarity index 96% rename from include/lttng/action/action-internal.h rename to include/lttng/action/action-internal.hpp index 71270a835..996e166ec 100644 --- a/include/lttng/action/action-internal.h +++ b/include/lttng/action/action-internal.hpp @@ -8,11 +8,11 @@ #ifndef LTTNG_ACTION_INTERNAL_H #define LTTNG_ACTION_INTERNAL_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/include/lttng/action/list-internal.h b/include/lttng/action/list-internal.hpp similarity index 97% rename from include/lttng/action/list-internal.h rename to include/lttng/action/list-internal.hpp index 231755fd6..294a53ca2 100644 --- a/include/lttng/action/list-internal.h +++ b/include/lttng/action/list-internal.hpp @@ -10,7 +10,7 @@ #include -#include +#include struct lttng_action; struct lttng_payload_view; diff --git a/include/lttng/action/notify-internal.h b/include/lttng/action/notify-internal.hpp similarity index 91% rename from include/lttng/action/notify-internal.h rename to include/lttng/action/notify-internal.hpp index 8588ac295..c923019c3 100644 --- a/include/lttng/action/notify-internal.h +++ b/include/lttng/action/notify-internal.hpp @@ -9,7 +9,7 @@ #define LTTNG_ACTION_NOTIFY_INTERNAL_H #include -#include +#include struct lttng_action_notify { struct lttng_action parent; diff --git a/include/lttng/action/path-internal.h b/include/lttng/action/path-internal.hpp similarity index 85% rename from include/lttng/action/path-internal.h rename to include/lttng/action/path-internal.hpp index 8a255f0b7..9b9a4d10d 100644 --- a/include/lttng/action/path-internal.h +++ b/include/lttng/action/path-internal.hpp @@ -9,10 +9,10 @@ #define LTTNG_ACTION_PATH_INTERNAL_H #include -#include -#include -#include -#include +#include +#include +#include +#include #include struct lttng_action_path { diff --git a/include/lttng/action/rate-policy-internal.h b/include/lttng/action/rate-policy-internal.hpp similarity index 94% rename from include/lttng/action/rate-policy-internal.h rename to include/lttng/action/rate-policy-internal.hpp index b24ed5238..5f6eb1f45 100644 --- a/include/lttng/action/rate-policy-internal.h +++ b/include/lttng/action/rate-policy-internal.hpp @@ -8,8 +8,8 @@ #ifndef LTTNG_RATE_POLICY_INTERNAL_H #define LTTNG_RATE_POLICY_INTERNAL_H -#include -#include +#include +#include #include #include #include diff --git a/include/lttng/action/rotate-session-internal.h b/include/lttng/action/rotate-session-internal.hpp similarity index 95% rename from include/lttng/action/rotate-session-internal.h rename to include/lttng/action/rotate-session-internal.hpp index 9a451f81c..5030aeac3 100644 --- a/include/lttng/action/rotate-session-internal.h +++ b/include/lttng/action/rotate-session-internal.hpp @@ -8,7 +8,7 @@ #ifndef LTTNG_ACTION_ROTATE_SESSION_INTERNAL_H #define LTTNG_ACTION_ROTATE_SESSION_INTERNAL_H -#include +#include struct lttng_action; struct lttng_payload_view; diff --git a/include/lttng/action/snapshot-session-internal.h b/include/lttng/action/snapshot-session-internal.hpp similarity index 95% rename from include/lttng/action/snapshot-session-internal.h rename to include/lttng/action/snapshot-session-internal.hpp index 7396c2960..27a8795ad 100644 --- a/include/lttng/action/snapshot-session-internal.h +++ b/include/lttng/action/snapshot-session-internal.hpp @@ -10,7 +10,7 @@ #include -#include +#include struct lttng_action; struct lttng_payload_view; diff --git a/include/lttng/action/start-session-internal.h b/include/lttng/action/start-session-internal.hpp similarity index 95% rename from include/lttng/action/start-session-internal.h rename to include/lttng/action/start-session-internal.hpp index 56ffb71b4..44dab1bf1 100644 --- a/include/lttng/action/start-session-internal.h +++ b/include/lttng/action/start-session-internal.hpp @@ -8,7 +8,7 @@ #ifndef LTTNG_ACTION_START_SESSION_INTERNAL_H #define LTTNG_ACTION_START_SESSION_INTERNAL_H -#include +#include struct lttng_action; struct lttng_payload_view; diff --git a/include/lttng/action/stop-session-internal.h b/include/lttng/action/stop-session-internal.hpp similarity index 95% rename from include/lttng/action/stop-session-internal.h rename to include/lttng/action/stop-session-internal.hpp index da4a5aac1..22055352f 100644 --- a/include/lttng/action/stop-session-internal.h +++ b/include/lttng/action/stop-session-internal.hpp @@ -8,7 +8,7 @@ #ifndef LTTNG_ACTION_STOP_SESSION_INTERNAL_H #define LTTNG_ACTION_STOP_SESSION_INTERNAL_H -#include +#include struct lttng_action; struct lttng_payload_view; diff --git a/include/lttng/channel-internal.h b/include/lttng/channel-internal.hpp similarity index 91% rename from include/lttng/channel-internal.h rename to include/lttng/channel-internal.hpp index c3e123063..d4960828e 100644 --- a/include/lttng/channel-internal.h +++ b/include/lttng/channel-internal.hpp @@ -8,12 +8,7 @@ #ifndef LTTNG_CHANNEL_INTERNAL_H #define LTTNG_CHANNEL_INTERNAL_H -#include -#include -#include - -struct lttng_dynamic_buffer; -struct lttng_buffer_view; +#include struct lttng_channel_extended { uint64_t discarded_events; diff --git a/include/lttng/condition/buffer-usage-internal.h b/include/lttng/condition/buffer-usage-internal.hpp similarity index 92% rename from include/lttng/condition/buffer-usage-internal.h rename to include/lttng/condition/buffer-usage-internal.hpp index 1e6d5a509..b2e6f85c1 100644 --- a/include/lttng/condition/buffer-usage-internal.h +++ b/include/lttng/condition/buffer-usage-internal.hpp @@ -9,11 +9,11 @@ #define LTTNG_CONDITION_BUFFER_USAGE_INTERNAL_H #include -#include -#include +#include +#include #include -#include "common/buffer-view.h" -#include +#include "common/buffer-view.hpp" +#include struct lttng_condition_buffer_usage { struct lttng_condition parent; diff --git a/include/lttng/condition/condition-internal.h b/include/lttng/condition/condition-internal.hpp similarity index 96% rename from include/lttng/condition/condition-internal.h rename to include/lttng/condition/condition-internal.hpp index 5bafaf05b..27407d07a 100644 --- a/include/lttng/condition/condition-internal.h +++ b/include/lttng/condition/condition-internal.hpp @@ -8,9 +8,9 @@ #ifndef LTTNG_CONDITION_INTERNAL_H #define LTTNG_CONDITION_INTERNAL_H -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/include/lttng/condition/evaluation-internal.h b/include/lttng/condition/evaluation-internal.hpp similarity index 97% rename from include/lttng/condition/evaluation-internal.h rename to include/lttng/condition/evaluation-internal.hpp index 12ea104d8..f74927c24 100644 --- a/include/lttng/condition/evaluation-internal.h +++ b/include/lttng/condition/evaluation-internal.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/include/lttng/condition/event-rule-matches-internal.h b/include/lttng/condition/event-rule-matches-internal.hpp similarity index 91% rename from include/lttng/condition/event-rule-matches-internal.h rename to include/lttng/condition/event-rule-matches-internal.hpp index ef39f4f04..bb7e03e21 100644 --- a/include/lttng/condition/event-rule-matches-internal.h +++ b/include/lttng/condition/event-rule-matches-internal.hpp @@ -8,12 +8,12 @@ #ifndef LTTNG_CONDITION_EVENT_RULE_MATCHES_INTERNAL_H #define LTTNG_CONDITION_EVENT_RULE_MATCHES_INTERNAL_H -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include struct lttng_capture_descriptor { diff --git a/include/lttng/condition/session-consumed-size-internal.h b/include/lttng/condition/session-consumed-size-internal.hpp similarity index 89% rename from include/lttng/condition/session-consumed-size-internal.h rename to include/lttng/condition/session-consumed-size-internal.hpp index 9340a5f23..cdfa10034 100644 --- a/include/lttng/condition/session-consumed-size-internal.h +++ b/include/lttng/condition/session-consumed-size-internal.hpp @@ -9,10 +9,10 @@ #define LTTNG_CONDITION_SESSION_CONSUMED_SIZE_INTERNAL_H #include -#include -#include -#include -#include +#include +#include +#include +#include struct lttng_payload; struct lttng_payload_view; diff --git a/include/lttng/condition/session-rotation-internal.h b/include/lttng/condition/session-rotation-internal.hpp similarity index 91% rename from include/lttng/condition/session-rotation-internal.h rename to include/lttng/condition/session-rotation-internal.hpp index c723c6d6a..e9a298445 100644 --- a/include/lttng/condition/session-rotation-internal.h +++ b/include/lttng/condition/session-rotation-internal.hpp @@ -9,11 +9,11 @@ #define LTTNG_CONDITION_SESSION_ROTATION_INTERNAL_H #include -#include -#include -#include "common/buffer-view.h" +#include +#include +#include "common/buffer-view.hpp" #include -#include +#include struct lttng_condition_session_rotation { struct lttng_condition parent; diff --git a/include/lttng/domain-internal.h b/include/lttng/domain-internal.hpp similarity index 91% rename from include/lttng/domain-internal.h rename to include/lttng/domain-internal.hpp index c34ba1930..4439c7825 100644 --- a/include/lttng/domain-internal.h +++ b/include/lttng/domain-internal.hpp @@ -9,7 +9,7 @@ #define LTTNG_DOMAIN_INTERNAL_H #include "lttng/domain.h" -#include "common/macros.h" +#include "common/macros.hpp" const char *lttng_domain_type_str(enum lttng_domain_type domain_type); diff --git a/include/lttng/endpoint-internal.h b/include/lttng/endpoint-internal.hpp similarity index 94% rename from include/lttng/endpoint-internal.h rename to include/lttng/endpoint-internal.hpp index 3ec1df9c4..5317f7ff5 100644 --- a/include/lttng/endpoint-internal.h +++ b/include/lttng/endpoint-internal.hpp @@ -9,7 +9,7 @@ #define LTTNG_ENDPOINT_INTERNAL_H #include -#include +#include enum lttng_endpoint_type { LTTNG_ENDPOINT_TYPE_DEFAULT_SESSIOND_NOTIFICATION = 0, diff --git a/include/lttng/error-query-internal.h b/include/lttng/error-query-internal.hpp similarity index 96% rename from include/lttng/error-query-internal.h rename to include/lttng/error-query-internal.hpp index 07e2280d7..7bf4da748 100644 --- a/include/lttng/error-query-internal.h +++ b/include/lttng/error-query-internal.hpp @@ -11,9 +11,9 @@ #define LTTNG_ERROR_QUERY_INTERNAL_H #include -#include -#include -#include +#include +#include +#include struct mi_writer; diff --git a/include/lttng/event-expr-internal.h b/include/lttng/event-expr-internal.hpp similarity index 98% rename from include/lttng/event-expr-internal.h rename to include/lttng/event-expr-internal.hpp index 469fd17bb..07547e587 100644 --- a/include/lttng/event-expr-internal.h +++ b/include/lttng/event-expr-internal.hpp @@ -8,7 +8,7 @@ #ifndef LTTNG_EVENT_EXPR_INTERNAL_H #define LTTNG_EVENT_EXPR_INTERNAL_H -#include +#include #include struct lttng_bytecode; diff --git a/include/lttng/event-field-value-internal.h b/include/lttng/event-field-value-internal.hpp similarity index 99% rename from include/lttng/event-field-value-internal.h rename to include/lttng/event-field-value-internal.hpp index 510420ac0..03ef8960b 100644 --- a/include/lttng/event-field-value-internal.h +++ b/include/lttng/event-field-value-internal.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include struct lttng_event_field_value { enum lttng_event_field_value_type type; diff --git a/include/lttng/event-internal.h b/include/lttng/event-internal.hpp similarity index 99% rename from include/lttng/event-internal.h rename to include/lttng/event-internal.hpp index 52f7f7857..daa8fa68e 100644 --- a/include/lttng/event-internal.h +++ b/include/lttng/event-internal.hpp @@ -12,7 +12,7 @@ #ifndef LTTNG_EVENT_INTERNAL_H #define LTTNG_EVENT_INTERNAL_H -#include +#include #include #include diff --git a/include/lttng/event-rule/event-rule-internal.h b/include/lttng/event-rule/event-rule-internal.hpp similarity index 97% rename from include/lttng/event-rule/event-rule-internal.h rename to include/lttng/event-rule/event-rule-internal.hpp index 802674863..46fb98144 100644 --- a/include/lttng/event-rule/event-rule-internal.h +++ b/include/lttng/event-rule/event-rule-internal.hpp @@ -8,9 +8,9 @@ #ifndef LTTNG_EVENT_RULE_INTERNAL_H #define LTTNG_EVENT_RULE_INTERNAL_H -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/include/lttng/event-rule/jul-logging-internal.h b/include/lttng/event-rule/jul-logging-internal.hpp similarity index 86% rename from include/lttng/event-rule/jul-logging-internal.h rename to include/lttng/event-rule/jul-logging-internal.hpp index 21a99eb7e..b769f0f80 100644 --- a/include/lttng/event-rule/jul-logging-internal.h +++ b/include/lttng/event-rule/jul-logging-internal.hpp @@ -8,13 +8,13 @@ #ifndef LTTNG_EVENT_RULE_JUL_LOGGING_INTERNAL_H #define LTTNG_EVENT_RULE_JUL_LOGGING_INTERNAL_H -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include +#include struct lttng_event_rule_jul_logging { struct lttng_event_rule parent; diff --git a/include/lttng/event-rule/kernel-kprobe-internal.h b/include/lttng/event-rule/kernel-kprobe-internal.hpp similarity index 88% rename from include/lttng/event-rule/kernel-kprobe-internal.h rename to include/lttng/event-rule/kernel-kprobe-internal.hpp index 16ac2bd3c..5b4997987 100644 --- a/include/lttng/event-rule/kernel-kprobe-internal.h +++ b/include/lttng/event-rule/kernel-kprobe-internal.hpp @@ -8,9 +8,9 @@ #ifndef LTTNG_EVENT_RULE_KERNEL_KPROBE_INTERNAL_H #define LTTNG_EVENT_RULE_KERNEL_KPROBE_INTERNAL_H -#include -#include -#include +#include +#include +#include #include struct lttng_event_rule_kernel_kprobe { diff --git a/include/lttng/event-rule/kernel-syscall-internal.h b/include/lttng/event-rule/kernel-syscall-internal.hpp similarity index 91% rename from include/lttng/event-rule/kernel-syscall-internal.h rename to include/lttng/event-rule/kernel-syscall-internal.hpp index 301238153..2ca1823ec 100644 --- a/include/lttng/event-rule/kernel-syscall-internal.h +++ b/include/lttng/event-rule/kernel-syscall-internal.hpp @@ -8,9 +8,9 @@ #ifndef LTTNG_EVENT_RULE_KERNEL_SYSCALL_INTERNAL_H #define LTTNG_EVENT_RULE_KERNEL_SYSCALL_INTERNAL_H -#include -#include -#include +#include +#include +#include #include struct lttng_event_rule_kernel_syscall { diff --git a/include/lttng/event-rule/kernel-tracepoint-internal.h b/include/lttng/event-rule/kernel-tracepoint-internal.hpp similarity index 88% rename from include/lttng/event-rule/kernel-tracepoint-internal.h rename to include/lttng/event-rule/kernel-tracepoint-internal.hpp index e16596e64..d800eef91 100644 --- a/include/lttng/event-rule/kernel-tracepoint-internal.h +++ b/include/lttng/event-rule/kernel-tracepoint-internal.hpp @@ -8,10 +8,10 @@ #ifndef LTTNG_EVENT_RULE_KERNEL_TRACEPOINT_INTERNAL_H #define LTTNG_EVENT_RULE_KERNEL_TRACEPOINT_INTERNAL_H -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/include/lttng/event-rule/kernel-uprobe-internal.h b/include/lttng/event-rule/kernel-uprobe-internal.hpp similarity index 90% rename from include/lttng/event-rule/kernel-uprobe-internal.h rename to include/lttng/event-rule/kernel-uprobe-internal.hpp index d8ce55793..f9a193100 100644 --- a/include/lttng/event-rule/kernel-uprobe-internal.h +++ b/include/lttng/event-rule/kernel-uprobe-internal.hpp @@ -8,9 +8,9 @@ #ifndef LTTNG_EVENT_RULE_KERNEL_UPROBE_INTERNAL_H #define LTTNG_EVENT_RULE_KERNEL_UPROBE_INTERNAL_H -#include -#include -#include +#include +#include +#include #include struct lttng_event_rule_kernel_uprobe { diff --git a/include/lttng/event-rule/log4j-logging-internal.h b/include/lttng/event-rule/log4j-logging-internal.hpp similarity index 86% rename from include/lttng/event-rule/log4j-logging-internal.h rename to include/lttng/event-rule/log4j-logging-internal.hpp index 7a1ac2831..a65e74b6d 100644 --- a/include/lttng/event-rule/log4j-logging-internal.h +++ b/include/lttng/event-rule/log4j-logging-internal.hpp @@ -8,13 +8,13 @@ #ifndef LTTNG_EVENT_RULE_LOG4J_LOGGING_INTERNAL_H #define LTTNG_EVENT_RULE_LOG4J_LOGGING_INTERNAL_H -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include +#include struct lttng_event_rule_log4j_logging { struct lttng_event_rule parent; diff --git a/include/lttng/event-rule/python-logging-internal.h b/include/lttng/event-rule/python-logging-internal.hpp similarity index 87% rename from include/lttng/event-rule/python-logging-internal.h rename to include/lttng/event-rule/python-logging-internal.hpp index 9f6f7fe68..d23f4e2a5 100644 --- a/include/lttng/event-rule/python-logging-internal.h +++ b/include/lttng/event-rule/python-logging-internal.hpp @@ -8,13 +8,13 @@ #ifndef LTTNG_EVENT_RULE_PYTHON_LOGGING_INTERNAL_H #define LTTNG_EVENT_RULE_PYTHON_LOGGING_INTERNAL_H -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include +#include struct lttng_event_rule_python_logging { struct lttng_event_rule parent; diff --git a/include/lttng/event-rule/user-tracepoint-internal.h b/include/lttng/event-rule/user-tracepoint-internal.hpp similarity index 88% rename from include/lttng/event-rule/user-tracepoint-internal.h rename to include/lttng/event-rule/user-tracepoint-internal.hpp index 9cd8b0582..1960a8a4d 100644 --- a/include/lttng/event-rule/user-tracepoint-internal.h +++ b/include/lttng/event-rule/user-tracepoint-internal.hpp @@ -8,14 +8,14 @@ #ifndef LTTNG_EVENT_RULE_USER_TRACEPOINT_INTERNAL_H #define LTTNG_EVENT_RULE_USER_TRACEPOINT_INTERNAL_H -#include -#include -#include +#include +#include +#include #include -#include +#include #include #include -#include +#include struct lttng_event_rule_user_tracepoint { struct lttng_event_rule parent; diff --git a/include/lttng/health-internal.h b/include/lttng/health-internal.hpp similarity index 98% rename from include/lttng/health-internal.h rename to include/lttng/health-internal.hpp index ceda0a8dd..67bdc6a5e 100644 --- a/include/lttng/health-internal.h +++ b/include/lttng/health-internal.hpp @@ -9,13 +9,13 @@ * */ -#include +#include #include #include #include #include #include -#include +#include /* * These are the value added to the current state depending of the position in diff --git a/include/lttng/kernel-probe-internal.h b/include/lttng/kernel-probe-internal.hpp similarity index 98% rename from include/lttng/kernel-probe-internal.h rename to include/lttng/kernel-probe-internal.hpp index 2d2ab8684..07c546f9d 100644 --- a/include/lttng/kernel-probe-internal.h +++ b/include/lttng/kernel-probe-internal.hpp @@ -8,8 +8,8 @@ #ifndef LTTNG_KERNEL_PROBE_INTERNAL_H #define LTTNG_KERNEL_PROBE_INTERNAL_H -#include -#include +#include +#include #include #include #include diff --git a/include/lttng/load-internal.h b/include/lttng/load-internal.hpp similarity index 93% rename from include/lttng/load-internal.h rename to include/lttng/load-internal.hpp index 9284741df..ef09ffd9c 100644 --- a/include/lttng/load-internal.h +++ b/include/lttng/load-internal.hpp @@ -13,8 +13,8 @@ #include #include -#include -#include +#include +#include /* * Object used by the load_session API. This is opaque to the public library. diff --git a/include/lttng/location-internal.h b/include/lttng/location-internal.hpp similarity index 96% rename from include/lttng/location-internal.h rename to include/lttng/location-internal.hpp index 33498c90d..4daeed061 100644 --- a/include/lttng/location-internal.h +++ b/include/lttng/location-internal.hpp @@ -9,9 +9,9 @@ #define LTTNG_LOCATION_INTERNAL_H #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/include/lttng/log-level-rule-internal.h b/include/lttng/log-level-rule-internal.hpp similarity index 90% rename from include/lttng/log-level-rule-internal.h rename to include/lttng/log-level-rule-internal.hpp index ac0f74b71..71447cfe3 100644 --- a/include/lttng/log-level-rule-internal.h +++ b/include/lttng/log-level-rule-internal.hpp @@ -10,11 +10,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/include/lttng/notification/channel-internal.h b/include/lttng/notification/channel-internal.hpp similarity index 98% rename from include/lttng/notification/channel-internal.h rename to include/lttng/notification/channel-internal.hpp index befdca083..3364704ee 100644 --- a/include/lttng/notification/channel-internal.h +++ b/include/lttng/notification/channel-internal.hpp @@ -9,8 +9,8 @@ #define LTTNG_NOTIFICATION_CHANNEL_INTERNAL_H #include -#include -#include +#include +#include #include #include #include diff --git a/include/lttng/notification/notification-internal.h b/include/lttng/notification/notification-internal.hpp similarity index 97% rename from include/lttng/notification/notification-internal.h rename to include/lttng/notification/notification-internal.hpp index 7e601b0c7..37c8f2af9 100644 --- a/include/lttng/notification/notification-internal.h +++ b/include/lttng/notification/notification-internal.hpp @@ -9,7 +9,7 @@ #define LTTNG_NOTIFICATION_INTERNAL_H #include -#include +#include #include #include #include diff --git a/include/lttng/ref-internal.h b/include/lttng/ref-internal.hpp similarity index 100% rename from include/lttng/ref-internal.h rename to include/lttng/ref-internal.hpp diff --git a/include/lttng/rotate-internal.h b/include/lttng/rotate-internal.hpp similarity index 98% rename from include/lttng/rotate-internal.h rename to include/lttng/rotate-internal.hpp index 0296efed1..076f50a9a 100644 --- a/include/lttng/rotate-internal.h +++ b/include/lttng/rotate-internal.hpp @@ -14,7 +14,7 @@ #include #include -#include +#include /* * Object returned by the rotate session API. diff --git a/include/lttng/save-internal.h b/include/lttng/save-internal.hpp similarity index 96% rename from include/lttng/save-internal.h rename to include/lttng/save-internal.hpp index 1af3f87e1..6b2bb9433 100644 --- a/include/lttng/save-internal.h +++ b/include/lttng/save-internal.hpp @@ -12,7 +12,7 @@ #include #include -#include +#include /* * Object used by the save_session API. This is opaque to the public library. diff --git a/include/lttng/session-descriptor-internal.h b/include/lttng/session-descriptor-internal.hpp similarity index 96% rename from include/lttng/session-descriptor-internal.h rename to include/lttng/session-descriptor-internal.hpp index f438d4812..c132f5600 100644 --- a/include/lttng/session-descriptor-internal.h +++ b/include/lttng/session-descriptor-internal.hpp @@ -10,9 +10,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include /* Note that these enums are used as part of the lttnctl protocol. */ diff --git a/include/lttng/session-internal.h b/include/lttng/session-internal.hpp similarity index 93% rename from include/lttng/session-internal.h rename to include/lttng/session-internal.hpp index 305c3f5f5..7f73b9610 100644 --- a/include/lttng/session-internal.h +++ b/include/lttng/session-internal.hpp @@ -9,7 +9,7 @@ #define LTTNG_SESSION_INTERNAL_H #include -#include +#include struct lttng_session_extended { struct { diff --git a/include/lttng/snapshot-internal.h b/include/lttng/snapshot-internal.hpp similarity index 97% rename from include/lttng/snapshot-internal.h rename to include/lttng/snapshot-internal.hpp index 78c741349..c60a1963b 100644 --- a/include/lttng/snapshot-internal.h +++ b/include/lttng/snapshot-internal.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include /* * Object used for the snapshot API. This is opaque to the public library. diff --git a/include/lttng/trigger/trigger-internal.h b/include/lttng/trigger/trigger-internal.hpp similarity index 98% rename from include/lttng/trigger/trigger-internal.h rename to include/lttng/trigger/trigger-internal.hpp index dab46ae07..206e7dfa8 100644 --- a/include/lttng/trigger/trigger-internal.h +++ b/include/lttng/trigger/trigger-internal.hpp @@ -8,10 +8,10 @@ #ifndef LTTNG_TRIGGER_INTERNAL_H #define LTTNG_TRIGGER_INTERNAL_H -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/include/lttng/userspace-probe-internal.h b/include/lttng/userspace-probe-internal.hpp similarity index 98% rename from include/lttng/userspace-probe-internal.h rename to include/lttng/userspace-probe-internal.hpp index 5e960c106..392242dae 100644 --- a/include/lttng/userspace-probe-internal.h +++ b/include/lttng/userspace-probe-internal.hpp @@ -10,8 +10,8 @@ #define LTTNG_USERSPACE_PROBE_INTERNAL_H #include -#include -#include +#include +#include #include struct lttng_payload; diff --git a/include/version.h b/include/version.hpp similarity index 100% rename from include/version.h rename to include/version.hpp diff --git a/src/bin/lttng-consumerd/Makefile.am b/src/bin/lttng-consumerd/Makefile.am index 19bc7ed4c..3ad8210cc 100644 --- a/src/bin/lttng-consumerd/Makefile.am +++ b/src/bin/lttng-consumerd/Makefile.am @@ -4,9 +4,9 @@ lttnglibexec_PROGRAMS = lttng-consumerd lttng_consumerd_SOURCES = \ lttng-consumerd.cpp \ - lttng-consumerd.h \ + lttng-consumerd.hpp \ health-consumerd.cpp \ - health-consumerd.h + health-consumerd.hpp lttng_consumerd_LDADD = \ $(top_builddir)/src/common/libconsumer.la \ diff --git a/src/bin/lttng-consumerd/health-consumerd.cpp b/src/bin/lttng-consumerd/health-consumerd.cpp index e3adbe142..8417fc6dc 100644 --- a/src/bin/lttng-consumerd/health-consumerd.cpp +++ b/src/bin/lttng-consumerd/health-consumerd.cpp @@ -29,16 +29,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include - -#include "lttng-consumerd.h" -#include "health-consumerd.h" +#include +#include +#include +#include +#include +#include +#include + +#include "lttng-consumerd.hpp" +#include "health-consumerd.hpp" /* Global health check unix path */ static char health_unix_sock_path[PATH_MAX]; diff --git a/src/bin/lttng-consumerd/health-consumerd.h b/src/bin/lttng-consumerd/health-consumerd.hpp similarity index 94% rename from src/bin/lttng-consumerd/health-consumerd.h rename to src/bin/lttng-consumerd/health-consumerd.hpp index 9faa081d4..4e3bf8686 100644 --- a/src/bin/lttng-consumerd/health-consumerd.h +++ b/src/bin/lttng-consumerd/health-consumerd.hpp @@ -8,7 +8,7 @@ * SPDX-License-Identifier: GPL-2.0-only */ -#include +#include enum health_type_consumerd { HEALTH_CONSUMERD_TYPE_CHANNEL = 0, diff --git a/src/bin/lttng-consumerd/lttng-consumerd.cpp b/src/bin/lttng-consumerd/lttng-consumerd.cpp index 3ee13dcb5..47d1e113d 100644 --- a/src/bin/lttng-consumerd/lttng-consumerd.cpp +++ b/src/bin/lttng-consumerd/lttng-consumerd.cpp @@ -29,17 +29,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "lttng-consumerd.h" -#include "health-consumerd.h" +#include +#include +#include +#include +#include +#include +#include +#include + +#include "lttng-consumerd.hpp" +#include "health-consumerd.hpp" /* threads (channel handling, poll, metadata, sessiond) */ diff --git a/src/bin/lttng-consumerd/lttng-consumerd.h b/src/bin/lttng-consumerd/lttng-consumerd.hpp similarity index 100% rename from src/bin/lttng-consumerd/lttng-consumerd.h rename to src/bin/lttng-consumerd/lttng-consumerd.hpp diff --git a/src/bin/lttng-consumerd/testpoint.h b/src/bin/lttng-consumerd/testpoint.hpp similarity index 88% rename from src/bin/lttng-consumerd/testpoint.h rename to src/bin/lttng-consumerd/testpoint.hpp index e0b8b3e67..da7eed5f3 100644 --- a/src/bin/lttng-consumerd/testpoint.h +++ b/src/bin/lttng-consumerd/testpoint.hpp @@ -8,7 +8,7 @@ #ifndef CONSUMERD_TESTPOINT_H #define CONSUMERD_TESTPOINT_H -#include +#include /* Testpoints, internal use only */ TESTPOINT_DECL(consumerd_data_thread_poll); diff --git a/src/bin/lttng-crash/lttng-crash.cpp b/src/bin/lttng-crash/lttng-crash.cpp index bee9c29b0..0b4afc91b 100644 --- a/src/bin/lttng-crash/lttng-crash.cpp +++ b/src/bin/lttng-crash/lttng-crash.cpp @@ -20,15 +20,15 @@ #include #include #include -#include +#include #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #define COPY_BUFLEN 4096 #define RB_CRASH_DUMP_ABI_LEN 32 diff --git a/src/bin/lttng-relayd/Makefile.am b/src/bin/lttng-relayd/Makefile.am index afb435f06..b473d5c62 100644 --- a/src/bin/lttng-relayd/Makefile.am +++ b/src/bin/lttng-relayd/Makefile.am @@ -9,23 +9,23 @@ endif bin_PROGRAMS = lttng-relayd -lttng_relayd_SOURCES = main.cpp lttng-relayd.h utils.h utils.cpp cmd.h \ - index.cpp index.h live.cpp live.h ctf-trace.cpp ctf-trace.h \ - cmd-2-1.cpp cmd-2-1.h \ - cmd-2-2.cpp cmd-2-2.h \ - cmd-2-4.cpp cmd-2-4.h \ - cmd-2-11.cpp cmd-2-11.h \ - health-relayd.cpp health-relayd.h \ - lttng-viewer-abi.h testpoint.h \ - viewer-stream.h viewer-stream.cpp \ - session.cpp session.h \ - stream.cpp stream.h \ - connection.cpp connection.h \ - viewer-session.cpp viewer-session.h \ - tracefile-array.cpp tracefile-array.h \ - tcp_keep_alive.cpp tcp_keep_alive.h \ - sessiond-trace-chunks.cpp sessiond-trace-chunks.h \ - backward-compatibility-group-by.cpp backward-compatibility-group-by.h +lttng_relayd_SOURCES = main.cpp lttng-relayd.hpp utils.hpp utils.cpp cmd.hpp \ + index.cpp index.hpp live.cpp live.hpp ctf-trace.cpp ctf-trace.hpp \ + cmd-2-1.cpp cmd-2-1.hpp \ + cmd-2-2.cpp cmd-2-2.hpp \ + cmd-2-4.cpp cmd-2-4.hpp \ + cmd-2-11.cpp cmd-2-11.hpp \ + health-relayd.cpp health-relayd.hpp \ + lttng-viewer-abi.hpp testpoint.hpp \ + viewer-stream.hpp viewer-stream.cpp \ + session.cpp session.hpp \ + stream.cpp stream.hpp \ + connection.cpp connection.hpp \ + viewer-session.cpp viewer-session.hpp \ + tracefile-array.cpp tracefile-array.hpp \ + tcp_keep_alive.cpp tcp_keep_alive.hpp \ + sessiond-trace-chunks.cpp sessiond-trace-chunks.hpp \ + backward-compatibility-group-by.cpp backward-compatibility-group-by.hpp # link on liblttngctl for check if relayd is already alive. lttng_relayd_LDADD = $(URCU_LIBS) \ diff --git a/src/bin/lttng-relayd/backward-compatibility-group-by.cpp b/src/bin/lttng-relayd/backward-compatibility-group-by.cpp index f0454a56b..e1d289d98 100644 --- a/src/bin/lttng-relayd/backward-compatibility-group-by.cpp +++ b/src/bin/lttng-relayd/backward-compatibility-group-by.cpp @@ -5,17 +5,17 @@ * */ -#include "common/time.h" +#include "common/time.hpp" #include #include #include #include -#include -#include -#include +#include +#include +#include -#include "backward-compatibility-group-by.h" +#include "backward-compatibility-group-by.hpp" #define DATETIME_REGEX \ ".*-[1-2][0-9][0-9][0-9][0-1][0-9][0-3][0-9]-[0-2][0-9][0-5][0-9][0-5][0-9]$" diff --git a/src/bin/lttng-relayd/backward-compatibility-group-by.h b/src/bin/lttng-relayd/backward-compatibility-group-by.hpp similarity index 100% rename from src/bin/lttng-relayd/backward-compatibility-group-by.h rename to src/bin/lttng-relayd/backward-compatibility-group-by.hpp diff --git a/src/bin/lttng-relayd/cmd-2-1.cpp b/src/bin/lttng-relayd/cmd-2-1.cpp index 1f939dd07..9befdd606 100644 --- a/src/bin/lttng-relayd/cmd-2-1.cpp +++ b/src/bin/lttng-relayd/cmd-2-1.cpp @@ -9,13 +9,13 @@ #define _LGPL_SOURCE -#include -#include -#include +#include +#include +#include #include -#include "cmd-2-1.h" -#include "utils.h" +#include "cmd-2-1.hpp" +#include "utils.hpp" /* * cmd_recv_stream_2_1 allocates path_name and channel_name. diff --git a/src/bin/lttng-relayd/cmd-2-1.h b/src/bin/lttng-relayd/cmd-2-1.hpp similarity index 87% rename from src/bin/lttng-relayd/cmd-2-1.h rename to src/bin/lttng-relayd/cmd-2-1.hpp index 7040e4fd8..147069b6b 100644 --- a/src/bin/lttng-relayd/cmd-2-1.h +++ b/src/bin/lttng-relayd/cmd-2-1.hpp @@ -10,8 +10,8 @@ * */ -#include "lttng-relayd.h" -#include +#include "lttng-relayd.hpp" +#include int cmd_recv_stream_2_1(const struct lttng_buffer_view *payload, char **path_name, char **channel_name); diff --git a/src/bin/lttng-relayd/cmd-2-11.cpp b/src/bin/lttng-relayd/cmd-2-11.cpp index 572b1836c..680cb307b 100644 --- a/src/bin/lttng-relayd/cmd-2-11.cpp +++ b/src/bin/lttng-relayd/cmd-2-11.cpp @@ -8,15 +8,15 @@ #define _LGPL_SOURCE #include -#include -#include +#include +#include -#include -#include +#include +#include #include -#include "cmd-2-11.h" -#include "utils.h" +#include "cmd-2-11.hpp" +#include "utils.hpp" int cmd_create_session_2_11(const struct lttng_buffer_view *payload, char *session_name, char *hostname, char *base_path, diff --git a/src/bin/lttng-relayd/cmd-2-11.h b/src/bin/lttng-relayd/cmd-2-11.hpp similarity index 89% rename from src/bin/lttng-relayd/cmd-2-11.h rename to src/bin/lttng-relayd/cmd-2-11.hpp index b3a3a997a..4b004f0d3 100644 --- a/src/bin/lttng-relayd/cmd-2-11.h +++ b/src/bin/lttng-relayd/cmd-2-11.hpp @@ -8,9 +8,9 @@ #ifndef RELAYD_CMD_2_11_H #define RELAYD_CMD_2_11_H -#include "lttng-relayd.h" -#include -#include +#include "lttng-relayd.hpp" +#include +#include int cmd_create_session_2_11(const struct lttng_buffer_view *payload, char *session_name, char *hostname, char *base_path, diff --git a/src/bin/lttng-relayd/cmd-2-2.cpp b/src/bin/lttng-relayd/cmd-2-2.cpp index bd18714af..3d9af63a3 100644 --- a/src/bin/lttng-relayd/cmd-2-2.cpp +++ b/src/bin/lttng-relayd/cmd-2-2.cpp @@ -9,16 +9,16 @@ #define _LGPL_SOURCE -#include -#include +#include +#include -#include -#include +#include +#include #include -#include "cmd-2-2.h" -#include "cmd-2-1.h" -#include "utils.h" +#include "cmd-2-2.hpp" +#include "cmd-2-1.hpp" +#include "utils.hpp" /* * cmd_recv_stream_2_2 allocates path_name and channel_name. diff --git a/src/bin/lttng-relayd/cmd-2-2.h b/src/bin/lttng-relayd/cmd-2-2.hpp similarity index 88% rename from src/bin/lttng-relayd/cmd-2-2.h rename to src/bin/lttng-relayd/cmd-2-2.hpp index e754ace4c..010bbb127 100644 --- a/src/bin/lttng-relayd/cmd-2-2.h +++ b/src/bin/lttng-relayd/cmd-2-2.hpp @@ -10,8 +10,8 @@ * */ -#include "lttng-relayd.h" -#include +#include "lttng-relayd.hpp" +#include int cmd_recv_stream_2_2(const struct lttng_buffer_view *payload, char **path_name, char **channel_name, diff --git a/src/bin/lttng-relayd/cmd-2-4.cpp b/src/bin/lttng-relayd/cmd-2-4.cpp index 7abc371f0..7b546c7f6 100644 --- a/src/bin/lttng-relayd/cmd-2-4.cpp +++ b/src/bin/lttng-relayd/cmd-2-4.cpp @@ -9,15 +9,15 @@ #define _LGPL_SOURCE -#include -#include +#include +#include -#include -#include +#include +#include #include -#include "cmd-2-4.h" -#include "lttng-relayd.h" +#include "cmd-2-4.hpp" +#include "lttng-relayd.hpp" int cmd_create_session_2_4(const struct lttng_buffer_view *payload, char *session_name, char *hostname, diff --git a/src/bin/lttng-relayd/cmd-2-4.h b/src/bin/lttng-relayd/cmd-2-4.hpp similarity index 88% rename from src/bin/lttng-relayd/cmd-2-4.h rename to src/bin/lttng-relayd/cmd-2-4.hpp index 094928717..b3d105c84 100644 --- a/src/bin/lttng-relayd/cmd-2-4.h +++ b/src/bin/lttng-relayd/cmd-2-4.hpp @@ -10,8 +10,8 @@ * */ -#include "lttng-relayd.h" -#include +#include "lttng-relayd.hpp" +#include int cmd_create_session_2_4(const struct lttng_buffer_view *payload, char *session_name, char *hostname, diff --git a/src/bin/lttng-relayd/cmd.h b/src/bin/lttng-relayd/cmd.hpp similarity index 77% rename from src/bin/lttng-relayd/cmd.h rename to src/bin/lttng-relayd/cmd.hpp index 86668b420..24e361a4b 100644 --- a/src/bin/lttng-relayd/cmd.h +++ b/src/bin/lttng-relayd/cmd.hpp @@ -10,9 +10,9 @@ * */ -#include "cmd-2-1.h" -#include "cmd-2-2.h" -#include "cmd-2-4.h" -#include "cmd-2-11.h" +#include "cmd-2-1.hpp" +#include "cmd-2-2.hpp" +#include "cmd-2-4.hpp" +#include "cmd-2-11.hpp" #endif /* RELAYD_CMD_H */ diff --git a/src/bin/lttng-relayd/connection.cpp b/src/bin/lttng-relayd/connection.cpp index 98ffad29f..c1e58aba3 100644 --- a/src/bin/lttng-relayd/connection.cpp +++ b/src/bin/lttng-relayd/connection.cpp @@ -8,12 +8,12 @@ */ #define _LGPL_SOURCE -#include +#include #include -#include "connection.h" -#include "stream.h" -#include "viewer-session.h" +#include "connection.hpp" +#include "stream.hpp" +#include "viewer-session.hpp" bool connection_get(struct relay_connection *conn) { diff --git a/src/bin/lttng-relayd/connection.h b/src/bin/lttng-relayd/connection.hpp similarity index 95% rename from src/bin/lttng-relayd/connection.h rename to src/bin/lttng-relayd/connection.hpp index 98ca91590..de25255a7 100644 --- a/src/bin/lttng-relayd/connection.h +++ b/src/bin/lttng-relayd/connection.hpp @@ -17,12 +17,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include "session.h" +#include "session.hpp" enum connection_type { RELAY_CONNECTION_UNKNOWN = 0, diff --git a/src/bin/lttng-relayd/ctf-trace.cpp b/src/bin/lttng-relayd/ctf-trace.cpp index 861bcfbb3..4ee745a10 100644 --- a/src/bin/lttng-relayd/ctf-trace.cpp +++ b/src/bin/lttng-relayd/ctf-trace.cpp @@ -9,13 +9,13 @@ #define _LGPL_SOURCE -#include -#include +#include +#include #include -#include "ctf-trace.h" -#include "lttng-relayd.h" -#include "stream.h" +#include "ctf-trace.hpp" +#include "lttng-relayd.hpp" +#include "stream.hpp" static uint64_t last_relay_ctf_trace_id; static pthread_mutex_t last_relay_ctf_trace_id_lock = PTHREAD_MUTEX_INITIALIZER; diff --git a/src/bin/lttng-relayd/ctf-trace.h b/src/bin/lttng-relayd/ctf-trace.hpp similarity index 93% rename from src/bin/lttng-relayd/ctf-trace.h rename to src/bin/lttng-relayd/ctf-trace.hpp index 3afc00fe8..dbf7d3fa2 100644 --- a/src/bin/lttng-relayd/ctf-trace.h +++ b/src/bin/lttng-relayd/ctf-trace.hpp @@ -13,11 +13,11 @@ #include #include -#include +#include -#include "session.h" -#include "stream.h" -#include "viewer-stream.h" +#include "session.hpp" +#include "stream.hpp" +#include "viewer-stream.hpp" struct ctf_trace { struct urcu_ref ref; /* Every stream has a ref on the trace. */ diff --git a/src/bin/lttng-relayd/health-relayd.cpp b/src/bin/lttng-relayd/health-relayd.cpp index d43c37185..8e22dfe66 100644 --- a/src/bin/lttng-relayd/health-relayd.cpp +++ b/src/bin/lttng-relayd/health-relayd.cpp @@ -28,18 +28,18 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "lttng-relayd.h" -#include "health-relayd.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "lttng-relayd.hpp" +#include "health-relayd.hpp" /* Global health check unix path */ static diff --git a/src/bin/lttng-relayd/health-relayd.h b/src/bin/lttng-relayd/health-relayd.hpp similarity index 95% rename from src/bin/lttng-relayd/health-relayd.h rename to src/bin/lttng-relayd/health-relayd.hpp index 4cd3ec1e7..7d885c672 100644 --- a/src/bin/lttng-relayd/health-relayd.h +++ b/src/bin/lttng-relayd/health-relayd.hpp @@ -10,7 +10,7 @@ */ #include -#include +#include #define LTTNG_RELAYD_HEALTH_ENV "LTTNG_RELAYD_HEALTH" diff --git a/src/bin/lttng-relayd/index.cpp b/src/bin/lttng-relayd/index.cpp index 6cf131b25..651b36715 100644 --- a/src/bin/lttng-relayd/index.cpp +++ b/src/bin/lttng-relayd/index.cpp @@ -9,14 +9,14 @@ #define _LGPL_SOURCE -#include -#include -#include - -#include "lttng-relayd.h" -#include "stream.h" -#include "index.h" -#include "connection.h" +#include +#include +#include + +#include "lttng-relayd.hpp" +#include "stream.hpp" +#include "index.hpp" +#include "connection.hpp" /* * Allocate a new relay index object. Pass the stream in which it is diff --git a/src/bin/lttng-relayd/index.h b/src/bin/lttng-relayd/index.hpp similarity index 96% rename from src/bin/lttng-relayd/index.h rename to src/bin/lttng-relayd/index.hpp index 4364f12ff..cb29485eb 100644 --- a/src/bin/lttng-relayd/index.h +++ b/src/bin/lttng-relayd/index.hpp @@ -13,8 +13,8 @@ #include #include -#include -#include +#include +#include struct relay_stream; struct relay_connection; diff --git a/src/bin/lttng-relayd/live.cpp b/src/bin/lttng-relayd/live.cpp index 5aa899b28..64c194fdc 100644 --- a/src/bin/lttng-relayd/live.cpp +++ b/src/bin/lttng-relayd/live.cpp @@ -31,34 +31,34 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include "cmd.h" -#include "connection.h" -#include "ctf-trace.h" -#include "health-relayd.h" -#include "live.h" -#include "lttng-relayd.h" -#include "session.h" -#include "stream.h" -#include "testpoint.h" -#include "utils.h" -#include "viewer-session.h" -#include "viewer-stream.h" +#include "cmd.hpp" +#include "connection.hpp" +#include "ctf-trace.hpp" +#include "health-relayd.hpp" +#include "live.hpp" +#include "lttng-relayd.hpp" +#include "session.hpp" +#include "stream.hpp" +#include "testpoint.hpp" +#include "utils.hpp" +#include "viewer-session.hpp" +#include "viewer-stream.hpp" #define SESSION_BUF_DEFAULT_COUNT 16 diff --git a/src/bin/lttng-relayd/live.h b/src/bin/lttng-relayd/live.hpp similarity index 89% rename from src/bin/lttng-relayd/live.h rename to src/bin/lttng-relayd/live.hpp index d6ec89e0f..d1866d3f5 100644 --- a/src/bin/lttng-relayd/live.h +++ b/src/bin/lttng-relayd/live.hpp @@ -10,9 +10,9 @@ * */ -#include +#include -#include "lttng-relayd.h" +#include "lttng-relayd.hpp" int relayd_live_create(struct lttng_uri *live_uri); int relayd_live_stop(void); diff --git a/src/bin/lttng-relayd/lttng-relayd.h b/src/bin/lttng-relayd/lttng-relayd.hpp similarity index 94% rename from src/bin/lttng-relayd/lttng-relayd.h rename to src/bin/lttng-relayd/lttng-relayd.hpp index e64bb373f..a92ace77d 100644 --- a/src/bin/lttng-relayd/lttng-relayd.h +++ b/src/bin/lttng-relayd/lttng-relayd.hpp @@ -14,8 +14,8 @@ #include #include -#include -#include +#include +#include struct sessiond_trace_chunk_registry; diff --git a/src/bin/lttng-relayd/lttng-viewer-abi.h b/src/bin/lttng-relayd/lttng-viewer-abi.hpp similarity index 99% rename from src/bin/lttng-relayd/lttng-viewer-abi.h rename to src/bin/lttng-relayd/lttng-viewer-abi.hpp index f5f61b4d9..6fdb7fa60 100644 --- a/src/bin/lttng-relayd/lttng-viewer-abi.h +++ b/src/bin/lttng-relayd/lttng-viewer-abi.hpp @@ -11,7 +11,7 @@ */ #include -#include +#include #define LTTNG_VIEWER_PATH_MAX 4096 #define LTTNG_VIEWER_NAME_MAX 255 diff --git a/src/bin/lttng-relayd/main.cpp b/src/bin/lttng-relayd/main.cpp index 42eb09a89..e1c74e358 100644 --- a/src/bin/lttng-relayd/main.cpp +++ b/src/bin/lttng-relayd/main.cpp @@ -36,45 +36,45 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "backward-compatibility-group-by.h" -#include "cmd.h" -#include "connection.h" -#include "ctf-trace.h" -#include "health-relayd.h" -#include "index.h" -#include "live.h" -#include "lttng-relayd.h" -#include "session.h" -#include "sessiond-trace-chunks.h" -#include "stream.h" -#include "tcp_keep_alive.h" -#include "testpoint.h" -#include "tracefile-array.h" -#include "utils.h" -#include "version.h" -#include "viewer-stream.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "backward-compatibility-group-by.hpp" +#include "cmd.hpp" +#include "connection.hpp" +#include "ctf-trace.hpp" +#include "health-relayd.hpp" +#include "index.hpp" +#include "live.hpp" +#include "lttng-relayd.hpp" +#include "session.hpp" +#include "sessiond-trace-chunks.hpp" +#include "stream.hpp" +#include "tcp_keep_alive.hpp" +#include "testpoint.hpp" +#include "tracefile-array.hpp" +#include "utils.hpp" +#include "version.hpp" +#include "viewer-stream.hpp" static const char *help_msg = #ifdef LTTNG_EMBED_HELP diff --git a/src/bin/lttng-relayd/session.cpp b/src/bin/lttng-relayd/session.cpp index ca8e183e6..abefc0d27 100644 --- a/src/bin/lttng-relayd/session.cpp +++ b/src/bin/lttng-relayd/session.cpp @@ -8,23 +8,23 @@ */ #define _LGPL_SOURCE -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include -#include "ctf-trace.h" -#include "lttng-relayd.h" -#include "session.h" -#include "sessiond-trace-chunks.h" -#include "stream.h" -#include -#include "utils.h" +#include "ctf-trace.hpp" +#include "lttng-relayd.hpp" +#include "session.hpp" +#include "sessiond-trace-chunks.hpp" +#include "stream.hpp" +#include +#include "utils.hpp" /* Global session id used in the session creation. */ static uint64_t last_relay_session_id; diff --git a/src/bin/lttng-relayd/session.h b/src/bin/lttng-relayd/session.hpp similarity index 97% rename from src/bin/lttng-relayd/session.h rename to src/bin/lttng-relayd/session.hpp index 8029dcd8e..9c61b942b 100644 --- a/src/bin/lttng-relayd/session.h +++ b/src/bin/lttng-relayd/session.hpp @@ -17,10 +17,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include /* * Represents a session for the relay point of view diff --git a/src/bin/lttng-relayd/sessiond-trace-chunks.cpp b/src/bin/lttng-relayd/sessiond-trace-chunks.cpp index 18ef586d0..0a5c44825 100644 --- a/src/bin/lttng-relayd/sessiond-trace-chunks.cpp +++ b/src/bin/lttng-relayd/sessiond-trace-chunks.cpp @@ -5,17 +5,17 @@ * */ -#include "sessiond-trace-chunks.h" +#include "sessiond-trace-chunks.hpp" #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/bin/lttng-relayd/sessiond-trace-chunks.h b/src/bin/lttng-relayd/sessiond-trace-chunks.hpp similarity index 97% rename from src/bin/lttng-relayd/sessiond-trace-chunks.h rename to src/bin/lttng-relayd/sessiond-trace-chunks.hpp index 2c771d809..2e494292a 100644 --- a/src/bin/lttng-relayd/sessiond-trace-chunks.h +++ b/src/bin/lttng-relayd/sessiond-trace-chunks.hpp @@ -8,8 +8,8 @@ #ifndef SESSIOND_TRACE_CHUNK_REGISTRY_H #define SESSIOND_TRACE_CHUNK_REGISTRY_H -#include -#include +#include +#include #include /* diff --git a/src/bin/lttng-relayd/stream.cpp b/src/bin/lttng-relayd/stream.cpp index 65a8ce11a..aba160bfa 100644 --- a/src/bin/lttng-relayd/stream.cpp +++ b/src/bin/lttng-relayd/stream.cpp @@ -10,18 +10,18 @@ #define _LGPL_SOURCE #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -#include "lttng-relayd.h" -#include "index.h" -#include "stream.h" -#include "viewer-stream.h" +#include "lttng-relayd.hpp" +#include "index.hpp" +#include "stream.hpp" +#include "viewer-stream.hpp" #include #include diff --git a/src/bin/lttng-relayd/stream.h b/src/bin/lttng-relayd/stream.hpp similarity index 97% rename from src/bin/lttng-relayd/stream.h rename to src/bin/lttng-relayd/stream.hpp index c64b18045..6e09c5571 100644 --- a/src/bin/lttng-relayd/stream.h +++ b/src/bin/lttng-relayd/stream.hpp @@ -15,13 +15,13 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include "session.h" -#include "tracefile-array.h" +#include "session.hpp" +#include "tracefile-array.hpp" struct lttcomm_relayd_index; diff --git a/src/bin/lttng-relayd/tcp_keep_alive.cpp b/src/bin/lttng-relayd/tcp_keep_alive.cpp index c52a55ffb..885b2a6a5 100644 --- a/src/bin/lttng-relayd/tcp_keep_alive.cpp +++ b/src/bin/lttng-relayd/tcp_keep_alive.cpp @@ -11,12 +11,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include "tcp_keep_alive.h" +#include "tcp_keep_alive.hpp" #define SOLARIS_IDLE_TIME_MIN_S 10 #define SOLARIS_IDLE_TIME_MAX_S 864000 /* 10 days */ diff --git a/src/bin/lttng-relayd/tcp_keep_alive.h b/src/bin/lttng-relayd/tcp_keep_alive.hpp similarity index 90% rename from src/bin/lttng-relayd/tcp_keep_alive.h rename to src/bin/lttng-relayd/tcp_keep_alive.hpp index 223602835..840730f60 100644 --- a/src/bin/lttng-relayd/tcp_keep_alive.h +++ b/src/bin/lttng-relayd/tcp_keep_alive.hpp @@ -8,7 +8,7 @@ #ifndef RELAYD_TCP_KEEP_ALIVE_H #define RELAYD_TCP_KEEP_ALIVE_H -#include +#include int socket_apply_keep_alive_config(int socket_fd); diff --git a/src/bin/lttng-relayd/testpoint.h b/src/bin/lttng-relayd/testpoint.hpp similarity index 93% rename from src/bin/lttng-relayd/testpoint.h rename to src/bin/lttng-relayd/testpoint.hpp index f58836a96..84fb4a868 100644 --- a/src/bin/lttng-relayd/testpoint.h +++ b/src/bin/lttng-relayd/testpoint.hpp @@ -9,7 +9,7 @@ * */ -#include +#include /* Testpoints, internal use only */ TESTPOINT_DECL(relayd_thread_dispatcher); diff --git a/src/bin/lttng-relayd/tracefile-array.cpp b/src/bin/lttng-relayd/tracefile-array.cpp index 05012b642..8b1b533d5 100644 --- a/src/bin/lttng-relayd/tracefile-array.cpp +++ b/src/bin/lttng-relayd/tracefile-array.cpp @@ -6,11 +6,11 @@ */ #define _LGPL_SOURCE -#include -#include -#include +#include +#include +#include -#include "tracefile-array.h" +#include "tracefile-array.hpp" struct tracefile_array *tracefile_array_create(size_t count) { diff --git a/src/bin/lttng-relayd/tracefile-array.h b/src/bin/lttng-relayd/tracefile-array.hpp similarity index 100% rename from src/bin/lttng-relayd/tracefile-array.h rename to src/bin/lttng-relayd/tracefile-array.hpp diff --git a/src/bin/lttng-relayd/utils.cpp b/src/bin/lttng-relayd/utils.cpp index 52ac19e8a..ccfc3a92a 100644 --- a/src/bin/lttng-relayd/utils.cpp +++ b/src/bin/lttng-relayd/utils.cpp @@ -11,13 +11,13 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include "lttng-relayd.h" -#include "utils.h" +#include "lttng-relayd.hpp" +#include "utils.hpp" static char *create_output_path_auto(const char *path_name) { diff --git a/src/bin/lttng-relayd/utils.h b/src/bin/lttng-relayd/utils.hpp similarity index 100% rename from src/bin/lttng-relayd/utils.h rename to src/bin/lttng-relayd/utils.hpp diff --git a/src/bin/lttng-relayd/viewer-session.cpp b/src/bin/lttng-relayd/viewer-session.cpp index ac14dbff0..4529a21fa 100644 --- a/src/bin/lttng-relayd/viewer-session.cpp +++ b/src/bin/lttng-relayd/viewer-session.cpp @@ -8,15 +8,15 @@ */ #define _LGPL_SOURCE -#include +#include #include -#include "lttng-relayd.h" -#include "ctf-trace.h" -#include "session.h" -#include "viewer-session.h" -#include "viewer-stream.h" -#include "stream.h" +#include "lttng-relayd.hpp" +#include "ctf-trace.hpp" +#include "session.hpp" +#include "viewer-session.hpp" +#include "viewer-stream.hpp" +#include "stream.hpp" struct relay_viewer_session *viewer_session_create(void) { diff --git a/src/bin/lttng-relayd/viewer-session.h b/src/bin/lttng-relayd/viewer-session.hpp similarity index 95% rename from src/bin/lttng-relayd/viewer-session.h rename to src/bin/lttng-relayd/viewer-session.hpp index f70daed7b..65ad3e11a 100644 --- a/src/bin/lttng-relayd/viewer-session.h +++ b/src/bin/lttng-relayd/viewer-session.hpp @@ -16,11 +16,11 @@ #include #include -#include -#include +#include +#include -#include "session.h" -#include "lttng-viewer-abi.h" +#include "session.hpp" +#include "lttng-viewer-abi.hpp" struct relay_viewer_session { /* diff --git a/src/bin/lttng-relayd/viewer-stream.cpp b/src/bin/lttng-relayd/viewer-stream.cpp index 69671bd7a..fa447d45b 100644 --- a/src/bin/lttng-relayd/viewer-stream.cpp +++ b/src/bin/lttng-relayd/viewer-stream.cpp @@ -8,17 +8,17 @@ */ #define _LGPL_SOURCE -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include -#include "lttng-relayd.h" -#include "viewer-stream.h" +#include "lttng-relayd.hpp" +#include "viewer-stream.hpp" static void viewer_stream_release_composite_objects(struct relay_viewer_stream *vstream) { diff --git a/src/bin/lttng-relayd/viewer-stream.h b/src/bin/lttng-relayd/viewer-stream.hpp similarity index 95% rename from src/bin/lttng-relayd/viewer-stream.h rename to src/bin/lttng-relayd/viewer-stream.hpp index e7d733b9e..42bdc1e20 100644 --- a/src/bin/lttng-relayd/viewer-stream.h +++ b/src/bin/lttng-relayd/viewer-stream.hpp @@ -14,11 +14,11 @@ #include #include -#include +#include -#include "ctf-trace.h" -#include "lttng-viewer-abi.h" -#include "stream.h" +#include "ctf-trace.hpp" +#include "lttng-viewer-abi.hpp" +#include "stream.hpp" struct relay_stream; diff --git a/src/bin/lttng-sessiond/Makefile.am b/src/bin/lttng-sessiond/Makefile.am index 96a20a4dd..13fdb714e 100644 --- a/src/bin/lttng-sessiond/Makefile.am +++ b/src/bin/lttng-sessiond/Makefile.am @@ -9,61 +9,61 @@ endif noinst_LTLIBRARIES = liblttng-sessiond-common.la -liblttng_sessiond_common_la_SOURCES = utils.cpp utils.h \ - trace-kernel.cpp trace-kernel.h \ - kernel.cpp kernel.h \ - ust-app.h ust-sigbus.h trace-ust.h notify-apps.h \ - lttng-ust-ctl.h lttng-ust-abi.h lttng-ust-error.h \ - ust-ctl-internal.h ust-abi-internal.h ust-error-internal.h \ - ust-registry.h \ - condition-internal.cpp condition-internal.h \ - context.cpp context.h \ - channel.cpp channel.h \ - event.cpp event.h \ - consumer.cpp consumer.h \ - session.cpp session.h \ - modprobe.cpp modprobe.h kern-modules.h \ - fd-limit.cpp fd-limit.h \ - kernel-consumer.cpp kernel-consumer.h \ - consumer.h \ - health-sessiond.h \ - cmd.cpp cmd.h \ - buffer-registry.cpp buffer-registry.h \ - testpoint.h \ - snapshot.cpp snapshot.h \ - agent.cpp agent.h \ - save.h save.cpp \ - lttng-syscall.h lttng-syscall.cpp \ - notification-thread.h notification-thread.cpp \ - notification-thread-internal.h \ - notification-thread-commands.h notification-thread-commands.cpp \ - notification-thread-events.h notification-thread-events.cpp \ - sessiond-config.h sessiond-config.cpp \ - rotate.h rotate.cpp \ - rotation-thread.h rotation-thread.cpp \ - timer.cpp timer.h \ +liblttng_sessiond_common_la_SOURCES = utils.cpp utils.hpp \ + trace-kernel.cpp trace-kernel.hpp \ + kernel.cpp kernel.hpp \ + ust-app.hpp ust-sigbus.hpp trace-ust.hpp notify-apps.hpp \ + lttng-ust-ctl.hpp lttng-ust-abi.hpp lttng-ust-error.hpp \ + ust-ctl-internal.hpp ust-abi-internal.hpp ust-error-internal.hpp \ + ust-registry.hpp \ + condition-internal.cpp condition-internal.hpp \ + context.cpp context.hpp \ + channel.cpp channel.hpp \ + event.cpp event.hpp \ + consumer.cpp consumer.hpp \ + session.cpp session.hpp \ + modprobe.cpp modprobe.hpp kern-modules.hpp \ + fd-limit.cpp fd-limit.hpp \ + kernel-consumer.cpp kernel-consumer.hpp \ + consumer.hpp \ + health-sessiond.hpp \ + cmd.cpp cmd.hpp \ + buffer-registry.cpp buffer-registry.hpp \ + testpoint.hpp \ + snapshot.cpp snapshot.hpp \ + agent.cpp agent.hpp \ + save.hpp save.cpp \ + lttng-syscall.hpp lttng-syscall.cpp \ + notification-thread.hpp notification-thread.cpp \ + notification-thread-internal.hpp \ + notification-thread-commands.hpp notification-thread-commands.cpp \ + notification-thread-events.hpp notification-thread-events.cpp \ + sessiond-config.hpp sessiond-config.cpp \ + rotate.hpp rotate.cpp \ + rotation-thread.hpp rotation-thread.cpp \ + timer.cpp timer.hpp \ globals.cpp \ thread-utils.cpp \ process-utils.cpp \ - thread.cpp thread.h \ + thread.cpp thread.hpp \ health.cpp \ - client.cpp client.h \ - dispatch.cpp dispatch.h \ - register.cpp register.h \ - manage-apps.cpp manage-apps.h \ - manage-kernel.cpp manage-kernel.h \ - manage-consumer.cpp manage-consumer.h \ - clear.cpp clear.h \ - tracker.cpp tracker.h \ - event-notifier-error-accounting.cpp event-notifier-error-accounting.h \ - action-executor.cpp action-executor.h\ + client.cpp client.hpp \ + dispatch.cpp dispatch.hpp \ + register.cpp register.hpp \ + manage-apps.cpp manage-apps.hpp \ + manage-kernel.cpp manage-kernel.hpp \ + manage-consumer.cpp manage-consumer.hpp \ + clear.cpp clear.hpp \ + tracker.cpp tracker.hpp \ + event-notifier-error-accounting.cpp event-notifier-error-accounting.hpp \ + action-executor.cpp action-executor.hpp\ trigger-error-query.cpp if HAVE_LIBLTTNG_UST_CTL liblttng_sessiond_common_la_SOURCES += trace-ust.cpp ust-registry.cpp ust-app.cpp \ - ust-consumer.cpp ust-consumer.h notify-apps.cpp \ - ust-metadata.cpp ust-clock.h agent-thread.cpp agent-thread.h \ - ust-field-utils.h ust-field-utils.cpp \ + ust-consumer.cpp ust-consumer.hpp notify-apps.cpp \ + ust-metadata.cpp ust-clock.hpp agent-thread.cpp agent-thread.hpp \ + ust-field-utils.hpp ust-field-utils.cpp \ ust-sigbus.cpp endif @@ -87,7 +87,7 @@ endif bin_PROGRAMS = lttng-sessiond -lttng_sessiond_SOURCES = lttng-sessiond.h main.cpp +lttng_sessiond_SOURCES = lttng-sessiond.hpp main.cpp lttng_sessiond_LDFLAGS = -rdynamic diff --git a/src/bin/lttng-sessiond/action-executor.cpp b/src/bin/lttng-sessiond/action-executor.cpp index e2eeed451..f43716c63 100644 --- a/src/bin/lttng-sessiond/action-executor.cpp +++ b/src/bin/lttng-sessiond/action-executor.cpp @@ -5,29 +5,29 @@ * */ -#include "action-executor.h" -#include "cmd.h" -#include "health-sessiond.h" -#include "lttng-sessiond.h" -#include "notification-thread-internal.h" -#include "session.h" -#include "thread.h" -#include -#include -#include -#include -#include +#include "action-executor.hpp" +#include "cmd.hpp" +#include "health-sessiond.hpp" +#include "lttng-sessiond.hpp" +#include "notification-thread-internal.hpp" +#include "session.hpp" +#include "thread.hpp" +#include +#include +#include +#include +#include #include -#include +#include #include #include #include #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/src/bin/lttng-sessiond/action-executor.h b/src/bin/lttng-sessiond/action-executor.hpp similarity index 100% rename from src/bin/lttng-sessiond/action-executor.h rename to src/bin/lttng-sessiond/action-executor.hpp diff --git a/src/bin/lttng-sessiond/agent-thread.cpp b/src/bin/lttng-sessiond/agent-thread.cpp index 5e158b49b..77470b3ee 100644 --- a/src/bin/lttng-sessiond/agent-thread.cpp +++ b/src/bin/lttng-sessiond/agent-thread.cpp @@ -7,20 +7,20 @@ #define _LGPL_SOURCE -#include -#include -#include -#include - -#include - -#include "fd-limit.h" -#include "agent-thread.h" -#include "agent.h" -#include "lttng-sessiond.h" -#include "session.h" -#include "utils.h" -#include "thread.h" +#include +#include +#include +#include + +#include + +#include "fd-limit.hpp" +#include "agent-thread.hpp" +#include "agent.hpp" +#include "lttng-sessiond.hpp" +#include "session.hpp" +#include "utils.hpp" +#include "thread.hpp" struct thread_notifiers { struct lttng_pipe *quit_pipe; diff --git a/src/bin/lttng-sessiond/agent-thread.h b/src/bin/lttng-sessiond/agent-thread.hpp similarity index 100% rename from src/bin/lttng-sessiond/agent-thread.h rename to src/bin/lttng-sessiond/agent-thread.hpp diff --git a/src/bin/lttng-sessiond/agent.cpp b/src/bin/lttng-sessiond/agent.cpp index b0ac94b13..ed8a8d126 100644 --- a/src/bin/lttng-sessiond/agent.cpp +++ b/src/bin/lttng-sessiond/agent.cpp @@ -11,24 +11,24 @@ #include #include -#include +#include #include #include #include #include #include -#include -#include +#include +#include -#include -#include +#include +#include -#include +#include -#include "agent.h" -#include "ust-app.h" -#include "utils.h" -#include "common/error.h" +#include "agent.hpp" +#include "ust-app.hpp" +#include "utils.hpp" +#include "common/error.hpp" typedef enum lttng_event_rule_status (*event_rule_logging_get_name_pattern)( const struct lttng_event_rule *rule, const char **pattern); diff --git a/src/bin/lttng-sessiond/agent.h b/src/bin/lttng-sessiond/agent.hpp similarity index 99% rename from src/bin/lttng-sessiond/agent.h rename to src/bin/lttng-sessiond/agent.hpp index b0a4fa863..2ad42c3f4 100644 --- a/src/bin/lttng-sessiond/agent.h +++ b/src/bin/lttng-sessiond/agent.hpp @@ -11,7 +11,7 @@ #include -#include +#include #include /* Agent protocol version that is verified during the agent registration. */ diff --git a/src/bin/lttng-sessiond/buffer-registry.cpp b/src/bin/lttng-sessiond/buffer-registry.cpp index 64e98333f..ca7830a38 100644 --- a/src/bin/lttng-sessiond/buffer-registry.cpp +++ b/src/bin/lttng-sessiond/buffer-registry.cpp @@ -8,15 +8,15 @@ #define _LGPL_SOURCE #include -#include -#include - -#include "buffer-registry.h" -#include "fd-limit.h" -#include "ust-consumer.h" -#include "lttng-ust-ctl.h" -#include "lttng-ust-error.h" -#include "utils.h" +#include +#include + +#include "buffer-registry.hpp" +#include "fd-limit.hpp" +#include "ust-consumer.hpp" +#include "lttng-ust-ctl.hpp" +#include "lttng-ust-error.hpp" +#include "utils.hpp" /* * Set in main.c during initialization process of the daemon. This contains diff --git a/src/bin/lttng-sessiond/buffer-registry.h b/src/bin/lttng-sessiond/buffer-registry.hpp similarity index 97% rename from src/bin/lttng-sessiond/buffer-registry.h rename to src/bin/lttng-sessiond/buffer-registry.hpp index 440493d47..a06be6010 100644 --- a/src/bin/lttng-sessiond/buffer-registry.h +++ b/src/bin/lttng-sessiond/buffer-registry.hpp @@ -12,11 +12,11 @@ #include #include -#include +#include -#include "consumer.h" -#include "lttng-ust-ctl.h" -#include "ust-registry.h" +#include "consumer.hpp" +#include "lttng-ust-ctl.hpp" +#include "ust-registry.hpp" struct buffer_reg_stream { struct cds_list_head lnode; diff --git a/src/bin/lttng-sessiond/channel.cpp b/src/bin/lttng-sessiond/channel.cpp index c5b944d61..e3bb232fa 100644 --- a/src/bin/lttng-sessiond/channel.cpp +++ b/src/bin/lttng-sessiond/channel.cpp @@ -11,18 +11,18 @@ #include #include -#include -#include -#include - -#include "channel.h" -#include "lttng-sessiond.h" -#include "kernel.h" -#include "lttng-ust-ctl.h" -#include "lttng-ust-error.h" -#include "utils.h" -#include "ust-app.h" -#include "agent.h" +#include +#include +#include + +#include "channel.hpp" +#include "lttng-sessiond.hpp" +#include "kernel.hpp" +#include "lttng-ust-ctl.hpp" +#include "lttng-ust-error.hpp" +#include "utils.hpp" +#include "ust-app.hpp" +#include "agent.hpp" /* * Return allocated channel attributes. diff --git a/src/bin/lttng-sessiond/channel.h b/src/bin/lttng-sessiond/channel.hpp similarity index 95% rename from src/bin/lttng-sessiond/channel.h rename to src/bin/lttng-sessiond/channel.hpp index fcc4d6b63..342e30f78 100644 --- a/src/bin/lttng-sessiond/channel.h +++ b/src/bin/lttng-sessiond/channel.hpp @@ -10,8 +10,8 @@ #include -#include "trace-kernel.h" -#include "trace-ust.h" +#include "trace-kernel.hpp" +#include "trace-ust.hpp" int channel_kernel_disable(struct ltt_kernel_session *ksession, char *channel_name); diff --git a/src/bin/lttng-sessiond/clear.cpp b/src/bin/lttng-sessiond/clear.cpp index a0817c2da..fcac76ffa 100644 --- a/src/bin/lttng-sessiond/clear.cpp +++ b/src/bin/lttng-sessiond/clear.cpp @@ -10,15 +10,15 @@ #include #include -#include -#include -#include - -#include "clear.h" -#include "session.h" -#include "ust-app.h" -#include "kernel.h" -#include "cmd.h" +#include +#include +#include + +#include "clear.hpp" +#include "session.hpp" +#include "ust-app.hpp" +#include "kernel.hpp" +#include "cmd.hpp" struct cmd_clear_session_reply_context { int reply_sock_fd; diff --git a/src/bin/lttng-sessiond/clear.h b/src/bin/lttng-sessiond/clear.hpp similarity index 91% rename from src/bin/lttng-sessiond/clear.h rename to src/bin/lttng-sessiond/clear.hpp index e788ec7bb..aca20d35a 100644 --- a/src/bin/lttng-sessiond/clear.h +++ b/src/bin/lttng-sessiond/clear.hpp @@ -8,7 +8,7 @@ #ifndef CLEAR_H #define CLEAR_H -#include "session.h" +#include "session.hpp" int cmd_clear_session(struct ltt_session *session, int *sock_fd); diff --git a/src/bin/lttng-sessiond/client.cpp b/src/bin/lttng-sessiond/client.cpp index 4c1f6954b..cf3fd4424 100644 --- a/src/bin/lttng-sessiond/client.cpp +++ b/src/bin/lttng-sessiond/client.cpp @@ -7,25 +7,25 @@ * */ -#include "common/buffer-view.h" -#include "common/compat/socket.h" -#include "common/dynamic-array.h" -#include "common/dynamic-buffer.h" -#include "common/fd-handle.h" -#include "common/payload-view.h" -#include "common/payload.h" -#include "common/sessiond-comm/sessiond-comm.h" +#include "common/buffer-view.hpp" +#include "common/compat/socket.hpp" +#include "common/dynamic-array.hpp" +#include "common/dynamic-buffer.hpp" +#include "common/fd-handle.hpp" +#include "common/payload-view.hpp" +#include "common/payload.hpp" +#include "common/sessiond-comm/sessiond-comm.hpp" #include "lttng/lttng-error.h" #include "lttng/tracker.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -33,17 +33,17 @@ #include #include -#include "agent-thread.h" -#include "clear.h" -#include "client.h" -#include "cmd.h" -#include "health-sessiond.h" -#include "kernel.h" -#include "lttng-sessiond.h" -#include "manage-consumer.h" -#include "save.h" -#include "testpoint.h" -#include "utils.h" +#include "agent-thread.hpp" +#include "clear.hpp" +#include "client.hpp" +#include "cmd.hpp" +#include "health-sessiond.hpp" +#include "kernel.hpp" +#include "lttng-sessiond.hpp" +#include "manage-consumer.hpp" +#include "save.hpp" +#include "testpoint.hpp" +#include "utils.hpp" static bool is_root; diff --git a/src/bin/lttng-sessiond/client.h b/src/bin/lttng-sessiond/client.hpp similarity index 94% rename from src/bin/lttng-sessiond/client.h rename to src/bin/lttng-sessiond/client.hpp index 0610d4509..49a454dfb 100644 --- a/src/bin/lttng-sessiond/client.h +++ b/src/bin/lttng-sessiond/client.hpp @@ -10,7 +10,7 @@ #ifndef CLIENT_SESSIOND_H #define CLIENT_SESSIOND_H -#include "thread.h" +#include "thread.hpp" struct lttng_thread *launch_client_thread(void); diff --git a/src/bin/lttng-sessiond/cmd.cpp b/src/bin/lttng-sessiond/cmd.cpp index 3ed56f7b0..47c049b31 100644 --- a/src/bin/lttng-sessiond/cmd.cpp +++ b/src/bin/lttng-sessiond/cmd.cpp @@ -15,53 +15,61 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include #include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "agent-thread.h" -#include "agent.h" -#include "buffer-registry.h" -#include "channel.h" -#include "cmd.h" -#include "consumer.h" -#include "event-notifier-error-accounting.h" -#include "event.h" -#include "health-sessiond.h" -#include "kernel-consumer.h" -#include "kernel.h" -#include "lttng-sessiond.h" -#include "lttng-syscall.h" -#include "notification-thread-commands.h" -#include "notification-thread.h" -#include "rotate.h" -#include "rotation-thread.h" -#include "session.h" -#include "timer.h" -#include "tracker.h" -#include "utils.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "agent-thread.hpp" +#include "agent.hpp" +#include "buffer-registry.hpp" +#include "channel.hpp" +#include "cmd.hpp" +#include "consumer.hpp" +#include "event-notifier-error-accounting.hpp" +#include "event.hpp" +#include "health-sessiond.hpp" +#include "kernel-consumer.hpp" +#include "kernel.hpp" +#include "lttng-sessiond.hpp" +#include "lttng-syscall.hpp" +#include "notification-thread-commands.hpp" +#include "notification-thread.hpp" +#include "rotate.hpp" +#include "rotation-thread.hpp" +#include "session.hpp" +#include "timer.hpp" +#include "tracker.hpp" +#include "utils.hpp" /* Sleep for 100ms between each check for the shm path's deletion. */ #define SESSION_DESTROY_SHM_PATH_CHECK_DELAY_US 100000 diff --git a/src/bin/lttng-sessiond/cmd.h b/src/bin/lttng-sessiond/cmd.hpp similarity index 98% rename from src/bin/lttng-sessiond/cmd.h rename to src/bin/lttng-sessiond/cmd.hpp index 13d540e25..8727e741b 100644 --- a/src/bin/lttng-sessiond/cmd.h +++ b/src/bin/lttng-sessiond/cmd.hpp @@ -8,11 +8,11 @@ #ifndef CMD_H #define CMD_H -#include "context.h" -#include "lttng-sessiond.h" +#include "context.hpp" +#include "lttng-sessiond.hpp" #include "lttng/tracker.h" -#include "session.h" -#include +#include "session.hpp" +#include struct notification_thread_handle; struct lttng_dynamic_buffer; diff --git a/src/bin/lttng-sessiond/condition-internal.cpp b/src/bin/lttng-sessiond/condition-internal.cpp index dd9c244b3..7daa53625 100644 --- a/src/bin/lttng-sessiond/condition-internal.cpp +++ b/src/bin/lttng-sessiond/condition-internal.cpp @@ -5,19 +5,19 @@ * */ -#include -#include +#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include -#include "condition-internal.h" +#include +#include +#include "condition-internal.hpp" static unsigned long lttng_condition_buffer_usage_hash( diff --git a/src/bin/lttng-sessiond/condition-internal.h b/src/bin/lttng-sessiond/condition-internal.hpp similarity index 100% rename from src/bin/lttng-sessiond/condition-internal.h rename to src/bin/lttng-sessiond/condition-internal.hpp diff --git a/src/bin/lttng-sessiond/consumer.cpp b/src/bin/lttng-sessiond/consumer.cpp index f76dffa7e..238da0508 100644 --- a/src/bin/lttng-sessiond/consumer.cpp +++ b/src/bin/lttng-sessiond/consumer.cpp @@ -15,17 +15,17 @@ #include #include -#include -#include -#include -#include -#include - -#include "consumer.h" -#include "health-sessiond.h" -#include "ust-app.h" -#include "utils.h" -#include "lttng-sessiond.h" +#include +#include +#include +#include +#include + +#include "consumer.hpp" +#include "health-sessiond.hpp" +#include "ust-app.hpp" +#include "utils.hpp" +#include "lttng-sessiond.hpp" /* * Return allocated full pathname of the session using the consumer trace path diff --git a/src/bin/lttng-sessiond/consumer.h b/src/bin/lttng-sessiond/consumer.hpp similarity index 99% rename from src/bin/lttng-sessiond/consumer.h rename to src/bin/lttng-sessiond/consumer.hpp index a179206fc..15e2a2fc7 100644 --- a/src/bin/lttng-sessiond/consumer.h +++ b/src/bin/lttng-sessiond/consumer.hpp @@ -8,13 +8,13 @@ #ifndef _CONSUMER_H #define _CONSUMER_H -#include -#include +#include +#include #include #include #include -#include "snapshot.h" +#include "snapshot.hpp" struct snapshot; struct snapshot_output; diff --git a/src/bin/lttng-sessiond/context.cpp b/src/bin/lttng-sessiond/context.cpp index 1f1fcb3c2..8dc82fbe8 100644 --- a/src/bin/lttng-sessiond/context.cpp +++ b/src/bin/lttng-sessiond/context.cpp @@ -13,14 +13,14 @@ #include #include -#include -#include - -#include "context.h" -#include "kernel.h" -#include "ust-app.h" -#include "trace-ust.h" -#include "agent.h" +#include +#include + +#include "context.hpp" +#include "kernel.hpp" +#include "ust-app.hpp" +#include "trace-ust.hpp" +#include "agent.hpp" /* * Add kernel context to all channel. diff --git a/src/bin/lttng-sessiond/context.h b/src/bin/lttng-sessiond/context.hpp similarity index 85% rename from src/bin/lttng-sessiond/context.h rename to src/bin/lttng-sessiond/context.hpp index 073a2e178..a55f57116 100644 --- a/src/bin/lttng-sessiond/context.h +++ b/src/bin/lttng-sessiond/context.hpp @@ -10,9 +10,9 @@ #include -#include "trace-kernel.h" -#include "trace-ust.h" -#include "lttng-ust-ctl.h" +#include "trace-kernel.hpp" +#include "trace-ust.hpp" +#include "lttng-ust-ctl.hpp" int context_kernel_add(struct ltt_kernel_session *ksession, const struct lttng_event_context *ctx, diff --git a/src/bin/lttng-sessiond/dispatch.cpp b/src/bin/lttng-sessiond/dispatch.cpp index 6cbb26126..7988f1ba8 100644 --- a/src/bin/lttng-sessiond/dispatch.cpp +++ b/src/bin/lttng-sessiond/dispatch.cpp @@ -10,16 +10,16 @@ #include #include #include -#include -#include - -#include "dispatch.h" -#include "ust-app.h" -#include "testpoint.h" -#include "fd-limit.h" -#include "health-sessiond.h" -#include "lttng-sessiond.h" -#include "thread.h" +#include +#include + +#include "dispatch.hpp" +#include "ust-app.hpp" +#include "testpoint.hpp" +#include "fd-limit.hpp" +#include "health-sessiond.hpp" +#include "lttng-sessiond.hpp" +#include "thread.hpp" struct thread_notifiers { struct ust_cmd_queue *ust_cmd_queue; diff --git a/src/bin/lttng-sessiond/dispatch.h b/src/bin/lttng-sessiond/dispatch.hpp similarity index 94% rename from src/bin/lttng-sessiond/dispatch.h rename to src/bin/lttng-sessiond/dispatch.hpp index 7c8790e46..d5ec8c9c3 100644 --- a/src/bin/lttng-sessiond/dispatch.h +++ b/src/bin/lttng-sessiond/dispatch.hpp @@ -11,7 +11,7 @@ #define SESSIOND_UST_DISPATCH_THREAD_H #include -#include "lttng-sessiond.h" +#include "lttng-sessiond.hpp" bool launch_ust_dispatch_thread(struct ust_cmd_queue *cmd_queue, int apps_cmd_pipe_write_fd, diff --git a/src/bin/lttng-sessiond/event-notifier-error-accounting.cpp b/src/bin/lttng-sessiond/event-notifier-error-accounting.cpp index 138d51b4d..10d69493b 100644 --- a/src/bin/lttng-sessiond/event-notifier-error-accounting.cpp +++ b/src/bin/lttng-sessiond/event-notifier-error-accounting.cpp @@ -12,16 +12,16 @@ #include #include -#include -#include -#include -#include -#include -#include - -#include "event-notifier-error-accounting.h" -#include "lttng-ust-error.h" -#include "ust-app.h" +#include +#include +#include +#include +#include +#include + +#include "event-notifier-error-accounting.hpp" +#include "lttng-ust-error.hpp" +#include "ust-app.hpp" #define ERROR_COUNTER_INDEX_HT_INITIAL_SIZE 16 diff --git a/src/bin/lttng-sessiond/event-notifier-error-accounting.h b/src/bin/lttng-sessiond/event-notifier-error-accounting.hpp similarity index 99% rename from src/bin/lttng-sessiond/event-notifier-error-accounting.h rename to src/bin/lttng-sessiond/event-notifier-error-accounting.hpp index 440b9d091..89466bd44 100644 --- a/src/bin/lttng-sessiond/event-notifier-error-accounting.h +++ b/src/bin/lttng-sessiond/event-notifier-error-accounting.hpp @@ -12,7 +12,7 @@ #include -#include "ust-app.h" +#include "ust-app.hpp" enum event_notifier_error_accounting_status { EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK, diff --git a/src/bin/lttng-sessiond/event.cpp b/src/bin/lttng-sessiond/event.cpp index 924df3af1..797219dff 100644 --- a/src/bin/lttng-sessiond/event.cpp +++ b/src/bin/lttng-sessiond/event.cpp @@ -10,29 +10,29 @@ #include #include -#include +#include #include #include #include #include -#include -#include -#include -#include -#include -#include - -#include "channel.h" -#include "event.h" -#include "kernel.h" -#include "lttng-sessiond.h" -#include "lttng-ust-ctl.h" -#include "lttng-ust-error.h" -#include "ust-app.h" -#include "trace-kernel.h" -#include "trace-ust.h" -#include "agent.h" -#include "utils.h" +#include +#include +#include +#include +#include +#include + +#include "channel.hpp" +#include "event.hpp" +#include "kernel.hpp" +#include "lttng-sessiond.hpp" +#include "lttng-ust-ctl.hpp" +#include "lttng-ust-error.hpp" +#include "ust-app.hpp" +#include "trace-kernel.hpp" +#include "trace-ust.hpp" +#include "agent.hpp" +#include "utils.hpp" /* * Add unique UST event based on the event name, filter bytecode and loglevel. diff --git a/src/bin/lttng-sessiond/event.h b/src/bin/lttng-sessiond/event.hpp similarity index 98% rename from src/bin/lttng-sessiond/event.h rename to src/bin/lttng-sessiond/event.hpp index 01be565b4..efc4ad5d0 100644 --- a/src/bin/lttng-sessiond/event.h +++ b/src/bin/lttng-sessiond/event.hpp @@ -8,7 +8,7 @@ #ifndef _LTT_EVENT_H #define _LTT_EVENT_H -#include "trace-kernel.h" +#include "trace-kernel.hpp" struct agent; diff --git a/src/bin/lttng-sessiond/fd-limit.cpp b/src/bin/lttng-sessiond/fd-limit.cpp index 684332e9f..ac5c83f4b 100644 --- a/src/bin/lttng-sessiond/fd-limit.cpp +++ b/src/bin/lttng-sessiond/fd-limit.cpp @@ -10,9 +10,9 @@ #include #include #include -#include "fd-limit.h" -#include -#include +#include "fd-limit.hpp" +#include +#include /* total count of fd. */ static long fd_count; diff --git a/src/bin/lttng-sessiond/fd-limit.h b/src/bin/lttng-sessiond/fd-limit.hpp similarity index 100% rename from src/bin/lttng-sessiond/fd-limit.h rename to src/bin/lttng-sessiond/fd-limit.hpp diff --git a/src/bin/lttng-sessiond/globals.cpp b/src/bin/lttng-sessiond/globals.cpp index d07478316..c8710d62a 100644 --- a/src/bin/lttng-sessiond/globals.cpp +++ b/src/bin/lttng-sessiond/globals.cpp @@ -7,8 +7,8 @@ * */ -#include "lttng-sessiond.h" -#include +#include "lttng-sessiond.hpp" +#include lttng_uuid the_sessiond_uuid; diff --git a/src/bin/lttng-sessiond/health-sessiond.h b/src/bin/lttng-sessiond/health-sessiond.hpp similarity index 95% rename from src/bin/lttng-sessiond/health-sessiond.h rename to src/bin/lttng-sessiond/health-sessiond.hpp index 163676aae..52f38e2d8 100644 --- a/src/bin/lttng-sessiond/health-sessiond.h +++ b/src/bin/lttng-sessiond/health-sessiond.hpp @@ -8,7 +8,7 @@ * */ -#include +#include #include enum health_type_sessiond { diff --git a/src/bin/lttng-sessiond/health.cpp b/src/bin/lttng-sessiond/health.cpp index 53b9ee01f..a7f4bdcbb 100644 --- a/src/bin/lttng-sessiond/health.cpp +++ b/src/bin/lttng-sessiond/health.cpp @@ -6,16 +6,16 @@ * */ -#include "lttng-sessiond.h" -#include "health-sessiond.h" -#include -#include -#include -#include +#include "lttng-sessiond.hpp" +#include "health-sessiond.hpp" +#include +#include +#include +#include #include #include -#include "utils.h" -#include "thread.h" +#include "utils.hpp" +#include "thread.hpp" struct thread_notifiers { struct lttng_pipe *quit_pipe; diff --git a/src/bin/lttng-sessiond/kern-modules.h b/src/bin/lttng-sessiond/kern-modules.hpp similarity index 100% rename from src/bin/lttng-sessiond/kern-modules.h rename to src/bin/lttng-sessiond/kern-modules.hpp diff --git a/src/bin/lttng-sessiond/kernel-consumer.cpp b/src/bin/lttng-sessiond/kernel-consumer.cpp index d224b4cb7..844f53541 100644 --- a/src/bin/lttng-sessiond/kernel-consumer.cpp +++ b/src/bin/lttng-sessiond/kernel-consumer.cpp @@ -12,16 +12,16 @@ #include #include -#include -#include -#include - -#include "consumer.h" -#include "health-sessiond.h" -#include "kernel-consumer.h" -#include "notification-thread-commands.h" -#include "session.h" -#include "lttng-sessiond.h" +#include +#include +#include + +#include "consumer.hpp" +#include "health-sessiond.hpp" +#include "kernel-consumer.hpp" +#include "notification-thread-commands.hpp" +#include "session.hpp" +#include "lttng-sessiond.hpp" static char *create_channel_path(struct consumer_output *consumer, size_t *consumer_path_offset) diff --git a/src/bin/lttng-sessiond/kernel-consumer.h b/src/bin/lttng-sessiond/kernel-consumer.hpp similarity index 91% rename from src/bin/lttng-sessiond/kernel-consumer.h rename to src/bin/lttng-sessiond/kernel-consumer.hpp index 31771703e..276312e6c 100644 --- a/src/bin/lttng-sessiond/kernel-consumer.h +++ b/src/bin/lttng-sessiond/kernel-consumer.hpp @@ -7,9 +7,9 @@ #include -#include +#include -#include "trace-kernel.h" +#include "trace-kernel.hpp" int kernel_consumer_send_channel_streams(struct consumer_socket *sock, struct ltt_kernel_channel *channel, struct ltt_kernel_session *session, diff --git a/src/bin/lttng-sessiond/kernel.cpp b/src/bin/lttng-sessiond/kernel.cpp index c4662af0d..9d256e207 100644 --- a/src/bin/lttng-sessiond/kernel.cpp +++ b/src/bin/lttng-sessiond/kernel.cpp @@ -14,40 +14,40 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include +#include #include -#include +#include #include -#include -#include - -#include "event-notifier-error-accounting.h" -#include "lttng-sessiond.h" -#include "lttng-syscall.h" -#include "condition-internal.h" -#include "consumer.h" -#include "kernel.h" -#include "kernel-consumer.h" -#include "kern-modules.h" -#include "sessiond-config.h" -#include "utils.h" -#include "rotate.h" -#include "modprobe.h" -#include "tracker.h" -#include "notification-thread-commands.h" +#include +#include + +#include "event-notifier-error-accounting.hpp" +#include "lttng-sessiond.hpp" +#include "lttng-syscall.hpp" +#include "condition-internal.hpp" +#include "consumer.hpp" +#include "kernel.hpp" +#include "kernel-consumer.hpp" +#include "kern-modules.hpp" +#include "sessiond-config.hpp" +#include "utils.hpp" +#include "rotate.hpp" +#include "modprobe.hpp" +#include "tracker.hpp" +#include "notification-thread-commands.hpp" /* * Key used to reference a channel between the sessiond and the consumer. This diff --git a/src/bin/lttng-sessiond/kernel.h b/src/bin/lttng-sessiond/kernel.hpp similarity index 98% rename from src/bin/lttng-sessiond/kernel.h rename to src/bin/lttng-sessiond/kernel.hpp index 4eb788d5c..bb0165121 100644 --- a/src/bin/lttng-sessiond/kernel.h +++ b/src/bin/lttng-sessiond/kernel.hpp @@ -10,9 +10,9 @@ #include "lttng/lttng-error.h" #include "lttng/tracker.h" -#include "session.h" -#include "snapshot.h" -#include "trace-kernel.h" +#include "session.hpp" +#include "snapshot.hpp" +#include "trace-kernel.hpp" /* * Default size for the event list when kernel_list_events is called. This size diff --git a/src/bin/lttng-sessiond/lttng-sessiond.h b/src/bin/lttng-sessiond/lttng-sessiond.hpp similarity index 93% rename from src/bin/lttng-sessiond/lttng-sessiond.h rename to src/bin/lttng-sessiond/lttng-sessiond.hpp index 5dad32fc9..fa4601d69 100644 --- a/src/bin/lttng-sessiond/lttng-sessiond.h +++ b/src/bin/lttng-sessiond/lttng-sessiond.hpp @@ -12,16 +12,16 @@ #include #include -#include -#include -#include -#include -#include - -#include "session.h" -#include "ust-app.h" -#include "notification-thread.h" -#include "sessiond-config.h" +#include +#include +#include +#include +#include + +#include "session.hpp" +#include "ust-app.hpp" +#include "notification-thread.hpp" +#include "sessiond-config.hpp" /* * Consumer daemon state which is changed when spawning it, killing it or in diff --git a/src/bin/lttng-sessiond/lttng-syscall.cpp b/src/bin/lttng-sessiond/lttng-syscall.cpp index 42e902b5e..d7f6327ae 100644 --- a/src/bin/lttng-sessiond/lttng-syscall.cpp +++ b/src/bin/lttng-sessiond/lttng-syscall.cpp @@ -8,13 +8,13 @@ #define _LGPL_SOURCE #include -#include -#include +#include +#include -#include "lttng-sessiond.h" -#include "kernel.h" -#include "lttng-syscall.h" -#include "utils.h" +#include "lttng-sessiond.hpp" +#include "kernel.hpp" +#include "lttng-syscall.hpp" +#include "utils.hpp" /* Global syscall table. */ struct syscall *syscall_table; diff --git a/src/bin/lttng-sessiond/lttng-syscall.h b/src/bin/lttng-sessiond/lttng-syscall.hpp similarity index 93% rename from src/bin/lttng-sessiond/lttng-syscall.h rename to src/bin/lttng-sessiond/lttng-syscall.hpp index fa77c7083..78691f95d 100644 --- a/src/bin/lttng-sessiond/lttng-syscall.h +++ b/src/bin/lttng-sessiond/lttng-syscall.hpp @@ -8,10 +8,10 @@ #ifndef LTTNG_SYSCALL_H #define LTTNG_SYSCALL_H -#include +#include #include -#include "trace-kernel.h" +#include "trace-kernel.hpp" /* * Default size of the kernel system call array. With this size, we usually diff --git a/src/bin/lttng-sessiond/lttng-ust-abi.h b/src/bin/lttng-sessiond/lttng-ust-abi.hpp similarity index 92% rename from src/bin/lttng-sessiond/lttng-ust-abi.h rename to src/bin/lttng-sessiond/lttng-ust-abi.hpp index e2b8cf919..faf232190 100644 --- a/src/bin/lttng-sessiond/lttng-ust-abi.h +++ b/src/bin/lttng-sessiond/lttng-ust-abi.hpp @@ -12,7 +12,7 @@ #include #else /* HAVE_LIBLTTNG_UST_CTL */ /* Use local copy of the LTTng-UST header. */ -#include "ust-abi-internal.h" +#include "ust-abi-internal.hpp" #endif /* HAVE_LIBLTTNG_UST_CTL */ #endif /* LTTNG_UST_ABI_H */ diff --git a/src/bin/lttng-sessiond/lttng-ust-ctl.h b/src/bin/lttng-sessiond/lttng-ust-ctl.hpp similarity index 92% rename from src/bin/lttng-sessiond/lttng-ust-ctl.h rename to src/bin/lttng-sessiond/lttng-ust-ctl.hpp index 7e5713be2..dcd6bf640 100644 --- a/src/bin/lttng-sessiond/lttng-ust-ctl.h +++ b/src/bin/lttng-sessiond/lttng-ust-ctl.hpp @@ -12,7 +12,7 @@ #include #else /* HAVE_LIBLTTNG_UST_CTL */ /* Use local copy of the LTTng-UST header. */ -#include "ust-ctl-internal.h" +#include "ust-ctl-internal.hpp" #endif /* HAVE_LIBLTTNG_UST_CTL */ #endif /* LTTNG_UST_CTL_H */ diff --git a/src/bin/lttng-sessiond/lttng-ust-error.h b/src/bin/lttng-sessiond/lttng-ust-error.hpp similarity index 91% rename from src/bin/lttng-sessiond/lttng-ust-error.h rename to src/bin/lttng-sessiond/lttng-ust-error.hpp index 326383b9f..173908e4d 100644 --- a/src/bin/lttng-sessiond/lttng-ust-error.h +++ b/src/bin/lttng-sessiond/lttng-ust-error.hpp @@ -12,7 +12,7 @@ #include #else /* HAVE_LIBLTTNG_UST_CTL */ /* Use local copy of the LTTng-UST header. */ -#include "ust-error-internal.h" +#include "ust-error-internal.hpp" #endif /* HAVE_LIBLTTNG_UST_CTL */ #endif /* LTTNG_UST_ERROR_H */ diff --git a/src/bin/lttng-sessiond/main.cpp b/src/bin/lttng-sessiond/main.cpp index 34e881c4d..cf7aa9e9e 100644 --- a/src/bin/lttng-sessiond/main.cpp +++ b/src/bin/lttng-sessiond/main.cpp @@ -29,54 +29,53 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "lttng-sessiond.h" -#include "buffer-registry.h" -#include "channel.h" -#include "cmd.h" -#include "consumer.h" -#include "context.h" -#include "event.h" -#include "event-notifier-error-accounting.h" -#include "kernel.h" -#include "kernel-consumer.h" -#include "lttng-ust-ctl.h" -#include "ust-consumer.h" -#include "utils.h" -#include "fd-limit.h" -#include "health-sessiond.h" -#include "testpoint.h" -#include "notify-apps.h" -#include "agent-thread.h" -#include "save.h" -#include "notification-thread.h" -#include "notification-thread-commands.h" -#include "rotation-thread.h" -#include "agent.h" -#include "sessiond-config.h" -#include "timer.h" -#include "thread.h" -#include "client.h" -#include "dispatch.h" -#include "register.h" -#include "manage-apps.h" -#include "manage-kernel.h" -#include "modprobe.h" -#include "ust-sigbus.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "lttng-sessiond.hpp" +#include "buffer-registry.hpp" +#include "channel.hpp" +#include "cmd.hpp" +#include "consumer.hpp" +#include "context.hpp" +#include "event.hpp" +#include "event-notifier-error-accounting.hpp" +#include "kernel.hpp" +#include "kernel-consumer.hpp" +#include "lttng-ust-ctl.hpp" +#include "ust-consumer.hpp" +#include "utils.hpp" +#include "fd-limit.hpp" +#include "health-sessiond.hpp" +#include "testpoint.hpp" +#include "notify-apps.hpp" +#include "agent-thread.hpp" +#include "save.hpp" +#include "notification-thread.hpp" +#include "notification-thread-commands.hpp" +#include "rotation-thread.hpp" +#include "agent.hpp" +#include "sessiond-config.hpp" +#include "timer.hpp" +#include "thread.hpp" +#include "client.hpp" +#include "dispatch.hpp" +#include "register.hpp" +#include "manage-apps.hpp" +#include "manage-kernel.hpp" +#include "modprobe.hpp" +#include "ust-sigbus.hpp" static const char *help_msg = #ifdef LTTNG_EMBED_HELP diff --git a/src/bin/lttng-sessiond/manage-apps.cpp b/src/bin/lttng-sessiond/manage-apps.cpp index 588e83b6c..4ee3538b2 100644 --- a/src/bin/lttng-sessiond/manage-apps.cpp +++ b/src/bin/lttng-sessiond/manage-apps.cpp @@ -7,11 +7,11 @@ * */ -#include "manage-apps.h" -#include "testpoint.h" -#include "health-sessiond.h" -#include "utils.h" -#include "thread.h" +#include "manage-apps.hpp" +#include "testpoint.hpp" +#include "health-sessiond.hpp" +#include "utils.hpp" +#include "thread.hpp" struct thread_notifiers { struct lttng_pipe *quit_pipe; diff --git a/src/bin/lttng-sessiond/manage-apps.h b/src/bin/lttng-sessiond/manage-apps.hpp similarity index 94% rename from src/bin/lttng-sessiond/manage-apps.h rename to src/bin/lttng-sessiond/manage-apps.hpp index 3cd3b9c33..a865d9a8f 100644 --- a/src/bin/lttng-sessiond/manage-apps.h +++ b/src/bin/lttng-sessiond/manage-apps.hpp @@ -11,7 +11,7 @@ #define SESSIOND_APPLICATION_MANAGEMENT_THREAD_H #include -#include "lttng-sessiond.h" +#include "lttng-sessiond.hpp" bool launch_application_management_thread(int apps_cmd_pipe_read_fd); diff --git a/src/bin/lttng-sessiond/manage-consumer.cpp b/src/bin/lttng-sessiond/manage-consumer.cpp index cce48526e..4a3e3b4ab 100644 --- a/src/bin/lttng-sessiond/manage-consumer.cpp +++ b/src/bin/lttng-sessiond/manage-consumer.cpp @@ -9,15 +9,15 @@ #include -#include -#include - -#include "manage-consumer.h" -#include "testpoint.h" -#include "health-sessiond.h" -#include "utils.h" -#include "thread.h" -#include "ust-consumer.h" +#include +#include + +#include "manage-consumer.hpp" +#include "testpoint.hpp" +#include "health-sessiond.hpp" +#include "utils.hpp" +#include "thread.hpp" +#include "ust-consumer.hpp" struct thread_notifiers { struct lttng_pipe *quit_pipe; diff --git a/src/bin/lttng-sessiond/manage-consumer.h b/src/bin/lttng-sessiond/manage-consumer.hpp similarity index 94% rename from src/bin/lttng-sessiond/manage-consumer.h rename to src/bin/lttng-sessiond/manage-consumer.hpp index 16eb62dd9..9e35a9051 100644 --- a/src/bin/lttng-sessiond/manage-consumer.h +++ b/src/bin/lttng-sessiond/manage-consumer.hpp @@ -11,7 +11,7 @@ #define SESSIOND_CONSUMER_MANAGEMENT_THREAD_H #include -#include "lttng-sessiond.h" +#include "lttng-sessiond.hpp" bool launch_consumer_management_thread(struct consumer_data *consumer_data); diff --git a/src/bin/lttng-sessiond/manage-kernel.cpp b/src/bin/lttng-sessiond/manage-kernel.cpp index a789a0b29..a5d21b0fe 100644 --- a/src/bin/lttng-sessiond/manage-kernel.cpp +++ b/src/bin/lttng-sessiond/manage-kernel.cpp @@ -7,16 +7,16 @@ * */ -#include -#include - -#include "manage-kernel.h" -#include "testpoint.h" -#include "health-sessiond.h" -#include "utils.h" -#include "thread.h" -#include "kernel.h" -#include "kernel-consumer.h" +#include +#include + +#include "manage-kernel.hpp" +#include "testpoint.hpp" +#include "health-sessiond.hpp" +#include "utils.hpp" +#include "thread.hpp" +#include "kernel.hpp" +#include "kernel-consumer.hpp" struct thread_notifiers { struct lttng_pipe *quit_pipe; diff --git a/src/bin/lttng-sessiond/manage-kernel.h b/src/bin/lttng-sessiond/manage-kernel.hpp similarity index 93% rename from src/bin/lttng-sessiond/manage-kernel.h rename to src/bin/lttng-sessiond/manage-kernel.hpp index 3be665811..fe0d8b013 100644 --- a/src/bin/lttng-sessiond/manage-kernel.h +++ b/src/bin/lttng-sessiond/manage-kernel.hpp @@ -11,7 +11,7 @@ #define SESSIOND_KERNEL_MANAGEMENT_THREAD_H #include -#include "lttng-sessiond.h" +#include "lttng-sessiond.hpp" bool launch_kernel_management_thread(int kernel_poll_pipe_read_fd); diff --git a/src/bin/lttng-sessiond/modprobe.cpp b/src/bin/lttng-sessiond/modprobe.cpp index 782dcc6b2..0dc123de1 100644 --- a/src/bin/lttng-sessiond/modprobe.cpp +++ b/src/bin/lttng-sessiond/modprobe.cpp @@ -18,12 +18,12 @@ #include #include -#include -#include +#include +#include -#include "modprobe.h" -#include "kern-modules.h" -#include "lttng-sessiond.h" +#include "modprobe.hpp" +#include "kern-modules.hpp" +#include "lttng-sessiond.hpp" /* LTTng kernel tracer mandatory core modules list */ struct kern_modules_param kern_modules_control_core[] = { diff --git a/src/bin/lttng-sessiond/modprobe.h b/src/bin/lttng-sessiond/modprobe.hpp similarity index 100% rename from src/bin/lttng-sessiond/modprobe.h rename to src/bin/lttng-sessiond/modprobe.hpp diff --git a/src/bin/lttng-sessiond/notification-thread-commands.cpp b/src/bin/lttng-sessiond/notification-thread-commands.cpp index 600951159..ce499eb1c 100644 --- a/src/bin/lttng-sessiond/notification-thread-commands.cpp +++ b/src/bin/lttng-sessiond/notification-thread-commands.cpp @@ -7,9 +7,9 @@ #include #include -#include "notification-thread.h" -#include "notification-thread-commands.h" -#include +#include "notification-thread.hpp" +#include "notification-thread-commands.hpp" +#include #include #include #include diff --git a/src/bin/lttng-sessiond/notification-thread-commands.h b/src/bin/lttng-sessiond/notification-thread-commands.hpp similarity index 97% rename from src/bin/lttng-sessiond/notification-thread-commands.h rename to src/bin/lttng-sessiond/notification-thread-commands.hpp index 643b0e602..98b0abcee 100644 --- a/src/bin/lttng-sessiond/notification-thread-commands.h +++ b/src/bin/lttng-sessiond/notification-thread-commands.hpp @@ -11,10 +11,10 @@ #include #include #include -#include "notification-thread.h" -#include "notification-thread-internal.h" -#include "notification-thread-events.h" -#include +#include "notification-thread.hpp" +#include "notification-thread-internal.hpp" +#include "notification-thread-events.hpp" +#include #include struct notification_thread_data; diff --git a/src/bin/lttng-sessiond/notification-thread-events.cpp b/src/bin/lttng-sessiond/notification-thread-events.cpp index 9e1aa5300..67fca2a35 100644 --- a/src/bin/lttng-sessiond/notification-thread-events.cpp +++ b/src/bin/lttng-sessiond/notification-thread-events.cpp @@ -6,46 +6,46 @@ */ #include "lttng/action/action.h" -#include "lttng/trigger/trigger-internal.h" +#include "lttng/trigger/trigger-internal.hpp" #define _LGPL_SOURCE #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include "condition-internal.h" -#include "event-notifier-error-accounting.h" -#include "notification-thread.h" -#include "notification-thread-events.h" -#include "notification-thread-commands.h" -#include "lttng-sessiond.h" -#include "kernel.h" +#include "condition-internal.hpp" +#include "event-notifier-error-accounting.hpp" +#include "notification-thread.hpp" +#include "notification-thread-events.hpp" +#include "notification-thread-commands.hpp" +#include "lttng-sessiond.hpp" +#include "kernel.hpp" #define CLIENT_POLL_MASK_IN (LPOLLIN | LPOLLERR | LPOLLHUP | LPOLLRDHUP) #define CLIENT_POLL_MASK_IN_OUT (CLIENT_POLL_MASK_IN | LPOLLOUT) diff --git a/src/bin/lttng-sessiond/notification-thread-events.h b/src/bin/lttng-sessiond/notification-thread-events.hpp similarity index 97% rename from src/bin/lttng-sessiond/notification-thread-events.h rename to src/bin/lttng-sessiond/notification-thread-events.hpp index 265719181..50abad916 100644 --- a/src/bin/lttng-sessiond/notification-thread-events.h +++ b/src/bin/lttng-sessiond/notification-thread-events.hpp @@ -9,7 +9,7 @@ #define NOTIFICATION_THREAD_EVENTS_H #include -#include "notification-thread.h" +#include "notification-thread.hpp" /** * Event handling function shall only return an error if diff --git a/src/bin/lttng-sessiond/notification-thread-internal.h b/src/bin/lttng-sessiond/notification-thread-internal.hpp similarity index 97% rename from src/bin/lttng-sessiond/notification-thread-internal.h rename to src/bin/lttng-sessiond/notification-thread-internal.hpp index 9e7059acf..497484ba0 100644 --- a/src/bin/lttng-sessiond/notification-thread-internal.h +++ b/src/bin/lttng-sessiond/notification-thread-internal.hpp @@ -8,17 +8,17 @@ #ifndef NOTIFICATION_THREAD_INTERNAL_H #define NOTIFICATION_THREAD_INTERNAL_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include #include #include -#include "notification-thread.h" +#include "notification-thread.hpp" struct lttng_evaluation; struct notification_thread_handle; diff --git a/src/bin/lttng-sessiond/notification-thread.cpp b/src/bin/lttng-sessiond/notification-thread.cpp index 867fc7c04..74e37902d 100644 --- a/src/bin/lttng-sessiond/notification-thread.cpp +++ b/src/bin/lttng-sessiond/notification-thread.cpp @@ -7,30 +7,30 @@ #define _LGPL_SOURCE #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include "notification-thread.h" -#include "notification-thread-events.h" -#include "notification-thread-commands.h" -#include "lttng-sessiond.h" -#include "health-sessiond.h" -#include "thread.h" -#include "testpoint.h" +#include "notification-thread.hpp" +#include "notification-thread-events.hpp" +#include "notification-thread-commands.hpp" +#include "lttng-sessiond.hpp" +#include "health-sessiond.hpp" +#include "thread.hpp" +#include "testpoint.hpp" -#include "kernel.h" -#include +#include "kernel.hpp" +#include #include #include diff --git a/src/bin/lttng-sessiond/notification-thread.h b/src/bin/lttng-sessiond/notification-thread.hpp similarity index 98% rename from src/bin/lttng-sessiond/notification-thread.h rename to src/bin/lttng-sessiond/notification-thread.hpp index 8b4c7af2b..3444af9c0 100644 --- a/src/bin/lttng-sessiond/notification-thread.h +++ b/src/bin/lttng-sessiond/notification-thread.hpp @@ -8,11 +8,11 @@ #ifndef NOTIFICATION_THREAD_H #define NOTIFICATION_THREAD_H -#include "action-executor.h" -#include "thread.h" -#include -#include -#include +#include "action-executor.hpp" +#include "thread.hpp" +#include +#include +#include #include #include #include diff --git a/src/bin/lttng-sessiond/notify-apps.cpp b/src/bin/lttng-sessiond/notify-apps.cpp index 0e799ff26..8e238e5c1 100644 --- a/src/bin/lttng-sessiond/notify-apps.cpp +++ b/src/bin/lttng-sessiond/notify-apps.cpp @@ -7,16 +7,16 @@ #define _LGPL_SOURCE -#include -#include - -#include "fd-limit.h" -#include "lttng-sessiond.h" -#include "notify-apps.h" -#include "health-sessiond.h" -#include "testpoint.h" -#include "utils.h" -#include "thread.h" +#include +#include + +#include "fd-limit.hpp" +#include "lttng-sessiond.hpp" +#include "notify-apps.hpp" +#include "health-sessiond.hpp" +#include "testpoint.hpp" +#include "utils.hpp" +#include "thread.hpp" struct thread_notifiers { struct lttng_pipe *quit_pipe; diff --git a/src/bin/lttng-sessiond/notify-apps.h b/src/bin/lttng-sessiond/notify-apps.hpp similarity index 100% rename from src/bin/lttng-sessiond/notify-apps.h rename to src/bin/lttng-sessiond/notify-apps.hpp diff --git a/src/bin/lttng-sessiond/process-utils.cpp b/src/bin/lttng-sessiond/process-utils.cpp index d2e52172e..a3122da75 100644 --- a/src/bin/lttng-sessiond/process-utils.cpp +++ b/src/bin/lttng-sessiond/process-utils.cpp @@ -8,7 +8,7 @@ */ #include -#include "lttng-sessiond.h" +#include "lttng-sessiond.hpp" /* Notify parents that we are ready for cmd and health check */ void sessiond_signal_parents(void) diff --git a/src/bin/lttng-sessiond/register.cpp b/src/bin/lttng-sessiond/register.cpp index a20db57f6..36a29d863 100644 --- a/src/bin/lttng-sessiond/register.cpp +++ b/src/bin/lttng-sessiond/register.cpp @@ -10,19 +10,19 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include "register.h" -#include "lttng-sessiond.h" -#include "testpoint.h" -#include "health-sessiond.h" -#include "fd-limit.h" -#include "utils.h" -#include "thread.h" +#include "register.hpp" +#include "lttng-sessiond.hpp" +#include "testpoint.hpp" +#include "health-sessiond.hpp" +#include "fd-limit.hpp" +#include "utils.hpp" +#include "thread.hpp" struct thread_state { struct lttng_pipe *quit_pipe; diff --git a/src/bin/lttng-sessiond/register.h b/src/bin/lttng-sessiond/register.hpp similarity index 94% rename from src/bin/lttng-sessiond/register.h rename to src/bin/lttng-sessiond/register.hpp index 8b51ad48e..ef82a2ca2 100644 --- a/src/bin/lttng-sessiond/register.h +++ b/src/bin/lttng-sessiond/register.hpp @@ -11,7 +11,7 @@ #define SESSIOND_APPLICATION_REGISTRATION_THREAD_H #include -#include "lttng-sessiond.h" +#include "lttng-sessiond.hpp" struct lttng_thread *launch_application_registration_thread( struct ust_cmd_queue *cmd_queue); diff --git a/src/bin/lttng-sessiond/rotate.cpp b/src/bin/lttng-sessiond/rotate.cpp index cdf95f353..51fc5e8aa 100644 --- a/src/bin/lttng-sessiond/rotate.cpp +++ b/src/bin/lttng-sessiond/rotate.cpp @@ -8,32 +8,32 @@ #define _LGPL_SOURCE #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include -#include - -#include "session.h" -#include "rotate.h" -#include "rotation-thread.h" -#include "lttng-sessiond.h" -#include "health-sessiond.h" -#include "cmd.h" -#include "utils.h" -#include "notification-thread-commands.h" +#include +#include + +#include "session.hpp" +#include "rotate.hpp" +#include "rotation-thread.hpp" +#include "lttng-sessiond.hpp" +#include "health-sessiond.hpp" +#include "cmd.hpp" +#include "utils.hpp" +#include "notification-thread-commands.hpp" #include #include diff --git a/src/bin/lttng-sessiond/rotate.h b/src/bin/lttng-sessiond/rotate.hpp similarity index 95% rename from src/bin/lttng-sessiond/rotate.h rename to src/bin/lttng-sessiond/rotate.hpp index a2adaf0d6..965a8c76c 100644 --- a/src/bin/lttng-sessiond/rotate.h +++ b/src/bin/lttng-sessiond/rotate.hpp @@ -9,7 +9,7 @@ #ifndef ROTATE_H #define ROTATE_H -#include "rotation-thread.h" +#include "rotation-thread.hpp" #include /* diff --git a/src/bin/lttng-sessiond/rotation-thread.cpp b/src/bin/lttng-sessiond/rotation-thread.cpp index 9c873aec5..2f89fbc64 100644 --- a/src/bin/lttng-sessiond/rotation-thread.cpp +++ b/src/bin/lttng-sessiond/rotation-thread.cpp @@ -8,35 +8,35 @@ #define _LGPL_SOURCE #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include -#include -#include - -#include "rotation-thread.h" -#include "lttng-sessiond.h" -#include "health-sessiond.h" -#include "rotate.h" -#include "cmd.h" -#include "session.h" -#include "timer.h" -#include "notification-thread-commands.h" -#include "utils.h" -#include "thread.h" +#include +#include +#include +#include +#include + +#include "rotation-thread.hpp" +#include "lttng-sessiond.hpp" +#include "health-sessiond.hpp" +#include "rotate.hpp" +#include "cmd.hpp" +#include "session.hpp" +#include "timer.hpp" +#include "notification-thread-commands.hpp" +#include "utils.hpp" +#include "thread.hpp" #include #include diff --git a/src/bin/lttng-sessiond/rotation-thread.h b/src/bin/lttng-sessiond/rotation-thread.hpp similarity index 89% rename from src/bin/lttng-sessiond/rotation-thread.h rename to src/bin/lttng-sessiond/rotation-thread.hpp index 27ef3954e..d2bbf2966 100644 --- a/src/bin/lttng-sessiond/rotation-thread.h +++ b/src/bin/lttng-sessiond/rotation-thread.hpp @@ -13,13 +13,13 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include -#include "session.h" -#include "notification-thread.h" +#include "session.hpp" +#include "notification-thread.hpp" extern struct lttng_notification_channel *rotate_notification_channel; diff --git a/src/bin/lttng-sessiond/save.cpp b/src/bin/lttng-sessiond/save.cpp index 2055e867d..16b270514 100644 --- a/src/bin/lttng-sessiond/save.cpp +++ b/src/bin/lttng-sessiond/save.cpp @@ -11,19 +11,19 @@ #include #include -#include -#include -#include -#include -#include -#include - -#include "kernel.h" -#include "save.h" -#include "session.h" -#include "lttng-syscall.h" -#include "trace-ust.h" -#include "agent.h" +#include +#include +#include +#include +#include +#include + +#include "kernel.hpp" +#include "save.hpp" +#include "session.hpp" +#include "lttng-syscall.hpp" +#include "trace-ust.hpp" +#include "agent.hpp" /* Return LTTNG_OK on success else a LTTNG_ERR* code. */ static diff --git a/src/bin/lttng-sessiond/save.h b/src/bin/lttng-sessiond/save.hpp similarity index 89% rename from src/bin/lttng-sessiond/save.h rename to src/bin/lttng-sessiond/save.hpp index a39a12a84..367b41c17 100644 --- a/src/bin/lttng-sessiond/save.h +++ b/src/bin/lttng-sessiond/save.hpp @@ -9,7 +9,7 @@ #define SAVE_H #include -#include +#include int cmd_save_sessions(struct lttng_save_session_attr *attr, lttng_sock_cred *creds); diff --git a/src/bin/lttng-sessiond/session.cpp b/src/bin/lttng-sessiond/session.cpp index 14de5468c..bcab0147d 100644 --- a/src/bin/lttng-sessiond/session.cpp +++ b/src/bin/lttng-sessiond/session.cpp @@ -17,19 +17,19 @@ #include #include -#include -#include -#include -#include -#include -#include "lttng-sessiond.h" -#include "kernel.h" - -#include "session.h" -#include "utils.h" -#include "trace-ust.h" -#include "timer.h" -#include "cmd.h" +#include +#include +#include +#include +#include +#include "lttng-sessiond.hpp" +#include "kernel.hpp" + +#include "session.hpp" +#include "utils.hpp" +#include "trace-ust.hpp" +#include "timer.hpp" +#include "cmd.hpp" struct ltt_session_destroy_notifier_element { ltt_session_destroy_notifier notifier; diff --git a/src/bin/lttng-sessiond/session.h b/src/bin/lttng-sessiond/session.hpp similarity index 98% rename from src/bin/lttng-sessiond/session.h rename to src/bin/lttng-sessiond/session.hpp index 1a68d8e2f..85450b66a 100644 --- a/src/bin/lttng-sessiond/session.h +++ b/src/bin/lttng-sessiond/session.hpp @@ -12,15 +12,15 @@ #include #include -#include -#include +#include +#include #include #include #include -#include "snapshot.h" -#include "trace-kernel.h" -#include "consumer.h" +#include "snapshot.hpp" +#include "trace-kernel.hpp" +#include "consumer.hpp" struct ltt_ust_session; diff --git a/src/bin/lttng-sessiond/sessiond-config.cpp b/src/bin/lttng-sessiond/sessiond-config.cpp index 228d9c16b..8ebb2a07c 100644 --- a/src/bin/lttng-sessiond/sessiond-config.cpp +++ b/src/bin/lttng-sessiond/sessiond-config.cpp @@ -5,17 +5,17 @@ * */ -#include "version.h" -#include "sessiond-config.h" -#include "lttng-ust-ctl.h" -#include +#include "version.hpp" +#include "sessiond-config.hpp" +#include "lttng-ust-ctl.hpp" +#include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include static struct sessiond_config sessiond_config_build_defaults = { diff --git a/src/bin/lttng-sessiond/sessiond-config.h b/src/bin/lttng-sessiond/sessiond-config.hpp similarity index 98% rename from src/bin/lttng-sessiond/sessiond-config.h rename to src/bin/lttng-sessiond/sessiond-config.hpp index 136ca95b8..fa0bfeb82 100644 --- a/src/bin/lttng-sessiond/sessiond-config.h +++ b/src/bin/lttng-sessiond/sessiond-config.hpp @@ -8,7 +8,7 @@ #ifndef LTTNG_SESSIOND_CONFIG_H #define LTTNG_SESSIOND_CONFIG_H -#include +#include #include struct config_string { diff --git a/src/bin/lttng-sessiond/snapshot.cpp b/src/bin/lttng-sessiond/snapshot.cpp index 727dc5db8..f7821da95 100644 --- a/src/bin/lttng-sessiond/snapshot.cpp +++ b/src/bin/lttng-sessiond/snapshot.cpp @@ -10,10 +10,10 @@ #include #include -#include +#include -#include "snapshot.h" -#include "utils.h" +#include "snapshot.hpp" +#include "utils.hpp" /* * Return the atomically incremented value of next_output_id. diff --git a/src/bin/lttng-sessiond/snapshot.h b/src/bin/lttng-sessiond/snapshot.hpp similarity index 94% rename from src/bin/lttng-sessiond/snapshot.h rename to src/bin/lttng-sessiond/snapshot.hpp index 027b098c0..6aa06ddc6 100644 --- a/src/bin/lttng-sessiond/snapshot.h +++ b/src/bin/lttng-sessiond/snapshot.hpp @@ -11,11 +11,11 @@ #include #include -#include -#include -#include +#include +#include +#include -#include "consumer.h" +#include "consumer.hpp" struct consumer_output; struct ltt_session; diff --git a/src/bin/lttng-sessiond/testpoint.h b/src/bin/lttng-sessiond/testpoint.hpp similarity index 95% rename from src/bin/lttng-sessiond/testpoint.h rename to src/bin/lttng-sessiond/testpoint.hpp index 6c35d29fc..f50d9f82b 100644 --- a/src/bin/lttng-sessiond/testpoint.h +++ b/src/bin/lttng-sessiond/testpoint.hpp @@ -8,7 +8,7 @@ #ifndef SESSIOND_TESTPOINT_H #define SESSIOND_TESTPOINT_H -#include +#include /* Testpoints, internal use only */ TESTPOINT_DECL(sessiond_thread_manage_clients); diff --git a/src/bin/lttng-sessiond/thread-utils.cpp b/src/bin/lttng-sessiond/thread-utils.cpp index 2d8f8b789..e28106e78 100644 --- a/src/bin/lttng-sessiond/thread-utils.cpp +++ b/src/bin/lttng-sessiond/thread-utils.cpp @@ -7,9 +7,9 @@ * */ -#include "lttng-sessiond.h" -#include "utils.h" -#include +#include "lttng-sessiond.hpp" +#include "utils.hpp" +#include #include /* diff --git a/src/bin/lttng-sessiond/thread.cpp b/src/bin/lttng-sessiond/thread.cpp index 446a8c9d2..9ce539b81 100644 --- a/src/bin/lttng-sessiond/thread.cpp +++ b/src/bin/lttng-sessiond/thread.cpp @@ -5,13 +5,13 @@ * */ -#include "thread.h" +#include "thread.hpp" #include #include #include -#include -#include -#include +#include +#include +#include static struct thread_list { struct cds_list_head head; diff --git a/src/bin/lttng-sessiond/thread.h b/src/bin/lttng-sessiond/thread.hpp similarity index 100% rename from src/bin/lttng-sessiond/thread.h rename to src/bin/lttng-sessiond/thread.hpp diff --git a/src/bin/lttng-sessiond/timer.cpp b/src/bin/lttng-sessiond/timer.cpp index 9635dea81..4e8b8026b 100644 --- a/src/bin/lttng-sessiond/timer.cpp +++ b/src/bin/lttng-sessiond/timer.cpp @@ -10,10 +10,10 @@ #include #include -#include "timer.h" -#include "health-sessiond.h" -#include "rotation-thread.h" -#include "thread.h" +#include "timer.hpp" +#include "health-sessiond.hpp" +#include "rotation-thread.hpp" +#include "thread.hpp" #define LTTNG_SESSIOND_SIG_QS SIGRTMIN + 10 #define LTTNG_SESSIOND_SIG_EXIT SIGRTMIN + 11 diff --git a/src/bin/lttng-sessiond/timer.h b/src/bin/lttng-sessiond/timer.hpp similarity index 97% rename from src/bin/lttng-sessiond/timer.h rename to src/bin/lttng-sessiond/timer.hpp index c95879484..f746f0ed9 100644 --- a/src/bin/lttng-sessiond/timer.h +++ b/src/bin/lttng-sessiond/timer.hpp @@ -12,7 +12,7 @@ #include #include -#include "session.h" +#include "session.hpp" struct timer_thread_parameters { struct rotation_thread_timer_queue *rotation_thread_job_queue; diff --git a/src/bin/lttng-sessiond/trace-kernel.cpp b/src/bin/lttng-sessiond/trace-kernel.cpp index 1a1620aaa..846630482 100644 --- a/src/bin/lttng-sessiond/trace-kernel.cpp +++ b/src/bin/lttng-sessiond/trace-kernel.cpp @@ -15,26 +15,26 @@ #include #include #include -#include +#include #include -#include +#include #include -#include +#include #include -#include +#include #include -#include +#include #include -#include -#include -#include -#include -#include - -#include "consumer.h" -#include "trace-kernel.h" -#include "lttng-sessiond.h" -#include "notification-thread-commands.h" +#include +#include +#include +#include +#include + +#include "consumer.hpp" +#include "trace-kernel.hpp" +#include "lttng-sessiond.hpp" +#include "notification-thread-commands.hpp" /* * Find the channel name for the given kernel session. diff --git a/src/bin/lttng-sessiond/trace-kernel.h b/src/bin/lttng-sessiond/trace-kernel.hpp similarity index 97% rename from src/bin/lttng-sessiond/trace-kernel.h rename to src/bin/lttng-sessiond/trace-kernel.hpp index 83608b235..50a58667e 100644 --- a/src/bin/lttng-sessiond/trace-kernel.h +++ b/src/bin/lttng-sessiond/trace-kernel.hpp @@ -11,12 +11,12 @@ #include #include -#include -#include -#include +#include +#include +#include -#include "consumer.h" -#include "tracker.h" +#include "consumer.hpp" +#include "tracker.hpp" /* Kernel event list */ struct ltt_kernel_event_list { diff --git a/src/bin/lttng-sessiond/trace-ust.cpp b/src/bin/lttng-sessiond/trace-ust.cpp index f3303efd7..285ff0811 100644 --- a/src/bin/lttng-sessiond/trace-ust.cpp +++ b/src/bin/lttng-sessiond/trace-ust.cpp @@ -13,16 +13,16 @@ #include #include -#include -#include -#include -#include - -#include "buffer-registry.h" -#include "trace-ust.h" -#include "utils.h" -#include "ust-app.h" -#include "agent.h" +#include +#include +#include +#include + +#include "buffer-registry.hpp" +#include "trace-ust.hpp" +#include "utils.hpp" +#include "ust-app.hpp" +#include "agent.hpp" /* * Match function for the events hash table lookup. diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.hpp similarity index 98% rename from src/bin/lttng-sessiond/trace-ust.h rename to src/bin/lttng-sessiond/trace-ust.hpp index d4df48d18..99995373a 100644 --- a/src/bin/lttng-sessiond/trace-ust.h +++ b/src/bin/lttng-sessiond/trace-ust.hpp @@ -12,13 +12,13 @@ #include #include -#include -#include -#include +#include +#include +#include #include -#include "consumer.h" -#include "lttng-ust-ctl.h" +#include "consumer.hpp" +#include "lttng-ust-ctl.hpp" struct agent; diff --git a/src/bin/lttng-sessiond/tracker.cpp b/src/bin/lttng-sessiond/tracker.cpp index 1cae40350..204ade426 100644 --- a/src/bin/lttng-sessiond/tracker.cpp +++ b/src/bin/lttng-sessiond/tracker.cpp @@ -7,8 +7,8 @@ */ #include "lttng/tracker.h" -#include "common/dynamic-array.h" -#include "common/macros.h" +#include "common/dynamic-array.hpp" +#include "common/macros.hpp" #define _LGPL_SOURCE #include #include @@ -18,12 +18,12 @@ #include #include -#include "tracker.h" -#include -#include -#include -#include -#include +#include "tracker.hpp" +#include +#include +#include +#include +#include #include struct process_attr_tracker_value_node { diff --git a/src/bin/lttng-sessiond/tracker.h b/src/bin/lttng-sessiond/tracker.hpp similarity index 97% rename from src/bin/lttng-sessiond/tracker.h rename to src/bin/lttng-sessiond/tracker.hpp index a45a250bb..c3f6b9694 100644 --- a/src/bin/lttng-sessiond/tracker.h +++ b/src/bin/lttng-sessiond/tracker.hpp @@ -9,7 +9,7 @@ #ifndef _LTT_TRACKER_H #define _LTT_TRACKER_H -#include +#include #include struct process_attr_tracker; diff --git a/src/bin/lttng-sessiond/trigger-error-query.cpp b/src/bin/lttng-sessiond/trigger-error-query.cpp index 5bf612890..63941a8ab 100644 --- a/src/bin/lttng-sessiond/trigger-error-query.cpp +++ b/src/bin/lttng-sessiond/trigger-error-query.cpp @@ -5,10 +5,10 @@ * */ -#include "event-notifier-error-accounting.h" -#include -#include -#include +#include "event-notifier-error-accounting.hpp" +#include +#include +#include enum lttng_trigger_status lttng_trigger_add_error_results( const struct lttng_trigger *trigger __attribute__((unused)), diff --git a/src/bin/lttng-sessiond/ust-abi-internal.h b/src/bin/lttng-sessiond/ust-abi-internal.hpp similarity index 99% rename from src/bin/lttng-sessiond/ust-abi-internal.h rename to src/bin/lttng-sessiond/ust-abi-internal.hpp index 652e4760f..343be56b9 100644 --- a/src/bin/lttng-sessiond/ust-abi-internal.h +++ b/src/bin/lttng-sessiond/ust-abi-internal.hpp @@ -13,7 +13,7 @@ #define LTTNG_UST_ABI_INTERNAL_H #include -#include +#include #ifndef LTTNG_PACKED #error "LTTNG_PACKED should be defined" diff --git a/src/bin/lttng-sessiond/ust-app.cpp b/src/bin/lttng-sessiond/ust-app.cpp index 1006f7f64..5cffdc974 100644 --- a/src/bin/lttng-sessiond/ust-app.cpp +++ b/src/bin/lttng-sessiond/ust-app.cpp @@ -21,35 +21,35 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include #include #include -#include +#include #include -#include -#include - -#include "buffer-registry.h" -#include "condition-internal.h" -#include "fd-limit.h" -#include "health-sessiond.h" -#include "ust-app.h" -#include "ust-consumer.h" -#include "lttng-ust-ctl.h" -#include "lttng-ust-error.h" -#include "utils.h" -#include "session.h" -#include "lttng-sessiond.h" -#include "notification-thread-commands.h" -#include "rotate.h" -#include "event.h" -#include "event-notifier-error-accounting.h" -#include "ust-field-utils.h" +#include +#include + +#include "buffer-registry.hpp" +#include "condition-internal.hpp" +#include "fd-limit.hpp" +#include "health-sessiond.hpp" +#include "ust-app.hpp" +#include "ust-consumer.hpp" +#include "lttng-ust-ctl.hpp" +#include "lttng-ust-error.hpp" +#include "utils.hpp" +#include "session.hpp" +#include "lttng-sessiond.hpp" +#include "notification-thread-commands.hpp" +#include "rotate.hpp" +#include "event.hpp" +#include "event-notifier-error-accounting.hpp" +#include "ust-field-utils.hpp" struct lttng_ht *ust_app_ht; struct lttng_ht *ust_app_ht_by_sock; diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.hpp similarity index 99% rename from src/bin/lttng-sessiond/ust-app.h rename to src/bin/lttng-sessiond/ust-app.hpp index 8ad9085ff..88a923eb0 100644 --- a/src/bin/lttng-sessiond/ust-app.h +++ b/src/bin/lttng-sessiond/ust-app.hpp @@ -11,12 +11,12 @@ #include -#include -#include +#include +#include -#include "trace-ust.h" -#include "ust-registry.h" -#include "session.h" +#include "trace-ust.hpp" +#include "ust-registry.hpp" +#include "session.hpp" #define UST_APP_EVENT_LIST_SIZE 32 diff --git a/src/bin/lttng-sessiond/ust-clock.h b/src/bin/lttng-sessiond/ust-clock.hpp similarity index 96% rename from src/bin/lttng-sessiond/ust-clock.h rename to src/bin/lttng-sessiond/ust-clock.hpp index 91cbbe628..3807f40a3 100644 --- a/src/bin/lttng-sessiond/ust-clock.h +++ b/src/bin/lttng-sessiond/ust-clock.hpp @@ -9,7 +9,7 @@ #ifndef _UST_CLOCK_H #define _UST_CLOCK_H -#include +#include #include #include #include @@ -18,7 +18,7 @@ #include #include -#include +#include static __inline__ uint64_t trace_clock_read64(void) diff --git a/src/bin/lttng-sessiond/ust-consumer.cpp b/src/bin/lttng-sessiond/ust-consumer.cpp index df9bb013a..86b96a9bd 100644 --- a/src/bin/lttng-sessiond/ust-consumer.cpp +++ b/src/bin/lttng-sessiond/ust-consumer.cpp @@ -12,18 +12,18 @@ #include #include -#include -#include -#include -#include - -#include "consumer.h" -#include "health-sessiond.h" -#include "ust-consumer.h" -#include "lttng-ust-error.h" -#include "buffer-registry.h" -#include "session.h" -#include "lttng-sessiond.h" +#include +#include +#include +#include + +#include "consumer.hpp" +#include "health-sessiond.hpp" +#include "ust-consumer.hpp" +#include "lttng-ust-error.hpp" +#include "buffer-registry.hpp" +#include "session.hpp" +#include "lttng-sessiond.hpp" /* * Send a single channel to the consumer using command ASK_CHANNEL_CREATION. diff --git a/src/bin/lttng-sessiond/ust-consumer.h b/src/bin/lttng-sessiond/ust-consumer.hpp similarity index 93% rename from src/bin/lttng-sessiond/ust-consumer.h rename to src/bin/lttng-sessiond/ust-consumer.hpp index 63d8eb25c..840913766 100644 --- a/src/bin/lttng-sessiond/ust-consumer.h +++ b/src/bin/lttng-sessiond/ust-consumer.hpp @@ -8,10 +8,10 @@ #ifndef _UST_CONSUMER_H #define _UST_CONSUMER_H -#include "consumer.h" -#include "ust-app.h" +#include "consumer.hpp" +#include "ust-app.hpp" #include -#include +#include int ust_consumer_ask_channel(struct ust_app_session *ua_sess, struct ust_app_channel *ua_chan, diff --git a/src/bin/lttng-sessiond/ust-ctl-internal.h b/src/bin/lttng-sessiond/ust-ctl-internal.hpp similarity index 99% rename from src/bin/lttng-sessiond/ust-ctl-internal.h rename to src/bin/lttng-sessiond/ust-ctl-internal.hpp index 6bd21d8c6..aee3cd580 100644 --- a/src/bin/lttng-sessiond/ust-ctl-internal.h +++ b/src/bin/lttng-sessiond/ust-ctl-internal.hpp @@ -12,7 +12,7 @@ #include #include -#include "lttng-ust-abi.h" +#include "lttng-ust-abi.hpp" #ifndef LTTNG_UST_UUID_LEN #define LTTNG_UST_UUID_LEN 16 diff --git a/src/bin/lttng-sessiond/ust-error-internal.h b/src/bin/lttng-sessiond/ust-error-internal.hpp similarity index 97% rename from src/bin/lttng-sessiond/ust-error-internal.h rename to src/bin/lttng-sessiond/ust-error-internal.hpp index a5f345faa..1cf05f2e3 100644 --- a/src/bin/lttng-sessiond/ust-error-internal.h +++ b/src/bin/lttng-sessiond/ust-error-internal.hpp @@ -17,7 +17,7 @@ #include #include -#include "lttng-ust-abi.h" +#include "lttng-ust-abi.hpp" /* * ustcomm error code. diff --git a/src/bin/lttng-sessiond/ust-field-utils.cpp b/src/bin/lttng-sessiond/ust-field-utils.cpp index a8f3da2ba..27d3070d2 100644 --- a/src/bin/lttng-sessiond/ust-field-utils.cpp +++ b/src/bin/lttng-sessiond/ust-field-utils.cpp @@ -8,7 +8,7 @@ #include #include -#include "ust-field-utils.h" +#include "ust-field-utils.hpp" /* * The lttng_ust_ctl_field is made of a combination of C basic types diff --git a/src/bin/lttng-sessiond/ust-field-utils.h b/src/bin/lttng-sessiond/ust-field-utils.hpp similarity index 96% rename from src/bin/lttng-sessiond/ust-field-utils.h rename to src/bin/lttng-sessiond/ust-field-utils.hpp index 39cd50b48..886ae5232 100644 --- a/src/bin/lttng-sessiond/ust-field-utils.h +++ b/src/bin/lttng-sessiond/ust-field-utils.hpp @@ -8,7 +8,7 @@ #ifndef LTTNG_UST_FIELD_UTILS_H #define LTTNG_UST_FIELD_UTILS_H -#include "lttng-ust-ctl.h" +#include "lttng-ust-ctl.hpp" /* * Compare two UST fields. diff --git a/src/bin/lttng-sessiond/ust-metadata.cpp b/src/bin/lttng-sessiond/ust-metadata.cpp index 7e6b1aba0..f5c5e7a21 100644 --- a/src/bin/lttng-sessiond/ust-metadata.cpp +++ b/src/bin/lttng-sessiond/ust-metadata.cpp @@ -13,12 +13,12 @@ #include #include #include -#include -#include +#include +#include -#include "ust-registry.h" -#include "ust-clock.h" -#include "ust-app.h" +#include "ust-registry.hpp" +#include "ust-clock.hpp" +#include "ust-app.hpp" #ifndef max_t #define max_t(type, a, b) ((type) ((a) > (b) ? (a) : (b))) diff --git a/src/bin/lttng-sessiond/ust-registry.cpp b/src/bin/lttng-sessiond/ust-registry.cpp index 7de533675..effb31999 100644 --- a/src/bin/lttng-sessiond/ust-registry.cpp +++ b/src/bin/lttng-sessiond/ust-registry.cpp @@ -8,16 +8,16 @@ #define _LGPL_SOURCE #include -#include -#include +#include +#include #include -#include "ust-registry.h" -#include "ust-app.h" -#include "ust-field-utils.h" -#include "utils.h" -#include "lttng-sessiond.h" -#include "notification-thread-commands.h" +#include "ust-registry.hpp" +#include "ust-app.hpp" +#include "ust-field-utils.hpp" +#include "utils.hpp" +#include "lttng-sessiond.hpp" +#include "notification-thread-commands.hpp" /* * Hash table match function for event in the registry. diff --git a/src/bin/lttng-sessiond/ust-registry.h b/src/bin/lttng-sessiond/ust-registry.hpp similarity index 99% rename from src/bin/lttng-sessiond/ust-registry.h rename to src/bin/lttng-sessiond/ust-registry.hpp index b77b1d8ae..3bf439f23 100644 --- a/src/bin/lttng-sessiond/ust-registry.h +++ b/src/bin/lttng-sessiond/ust-registry.hpp @@ -11,10 +11,10 @@ #include #include -#include -#include +#include +#include -#include "lttng-ust-ctl.h" +#include "lttng-ust-ctl.hpp" #define CTF_SPEC_MAJOR 1 #define CTF_SPEC_MINOR 8 diff --git a/src/bin/lttng-sessiond/ust-sigbus.cpp b/src/bin/lttng-sessiond/ust-sigbus.cpp index 93a974eb3..cecaf4d58 100644 --- a/src/bin/lttng-sessiond/ust-sigbus.cpp +++ b/src/bin/lttng-sessiond/ust-sigbus.cpp @@ -8,7 +8,7 @@ #include #include #include -#include "ust-sigbus.h" +#include "ust-sigbus.hpp" LTTNG_EXPORT DEFINE_LTTNG_UST_SIGBUS_STATE(); diff --git a/src/bin/lttng-sessiond/ust-sigbus.h b/src/bin/lttng-sessiond/ust-sigbus.hpp similarity index 100% rename from src/bin/lttng-sessiond/ust-sigbus.h rename to src/bin/lttng-sessiond/ust-sigbus.hpp diff --git a/src/bin/lttng-sessiond/utils.cpp b/src/bin/lttng-sessiond/utils.cpp index 20b223288..f3446bc26 100644 --- a/src/bin/lttng-sessiond/utils.cpp +++ b/src/bin/lttng-sessiond/utils.cpp @@ -10,11 +10,11 @@ #include #include -#include +#include -#include "utils.h" -#include "snapshot.h" -#include "lttng-sessiond.h" +#include "utils.hpp" +#include "snapshot.hpp" +#include "lttng-sessiond.hpp" /* * Write to writable pipe used to notify a thread. diff --git a/src/bin/lttng-sessiond/utils.h b/src/bin/lttng-sessiond/utils.hpp similarity index 100% rename from src/bin/lttng-sessiond/utils.h rename to src/bin/lttng-sessiond/utils.hpp diff --git a/src/bin/lttng/Makefile.am b/src/bin/lttng/Makefile.am index 67bd92097..09c5171d8 100644 --- a/src/bin/lttng/Makefile.am +++ b/src/bin/lttng/Makefile.am @@ -10,7 +10,7 @@ AUTOMAKE_OPTIONS = subdir-objects bin_PROGRAMS = lttng -lttng_SOURCES = command.h conf.cpp conf.h commands/start.cpp \ +lttng_SOURCES = command.hpp conf.cpp conf.hpp commands/start.cpp \ commands/list.cpp commands/create.cpp commands/destroy.cpp \ commands/stop.cpp commands/enable_events.cpp \ commands/disable_events.cpp commands/enable_channels.cpp \ @@ -29,12 +29,12 @@ lttng_SOURCES = command.h conf.cpp conf.h commands/start.cpp \ commands/enable_rotation.cpp \ commands/disable_rotation.cpp \ commands/clear.cpp \ - loglevel.cpp loglevel.h \ + loglevel.cpp loglevel.hpp \ commands/add_trigger.cpp \ commands/list_triggers.cpp \ commands/remove_trigger.cpp \ - utils.cpp utils.h lttng.cpp \ - uprobe.cpp uprobe.h + utils.cpp utils.hpp lttng.cpp \ + uprobe.cpp uprobe.hpp lttng_CXXFLAGS = $(AM_CXXFLAGS) $(POPT_CFLAGS) diff --git a/src/bin/lttng/command.h b/src/bin/lttng/command.hpp similarity index 94% rename from src/bin/lttng/command.h rename to src/bin/lttng/command.hpp index d2e1eff15..c707267cd 100644 --- a/src/bin/lttng/command.h +++ b/src/bin/lttng/command.hpp @@ -9,11 +9,11 @@ #define _LTTNG_CMD_H #include -#include -#include +#include +#include -#include "conf.h" -#include "utils.h" +#include "conf.hpp" +#include "utils.hpp" #define DECL_COMMAND(_name) \ extern int cmd_##_name(int, const char **) diff --git a/src/bin/lttng/commands/add_context.cpp b/src/bin/lttng/commands/add_context.cpp index 4e4bb9fac..27d932c34 100644 --- a/src/bin/lttng/commands/add_context.cpp +++ b/src/bin/lttng/commands/add_context.cpp @@ -18,10 +18,10 @@ #include -#include -#include +#include +#include -#include "../command.h" +#include "../command.hpp" static char *opt_channel_name; static char *opt_session_name; diff --git a/src/bin/lttng/commands/add_trigger.cpp b/src/bin/lttng/commands/add_trigger.cpp index 82b2c0162..acaa50c7d 100644 --- a/src/bin/lttng/commands/add_trigger.cpp +++ b/src/bin/lttng/commands/add_trigger.cpp @@ -10,23 +10,23 @@ #include #include -#include "../command.h" -#include "../loglevel.h" -#include "../uprobe.h" +#include "../command.hpp" +#include "../loglevel.hpp" +#include "../uprobe.hpp" #include "common/argpar/argpar.h" -#include "common/argpar-utils/argpar-utils.h" -#include "common/dynamic-array.h" -#include "common/mi-lttng.h" -#include "common/string-utils/string-utils.h" -#include "common/utils.h" -#include +#include "common/argpar-utils/argpar-utils.hpp" +#include "common/dynamic-array.hpp" +#include "common/mi-lttng.hpp" +#include "common/string-utils/string-utils.hpp" +#include "common/utils.hpp" +#include /* For lttng_event_rule_type_str(). */ -#include +#include #include -#include "common/filter/filter-ast.h" -#include "common/filter/filter-ir.h" -#include "common/dynamic-array.h" +#include "common/filter/filter-ast.hpp" +#include "common/filter/filter-ir.hpp" +#include "common/dynamic-array.hpp" #if (LTTNG_SYMBOL_NAME_LEN == 256) #define LTTNG_SYMBOL_NAME_LEN_SCANF_IS_A_BROKEN_API "255" diff --git a/src/bin/lttng/commands/clear.cpp b/src/bin/lttng/commands/clear.cpp index 61879d61d..6c2399181 100644 --- a/src/bin/lttng/commands/clear.cpp +++ b/src/bin/lttng/commands/clear.cpp @@ -16,11 +16,11 @@ #include #include -#include "../command.h" +#include "../command.hpp" -#include -#include -#include +#include +#include +#include static int opt_clear_all; diff --git a/src/bin/lttng/commands/create.cpp b/src/bin/lttng/commands/create.cpp index 2385fd70e..c5c918ce9 100644 --- a/src/bin/lttng/commands/create.cpp +++ b/src/bin/lttng/commands/create.cpp @@ -14,21 +14,21 @@ #include #include #include -#include +#include #include #include #include -#include +#include -#include "../command.h" -#include "../utils.h" +#include "../command.hpp" +#include "../utils.hpp" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include static char *opt_output_path; diff --git a/src/bin/lttng/commands/destroy.cpp b/src/bin/lttng/commands/destroy.cpp index ed09b6509..3ab9b2248 100644 --- a/src/bin/lttng/commands/destroy.cpp +++ b/src/bin/lttng/commands/destroy.cpp @@ -16,11 +16,11 @@ #include #include -#include "../command.h" +#include "../command.hpp" -#include -#include -#include +#include +#include +#include static char *opt_session_name; static int opt_destroy_all; diff --git a/src/bin/lttng/commands/disable_channels.cpp b/src/bin/lttng/commands/disable_channels.cpp index 843fecd87..df9eb13fa 100644 --- a/src/bin/lttng/commands/disable_channels.cpp +++ b/src/bin/lttng/commands/disable_channels.cpp @@ -14,10 +14,10 @@ #include #include -#include -#include +#include +#include -#include "../command.h" +#include "../command.hpp" static char *opt_channels; static int opt_kernel; diff --git a/src/bin/lttng/commands/disable_events.cpp b/src/bin/lttng/commands/disable_events.cpp index b269f138c..d2948ac04 100644 --- a/src/bin/lttng/commands/disable_events.cpp +++ b/src/bin/lttng/commands/disable_events.cpp @@ -14,10 +14,10 @@ #include #include -#include -#include +#include +#include -#include "../command.h" +#include "../command.hpp" static char *opt_event_list; static int opt_kernel; diff --git a/src/bin/lttng/commands/disable_rotation.cpp b/src/bin/lttng/commands/disable_rotation.cpp index 8229f63e0..c2b6728ae 100644 --- a/src/bin/lttng/commands/disable_rotation.cpp +++ b/src/bin/lttng/commands/disable_rotation.cpp @@ -16,10 +16,10 @@ #include #include -#include -#include +#include +#include -#include "../command.h" +#include "../command.hpp" #include static char *opt_session_name; diff --git a/src/bin/lttng/commands/enable_channels.cpp b/src/bin/lttng/commands/enable_channels.cpp index d62aa8656..25327473f 100644 --- a/src/bin/lttng/commands/enable_channels.cpp +++ b/src/bin/lttng/commands/enable_channels.cpp @@ -16,14 +16,14 @@ #include #include -#include -#include -#include +#include +#include +#include -#include +#include -#include "../command.h" -#include "../utils.h" +#include "../command.hpp" +#include "../utils.hpp" static struct lttng_channel chan_opts; diff --git a/src/bin/lttng/commands/enable_events.cpp b/src/bin/lttng/commands/enable_events.cpp index a2db2cbc2..9d9a28ab8 100644 --- a/src/bin/lttng/commands/enable_events.cpp +++ b/src/bin/lttng/commands/enable_events.cpp @@ -15,21 +15,21 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* Mi dependancy */ -#include +#include -#include -#include +#include +#include -#include "../command.h" -#include "../loglevel.h" -#include "../uprobe.h" +#include "../command.hpp" +#include "../loglevel.hpp" +#include "../uprobe.hpp" #if (LTTNG_SYMBOL_NAME_LEN == 256) #define LTTNG_SYMBOL_NAME_LEN_SCANF_IS_A_BROKEN_API "255" diff --git a/src/bin/lttng/commands/enable_rotation.cpp b/src/bin/lttng/commands/enable_rotation.cpp index 1719f3ac2..223d47cca 100644 --- a/src/bin/lttng/commands/enable_rotation.cpp +++ b/src/bin/lttng/commands/enable_rotation.cpp @@ -16,11 +16,11 @@ #include #include -#include -#include -#include +#include +#include +#include -#include "../command.h" +#include "../command.hpp" #include static char *opt_session_name; diff --git a/src/bin/lttng/commands/help.cpp b/src/bin/lttng/commands/help.cpp index a9a01e7f1..74b649644 100644 --- a/src/bin/lttng/commands/help.cpp +++ b/src/bin/lttng/commands/help.cpp @@ -11,8 +11,8 @@ #include #include -#include "../command.h" -#include +#include "../command.hpp" +#include #ifdef LTTNG_EMBED_HELP static const char *help_msg = diff --git a/src/bin/lttng/commands/list.cpp b/src/bin/lttng/commands/list.cpp index 9046c4658..444a96b40 100644 --- a/src/bin/lttng/commands/list.cpp +++ b/src/bin/lttng/commands/list.cpp @@ -14,13 +14,13 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include "../command.h" +#include "../command.hpp" static int opt_userspace; static int opt_kernel; diff --git a/src/bin/lttng/commands/list_triggers.cpp b/src/bin/lttng/commands/list_triggers.cpp index e6860380f..e70758445 100644 --- a/src/bin/lttng/commands/list_triggers.cpp +++ b/src/bin/lttng/commands/list_triggers.cpp @@ -7,21 +7,21 @@ #include -#include "../command.h" +#include "../command.hpp" #include "common/argpar/argpar.h" -#include "common/argpar-utils/argpar-utils.h" -#include "common/dynamic-array.h" -#include "common/mi-lttng.h" +#include "common/argpar-utils/argpar-utils.hpp" +#include "common/dynamic-array.hpp" +#include "common/mi-lttng.hpp" /* For lttng_condition_type_str(). */ -#include "lttng/condition/condition-internal.h" +#include "lttng/condition/condition-internal.hpp" #include "lttng/condition/event-rule-matches.h" -#include "lttng/condition/event-rule-matches-internal.h" +#include "lttng/condition/event-rule-matches-internal.hpp" /* For lttng_domain_type_str(). */ -#include "lttng/domain-internal.h" +#include "lttng/domain-internal.hpp" /* For lttng_event_rule_kernel_syscall_emission_site_str() */ -#include "lttng/event-rule/kernel-syscall-internal.h" -#include "../loglevel.h" +#include "lttng/event-rule/kernel-syscall-internal.hpp" +#include "../loglevel.hpp" #include #ifdef LTTNG_EMBED_HELP diff --git a/src/bin/lttng/commands/load.cpp b/src/bin/lttng/commands/load.cpp index cdc390516..2ab005f2a 100644 --- a/src/bin/lttng/commands/load.cpp +++ b/src/bin/lttng/commands/load.cpp @@ -12,11 +12,11 @@ #include #include -#include -#include +#include +#include #include -#include "../command.h" +#include "../command.hpp" static char *the_opt_input_path; static char *the_opt_override_url; diff --git a/src/bin/lttng/commands/metadata.cpp b/src/bin/lttng/commands/metadata.cpp index 8f4d8df63..38e99b4a4 100644 --- a/src/bin/lttng/commands/metadata.cpp +++ b/src/bin/lttng/commands/metadata.cpp @@ -13,9 +13,9 @@ #include #include -#include +#include -#include "../command.h" +#include "../command.hpp" static char *opt_session_name; static char *session_name = NULL; diff --git a/src/bin/lttng/commands/regenerate.cpp b/src/bin/lttng/commands/regenerate.cpp index d25e883d5..936b7d7ca 100644 --- a/src/bin/lttng/commands/regenerate.cpp +++ b/src/bin/lttng/commands/regenerate.cpp @@ -13,9 +13,9 @@ #include #include -#include +#include -#include "../command.h" +#include "../command.hpp" static char *opt_session_name; static char *session_name = NULL; diff --git a/src/bin/lttng/commands/remove_trigger.cpp b/src/bin/lttng/commands/remove_trigger.cpp index a84b552df..65b5e79a9 100644 --- a/src/bin/lttng/commands/remove_trigger.cpp +++ b/src/bin/lttng/commands/remove_trigger.cpp @@ -5,10 +5,10 @@ * */ -#include "../command.h" +#include "../command.hpp" #include "common/argpar/argpar.h" -#include "common/argpar-utils/argpar-utils.h" -#include "common/mi-lttng.h" +#include "common/argpar-utils/argpar-utils.hpp" +#include "common/mi-lttng.hpp" #include #include diff --git a/src/bin/lttng/commands/rotate.cpp b/src/bin/lttng/commands/rotate.cpp index 63cf3882a..339e39598 100644 --- a/src/bin/lttng/commands/rotate.cpp +++ b/src/bin/lttng/commands/rotate.cpp @@ -16,10 +16,10 @@ #include #include -#include -#include +#include +#include -#include "../command.h" +#include "../command.hpp" #include static char *opt_session_name; diff --git a/src/bin/lttng/commands/save.cpp b/src/bin/lttng/commands/save.cpp index 4231922ad..9b939102c 100644 --- a/src/bin/lttng/commands/save.cpp +++ b/src/bin/lttng/commands/save.cpp @@ -12,9 +12,9 @@ #include #include -#include +#include -#include "../command.h" +#include "../command.hpp" #include static char *opt_output_path; diff --git a/src/bin/lttng/commands/set_session.cpp b/src/bin/lttng/commands/set_session.cpp index ed1b1640f..770921292 100644 --- a/src/bin/lttng/commands/set_session.cpp +++ b/src/bin/lttng/commands/set_session.cpp @@ -14,9 +14,9 @@ #include #include -#include +#include -#include "../command.h" +#include "../command.hpp" static char *opt_session_name; diff --git a/src/bin/lttng/commands/snapshot.cpp b/src/bin/lttng/commands/snapshot.cpp index a5cbbfe75..bc0dd8b4e 100644 --- a/src/bin/lttng/commands/snapshot.cpp +++ b/src/bin/lttng/commands/snapshot.cpp @@ -15,11 +15,11 @@ #include #include -#include -#include +#include +#include #include -#include "../command.h" +#include "../command.hpp" static const char *opt_session_name; static const char *opt_output_name; diff --git a/src/bin/lttng/commands/start.cpp b/src/bin/lttng/commands/start.cpp index 69bd9221f..4d2b40a50 100644 --- a/src/bin/lttng/commands/start.cpp +++ b/src/bin/lttng/commands/start.cpp @@ -14,10 +14,10 @@ #include #include -#include -#include +#include +#include -#include "../command.h" +#include "../command.hpp" static char *opt_session_name; diff --git a/src/bin/lttng/commands/status.cpp b/src/bin/lttng/commands/status.cpp index 23e8c03d3..a77830ece 100644 --- a/src/bin/lttng/commands/status.cpp +++ b/src/bin/lttng/commands/status.cpp @@ -14,8 +14,8 @@ #include #include -#include "../command.h" -#include "../utils.h" +#include "../command.hpp" +#include "../utils.hpp" #include #ifdef LTTNG_EMBED_HELP diff --git a/src/bin/lttng/commands/stop.cpp b/src/bin/lttng/commands/stop.cpp index ec7da898c..6107dc158 100644 --- a/src/bin/lttng/commands/stop.cpp +++ b/src/bin/lttng/commands/stop.cpp @@ -14,10 +14,10 @@ #include #include -#include -#include +#include +#include -#include "../command.h" +#include "../command.hpp" static char *opt_session_name; static int opt_no_wait; diff --git a/src/bin/lttng/commands/track-untrack.cpp b/src/bin/lttng/commands/track-untrack.cpp index de377430c..f7b268f71 100644 --- a/src/bin/lttng/commands/track-untrack.cpp +++ b/src/bin/lttng/commands/track-untrack.cpp @@ -20,15 +20,15 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include "../command.h" +#include "../command.hpp" struct process_attr_command_args { enum lttng_process_attr process_attr; diff --git a/src/bin/lttng/commands/version.cpp b/src/bin/lttng/commands/version.cpp index 2126e20b7..e4aed95ad 100644 --- a/src/bin/lttng/commands/version.cpp +++ b/src/bin/lttng/commands/version.cpp @@ -14,10 +14,10 @@ #include #include -#include +#include -#include "../command.h" -#include "version.h" +#include "../command.hpp" +#include "version.hpp" #ifdef LTTNG_EMBED_HELP static const char help_msg[] = diff --git a/src/bin/lttng/commands/view.cpp b/src/bin/lttng/commands/view.cpp index a2623fe49..1bf264871 100644 --- a/src/bin/lttng/commands/view.cpp +++ b/src/bin/lttng/commands/view.cpp @@ -14,8 +14,8 @@ #include #include -#include -#include "../command.h" +#include +#include "../command.hpp" static char *opt_session_name; static char *opt_viewer; diff --git a/src/bin/lttng/conf.cpp b/src/bin/lttng/conf.cpp index 4e22ca005..d79fba989 100644 --- a/src/bin/lttng/conf.cpp +++ b/src/bin/lttng/conf.cpp @@ -14,11 +14,11 @@ #include #include -#include -#include -#include +#include +#include +#include -#include "conf.h" +#include "conf.hpp" /* * Returns the path with '/CONFIG_FILENAME' added to it; diff --git a/src/bin/lttng/conf.h b/src/bin/lttng/conf.hpp similarity index 100% rename from src/bin/lttng/conf.h rename to src/bin/lttng/conf.hpp diff --git a/src/bin/lttng/loglevel.cpp b/src/bin/lttng/loglevel.cpp index 83c7b3048..fe588bd8e 100644 --- a/src/bin/lttng/loglevel.cpp +++ b/src/bin/lttng/loglevel.cpp @@ -5,7 +5,7 @@ * */ -#include "loglevel.h" +#include "loglevel.hpp" #include #include #include diff --git a/src/bin/lttng/loglevel.h b/src/bin/lttng/loglevel.hpp similarity index 97% rename from src/bin/lttng/loglevel.h rename to src/bin/lttng/loglevel.hpp index 43ae8e448..f2cc9139b 100644 --- a/src/bin/lttng/loglevel.h +++ b/src/bin/lttng/loglevel.hpp @@ -9,7 +9,7 @@ #define _LTTNG_LOGLEVEL_UTILS_H #include -#include +#include int loglevel_name_to_value(const char *name, enum lttng_loglevel *loglevel); diff --git a/src/bin/lttng/lttng.cpp b/src/bin/lttng/lttng.cpp index 27e332e07..7e70c3afc 100644 --- a/src/bin/lttng/lttng.cpp +++ b/src/bin/lttng/lttng.cpp @@ -17,12 +17,12 @@ #include #include -#include -#include -#include +#include +#include +#include -#include "command.h" -#include "version.h" +#include "command.hpp" +#include "version.hpp" static const char *help_msg = #ifdef LTTNG_EMBED_HELP diff --git a/src/bin/lttng/uprobe.cpp b/src/bin/lttng/uprobe.cpp index 21b5e90e6..07ac5d5fa 100644 --- a/src/bin/lttng/uprobe.cpp +++ b/src/bin/lttng/uprobe.cpp @@ -5,19 +5,19 @@ * */ -#include "uprobe.h" +#include "uprobe.hpp" #include #include #include -#include "common/compat/getenv.h" -#include "common/string-utils/string-utils.h" -#include "common/utils.h" -#include "common/path.h" +#include "common/compat/getenv.hpp" +#include "common/string-utils/string-utils.hpp" +#include "common/utils.hpp" +#include "common/path.hpp" #include "lttng/constant.h" -#include "command.h" +#include "command.hpp" /* * Walk the directories in the PATH environment variable to find the target diff --git a/src/bin/lttng/uprobe.h b/src/bin/lttng/uprobe.hpp similarity index 92% rename from src/bin/lttng/uprobe.h rename to src/bin/lttng/uprobe.hpp index 54dc674d5..837331291 100644 --- a/src/bin/lttng/uprobe.h +++ b/src/bin/lttng/uprobe.hpp @@ -8,7 +8,7 @@ #ifndef SRC_BIN_LTTNG_UPROBE_H #define SRC_BIN_LTTNG_UPROBE_H -#include +#include struct lttng_userspace_probe_location; diff --git a/src/bin/lttng/utils.cpp b/src/bin/lttng/utils.cpp index 528318b2a..9a9f39bf2 100644 --- a/src/bin/lttng/utils.cpp +++ b/src/bin/lttng/utils.cpp @@ -17,13 +17,13 @@ #include #include -#include -#include -#include +#include +#include +#include -#include "conf.h" -#include "utils.h" -#include "command.h" +#include "conf.hpp" +#include "utils.hpp" +#include "command.hpp" static const char *str_all = "ALL"; static const char *str_tracepoint = "Tracepoint"; diff --git a/src/bin/lttng/utils.h b/src/bin/lttng/utils.hpp similarity index 97% rename from src/bin/lttng/utils.h rename to src/bin/lttng/utils.hpp index 0cf01dbcd..bb1c2cdfb 100644 --- a/src/bin/lttng/utils.h +++ b/src/bin/lttng/utils.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 9d3ca1294..b0191dd47 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -6,17 +6,17 @@ noinst_LTLIBRARIES = BUILT_SOURCES = noinst_HEADERS = \ - align.h \ - bug.h \ - defaults.h \ - error.h \ - futex.h \ - lttng-kernel.h \ - lttng-kernel-old.h \ - macros.h \ - time.h \ - uri.h \ - utils.h + align.hpp \ + bug.hpp \ + defaults.hpp \ + error.hpp \ + futex.hpp \ + lttng-kernel.hpp \ + lttng-kernel-old.hpp \ + macros.hpp \ + time.hpp \ + uri.hpp \ + utils.hpp # libargpar @@ -30,14 +30,14 @@ libargpar_la_SOURCES = \ noinst_LTLIBRARIES += libargpar-utils.la libargpar_utils_la_SOURCES = \ argpar-utils/argpar-utils.cpp \ - argpar-utils/argpar-utils.h + argpar-utils/argpar-utils.hpp # libbytecode noinst_LTLIBRARIES += libbytecode.la libbytecode_la_SOURCES = \ bytecode/bytecode.cpp \ - bytecode/bytecode.h + bytecode/bytecode.hpp # The libcommon-lgpl static archive contains only LGPLv2.1 code. It is @@ -55,20 +55,20 @@ libcommon_lgpl_la_SOURCES = \ actions/start-session.cpp \ actions/stop-session.cpp \ actions/rate-policy.cpp \ - buffer-view.h buffer-view.cpp \ + buffer-view.hpp buffer-view.cpp \ channel.cpp \ conditions/buffer-usage.cpp \ conditions/condition.cpp \ conditions/event-rule-matches.cpp \ conditions/session-consumed-size.cpp \ conditions/session-rotation.cpp \ - credentials.cpp credentials.h \ + credentials.cpp credentials.hpp \ defaults.cpp \ domain.cpp \ - dynamic-array.cpp dynamic-array.h \ - dynamic-buffer.cpp dynamic-buffer.h \ + dynamic-array.cpp dynamic-array.hpp \ + dynamic-buffer.cpp dynamic-buffer.hpp \ endpoint.cpp \ - error.cpp error.h \ + error.cpp error.hpp \ error-query.cpp \ evaluation.cpp \ event.cpp \ @@ -83,31 +83,31 @@ libcommon_lgpl_la_SOURCES = \ event-rule/log4j-logging.cpp \ event-rule/jul-logging.cpp \ event-rule/python-logging.cpp \ - fd-handle.cpp fd-handle.h \ + fd-handle.cpp fd-handle.hpp\ kernel-probe.cpp \ location.cpp \ log-level-rule.cpp \ - mi-lttng.cpp mi-lttng.h \ + mi-lttng.cpp mi-lttng.hpp \ notification.cpp \ - payload.cpp payload.h \ - payload-view.cpp payload-view.h \ - readwrite.cpp readwrite.h \ - runas.cpp runas.h \ + payload.cpp payload.hpp \ + payload-view.cpp payload-view.hpp \ + readwrite.cpp readwrite.hpp \ + runas.cpp runas.hpp \ session-descriptor.cpp \ - snapshot.cpp snapshot.h \ - spawn-viewer.cpp spawn-viewer.h \ - thread.cpp thread.h \ + snapshot.cpp snapshot.hpp \ + spawn-viewer.cpp spawn-viewer.hpp \ + thread.cpp thread.hpp \ time.cpp \ - tracker.cpp tracker.h \ + tracker.cpp tracker.hpp \ trigger.cpp \ - unix.cpp unix.h \ - uri.cpp uri.h \ + unix.cpp unix.hpp \ + uri.cpp uri.hpp \ userspace-probe.cpp \ - utils.cpp utils.h + utils.cpp utils.hpp if HAVE_ELF_H libcommon_lgpl_la_SOURCES += \ - lttng-elf.cpp lttng-elf.h + lttng-elf.cpp lttng-elf.hpp endif libcommon_lgpl_la_LIBADD = \ @@ -123,27 +123,27 @@ libcommon_lgpl_la_LIBADD = \ # meant to be used by GPL executables. noinst_LTLIBRARIES += libpath.la libpath_la_SOURCES = \ - path.cpp path.h + path.cpp path.hpp # The libcommon-gpl static archive contains GPLv2 compatible code. It is # meant to be used by GPL executables. noinst_LTLIBRARIES += libcommon-gpl.la libcommon_gpl_la_SOURCES = \ - common.h \ - context.cpp context.h \ - daemonize.cpp daemonize.h \ - filter.cpp filter.h \ - fs-handle.cpp fs-handle.h fs-handle-internal.h \ - futex.cpp futex.h \ - index-allocator.cpp index-allocator.h \ - optional.h \ - pipe.cpp pipe.h \ - shm.cpp shm.h \ - trace-chunk.cpp trace-chunk.h \ - trace-chunk-registry.h \ - uuid.cpp uuid.h \ - waiter.cpp waiter.h + common.hpp \ + context.cpp context.hpp \ + daemonize.cpp daemonize.hpp \ + filter.cpp filter.hpp \ + fs-handle.cpp fs-handle.hpp fs-handle-internal.hpp \ + futex.cpp futex.hpp \ + index-allocator.cpp index-allocator.hpp \ + optional.hpp \ + pipe.cpp pipe.hpp \ + shm.cpp shm.hpp \ + trace-chunk.cpp trace-chunk.hpp \ + trace-chunk-registry.hpp \ + uuid.cpp uuid.hpp \ + waiter.cpp waiter.hpp libcommon_gpl_la_LIBADD = \ libcommon-lgpl.la \ @@ -158,32 +158,32 @@ noinst_LTLIBRARIES += libcompat.la libcompat_la_SOURCES = \ compat/compat-fcntl.cpp \ compat/directory-handle.cpp \ - compat/directory-handle.h \ - compat/dirent.h \ - compat/endian.h \ - compat/errno.h \ - compat/fcntl.h \ - compat/getenv.h \ - compat/mman.h \ - compat/netdb.h \ - compat/path.h \ - compat/paths.h \ + compat/directory-handle.hpp \ + compat/dirent.hpp \ + compat/endian.hpp \ + compat/errno.hpp \ + compat/fcntl.hpp \ + compat/getenv.hpp \ + compat/mman.hpp \ + compat/netdb.hpp \ + compat/path.hpp \ + compat/paths.hpp \ compat/poll.cpp \ - compat/poll.h \ - compat/pthread.h \ - compat/socket.h \ - compat/string.h \ - compat/tid.h \ - compat/time.h + compat/poll.hpp \ + compat/pthread.hpp \ + compat/socket.hpp \ + compat/string.hpp \ + compat/tid.hpp \ + compat/time.hpp # libconfig noinst_LTLIBRARIES += libconfig.la libconfig_la_SOURCES = \ - config/config-internal.h \ - config/config-session-abi.h \ + config/config-internal.hpp \ + config/config-session-abi.hpp \ config/session-config.cpp \ - config/session-config.h + config/session-config.hpp libconfig_la_CPPFLAGS = $(libxml2_CFLAGS) $(AM_CPPFLAGS) libconfig_la_LIBADD = ${libxml2_LIBS} @@ -194,16 +194,16 @@ noinst_LTLIBRARIES += libconsumer.la libconsumer_la_SOURCES = \ consumer/consumer.cpp \ - consumer/consumer.h \ + consumer/consumer.hpp \ consumer/consumer-metadata-cache.cpp \ - consumer/consumer-metadata-cache.h \ + consumer/consumer-metadata-cache.hpp \ consumer/consumer-stream.cpp \ - consumer/consumer-stream.h \ - consumer/consumer-testpoint.h \ + consumer/consumer-stream.hpp \ + consumer/consumer-testpoint.hpp \ consumer/consumer-timer.cpp \ - consumer/consumer-timer.h \ + consumer/consumer-timer.hpp \ consumer/metadata-bucket.cpp \ - consumer/metadata-bucket.h + consumer/metadata-bucket.hpp libconsumer_la_LIBADD = \ libkernel-consumer.la \ @@ -221,11 +221,11 @@ endif # BUILD_LIB_CONSUMER noinst_LTLIBRARIES += libfd-tracker.la libfd_tracker_la_SOURCES = \ fd-tracker/fd-tracker.cpp \ - fd-tracker/fd-tracker.h \ + fd-tracker/fd-tracker.hpp \ fd-tracker/inode.cpp \ - fd-tracker/inode.h \ + fd-tracker/inode.hpp \ fd-tracker/utils.cpp \ - fd-tracker/utils.h \ + fd-tracker/utils.hpp \ fd-tracker/utils-poll.cpp @@ -233,11 +233,11 @@ libfd_tracker_la_SOURCES = \ noinst_LTLIBRARIES += libfilter.la libfilter_la_SOURCES = \ - filter/filter-ast.h \ - filter/filter-ir.h \ + filter/filter-ast.hpp \ + filter/filter-ir.hpp \ filter/filter-lexer.lpp \ filter/filter-parser.ypp \ - filter/filter-symbols.h \ + filter/filter-symbols.hpp \ filter/filter-visitor-generate-bytecode.cpp \ filter/filter-visitor-generate-ir.cpp \ filter/filter-visitor-ir-check-binary-op-nesting.cpp \ @@ -245,7 +245,7 @@ libfilter_la_SOURCES = \ filter/filter-visitor-ir-validate-globbing.cpp \ filter/filter-visitor-ir-validate-string.cpp \ filter/filter-visitor-xml.cpp \ - filter/memstream.h + filter/memstream.hpp BUILT_SOURCES += filter/filter-parser.hpp @@ -256,7 +256,7 @@ FILTER_WARN_FLAGS = \ -Wno-unused-parameter libfilter_la_CFLAGS = $(AM_CFLAGS) $(FILTER_WARN_FLAGS) -libfilter_la_CXXFLAGS = -include filter-symbols.h $(AM_CXXFLAGS) $(FILTER_WARN_FLAGS) +libfilter_la_CXXFLAGS = -include filter-symbols.hpp $(AM_CXXFLAGS) $(FILTER_WARN_FLAGS) libfilter_la_CPPFLAGS = -I$(srcdir)/filter -I$(builddir)/filter $(AM_CPPFLAGS) libfilter_la_LIBADD = libstring-utils.la @@ -301,14 +301,14 @@ noinst_LTLIBRARIES += libhashtable-lgpl.la libhashtable_lgpl_la_SOURCES = \ hashtable/seed.cpp \ hashtable/utils.cpp \ - hashtable/utils.h + hashtable/utils.hpp noinst_LTLIBRARIES += libhashtable-gpl.la libhashtable_gpl_la_SOURCES = \ hashtable/hashtable.cpp \ - hashtable/hashtable.h \ - hashtable/hashtable-symbols.h + hashtable/hashtable.hpp \ + hashtable/hashtable-symbols.hpp libhashtable_gpl_la_LIBADD = \ $(URCU_LIBS) \ @@ -327,18 +327,18 @@ endif noinst_LTLIBRARIES += libini-config.la libini_config_la_SOURCES = \ ini-config/ini.cpp \ - ini-config/ini.h \ + ini-config/ini.hpp \ ini-config/ini-config.cpp \ - ini-config/ini-config.h + ini-config/ini-config.hpp if BUILD_LIB_INDEX noinst_LTLIBRARIES += libindex.la libindex_la_SOURCES = \ - index/ctf-index.h \ + index/ctf-index.hpp \ index/index.cpp \ - index/index.h + index/index.hpp endif @@ -347,22 +347,22 @@ noinst_LTLIBRARIES += libkernel-ctl.la libkernel_ctl_la_SOURCES = \ kernel-ctl/kernel-ctl.cpp \ - kernel-ctl/kernel-ctl.h \ - kernel-ctl/kernel-ioctl.h + kernel-ctl/kernel-ctl.hpp \ + kernel-ctl/kernel-ioctl.hpp endif if BUILD_LIB_SESSIOND_COMM noinst_LTLIBRARIES += libsessiond-comm.la libsessiond_comm_la_SOURCES = \ - sessiond-comm/agent.h \ + sessiond-comm/agent.hpp \ sessiond-comm/inet.cpp \ - sessiond-comm/inet.h \ + sessiond-comm/inet.hpp \ sessiond-comm/inet6.cpp \ - sessiond-comm/inet6.h \ - sessiond-comm/relayd.h \ + sessiond-comm/inet6.hpp \ + sessiond-comm/relayd.hpp \ sessiond-comm/sessiond-comm.cpp \ - sessiond-comm/sessiond-comm.h + sessiond-comm/sessiond-comm.hpp endif if BUILD_LIB_RELAYD @@ -370,7 +370,7 @@ noinst_LTLIBRARIES += librelayd.la librelayd_la_SOURCES = \ relayd/relayd.cpp \ - relayd/relayd.h + relayd/relayd.hpp librelayd_la_LIBADD = libsessiond-comm.la endif @@ -381,7 +381,7 @@ noinst_LTLIBRARIES += libkernel-consumer.la libkernel_consumer_la_SOURCES = \ kernel-consumer/kernel-consumer.cpp \ - kernel-consumer/kernel-consumer.h + kernel-consumer/kernel-consumer.hpp libkernel_consumer_la_LIBADD = \ libkernel-ctl.la @@ -393,7 +393,7 @@ noinst_LTLIBRARIES += libust-consumer.la libust_consumer_la_SOURCES = \ ust-consumer/ust-consumer.cpp \ - ust-consumer/ust-consumer.h + ust-consumer/ust-consumer.hpp libust_consumer_la_LIBADD = \ $(UST_CTL_LIBS) @@ -405,7 +405,7 @@ noinst_LTLIBRARIES += libtestpoint.la libtestpoint_la_SOURCES = \ testpoint/testpoint.cpp \ - testpoint/testpoint.h + testpoint/testpoint.hpp libtestpoint_la_LIBADD = $(DL_LIBS) endif @@ -414,9 +414,9 @@ endif # libstring-utils noinst_LTLIBRARIES += libstring-utils.la libstring_utils_la_SOURCES = \ - string-utils/format.h \ + string-utils/format.hpp \ string-utils/string-utils.cpp \ - string-utils/string-utils.h + string-utils/string-utils.hpp noinst_PROGRAMS = filter-grammar-test diff --git a/src/common/actions/action.cpp b/src/common/actions/action.cpp index b71538b3f..74dec1247 100644 --- a/src/common/actions/action.cpp +++ b/src/common/actions/action.cpp @@ -5,17 +5,17 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include const char *lttng_action_type_string(enum lttng_action_type action_type) { diff --git a/src/common/actions/list.cpp b/src/common/actions/list.cpp index 42d3d653e..c80832570 100644 --- a/src/common/actions/list.cpp +++ b/src/common/actions/list.cpp @@ -5,14 +5,14 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #define IS_LIST_ACTION(action) \ diff --git a/src/common/actions/notify.cpp b/src/common/actions/notify.cpp index e3f837ade..8ee51c316 100644 --- a/src/common/actions/notify.cpp +++ b/src/common/actions/notify.cpp @@ -5,12 +5,12 @@ * */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #define IS_NOTIFY_ACTION(action) \ diff --git a/src/common/actions/path.cpp b/src/common/actions/path.cpp index 816f2cd21..0c8181896 100644 --- a/src/common/actions/path.cpp +++ b/src/common/actions/path.cpp @@ -5,7 +5,7 @@ * */ -#include +#include struct lttng_action_path_comm { uint32_t index_count; diff --git a/src/common/actions/rate-policy.cpp b/src/common/actions/rate-policy.cpp index d0834dd73..58db624d8 100644 --- a/src/common/actions/rate-policy.cpp +++ b/src/common/actions/rate-policy.cpp @@ -5,15 +5,15 @@ * */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include #include #include #include diff --git a/src/common/actions/rotate-session.cpp b/src/common/actions/rotate-session.cpp index 985036acc..ad2f9e293 100644 --- a/src/common/actions/rotate-session.cpp +++ b/src/common/actions/rotate-session.cpp @@ -5,13 +5,13 @@ * */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include #include #define IS_ROTATE_SESSION_ACTION(action) \ diff --git a/src/common/actions/snapshot-session.cpp b/src/common/actions/snapshot-session.cpp index 0f3da782f..600d803e3 100644 --- a/src/common/actions/snapshot-session.cpp +++ b/src/common/actions/snapshot-session.cpp @@ -5,19 +5,19 @@ * */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include -#include +#include #include -#include +#include #include #define IS_SNAPSHOT_SESSION_ACTION(action) \ diff --git a/src/common/actions/start-session.cpp b/src/common/actions/start-session.cpp index 1312e5ec5..739540189 100644 --- a/src/common/actions/start-session.cpp +++ b/src/common/actions/start-session.cpp @@ -5,13 +5,13 @@ * */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include #include #define IS_START_SESSION_ACTION(action) \ diff --git a/src/common/actions/stop-session.cpp b/src/common/actions/stop-session.cpp index 55f1a55ed..3cffb4a55 100644 --- a/src/common/actions/stop-session.cpp +++ b/src/common/actions/stop-session.cpp @@ -5,13 +5,13 @@ * */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include #include #define IS_STOP_SESSION_ACTION(action) \ diff --git a/src/common/align.h b/src/common/align.hpp similarity index 99% rename from src/common/align.h rename to src/common/align.hpp index dff6c91d6..c957824af 100644 --- a/src/common/align.h +++ b/src/common/align.hpp @@ -8,7 +8,7 @@ #ifndef _LTTNG_ALIGN_H #define _LTTNG_ALIGN_H -#include "bug.h" +#include "bug.hpp" /* * Align value to the next multiple of align. Returns val if it already is a diff --git a/src/common/argpar-utils/argpar-utils.cpp b/src/common/argpar-utils/argpar-utils.cpp index 493598693..0beff92ad 100644 --- a/src/common/argpar-utils/argpar-utils.cpp +++ b/src/common/argpar-utils/argpar-utils.cpp @@ -5,12 +5,12 @@ * */ -#include "argpar-utils.h" +#include "argpar-utils.hpp" #include -#include -#include +#include +#include /* * Given argpar error status `status` and error `error`, return a formatted diff --git a/src/common/argpar-utils/argpar-utils.h b/src/common/argpar-utils/argpar-utils.hpp similarity index 96% rename from src/common/argpar-utils/argpar-utils.h rename to src/common/argpar-utils/argpar-utils.hpp index 1bdff7e19..ea7734507 100644 --- a/src/common/argpar-utils/argpar-utils.h +++ b/src/common/argpar-utils/argpar-utils.hpp @@ -14,9 +14,9 @@ extern "C" { #include -#include +#include #include -#include +#include #define WHILE_PARSING_ARG_N_ARG_FMT "While parsing argument #%d (`%s`): " diff --git a/src/common/buffer-view.cpp b/src/common/buffer-view.cpp index ebe686985..9498423ca 100644 --- a/src/common/buffer-view.cpp +++ b/src/common/buffer-view.cpp @@ -5,9 +5,9 @@ * */ -#include -#include -#include +#include +#include +#include struct lttng_buffer_view lttng_buffer_view_init( const char *src, size_t offset, ptrdiff_t len) diff --git a/src/common/buffer-view.h b/src/common/buffer-view.hpp similarity index 98% rename from src/common/buffer-view.h rename to src/common/buffer-view.hpp index 58f1ede2e..7e638c05e 100644 --- a/src/common/buffer-view.h +++ b/src/common/buffer-view.hpp @@ -8,7 +8,7 @@ #ifndef LTTNG_BUFFER_VIEW_H #define LTTNG_BUFFER_VIEW_H -#include +#include #include #include #include diff --git a/src/common/bug.h b/src/common/bug.hpp similarity index 100% rename from src/common/bug.h rename to src/common/bug.hpp diff --git a/src/common/bytecode/bytecode.cpp b/src/common/bytecode/bytecode.cpp index 6100892b7..707394229 100644 --- a/src/common/bytecode/bytecode.cpp +++ b/src/common/bytecode/bytecode.cpp @@ -5,12 +5,12 @@ * */ -#include "bytecode.h" +#include "bytecode.hpp" #include #include -#include "common/align.h" +#include "common/align.hpp" #define INIT_ALLOC_SIZE 4 diff --git a/src/common/bytecode/bytecode.h b/src/common/bytecode/bytecode.hpp similarity index 98% rename from src/common/bytecode/bytecode.h rename to src/common/bytecode/bytecode.hpp index 386f58241..4ed51dcfe 100644 --- a/src/common/bytecode/bytecode.h +++ b/src/common/bytecode/bytecode.hpp @@ -10,8 +10,8 @@ #include -#include "common/macros.h" -#include "common/sessiond-comm/sessiond-comm.h" +#include "common/macros.hpp" +#include "common/sessiond-comm/sessiond-comm.hpp" /* * offsets are absolute from start of bytecode. diff --git a/src/common/channel.cpp b/src/common/channel.cpp index ac2f915d8..be3b62343 100644 --- a/src/common/channel.cpp +++ b/src/common/channel.cpp @@ -5,18 +5,16 @@ * */ -#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include static enum lttng_error_code flatten_lttng_channels( struct lttng_dynamic_pointer_array *channels, diff --git a/src/common/common.h b/src/common/common.hpp similarity index 67% rename from src/common/common.h rename to src/common/common.hpp index 58b266953..926ebf36d 100644 --- a/src/common/common.h +++ b/src/common/common.hpp @@ -9,10 +9,10 @@ #ifndef _COMMON_H #define _COMMON_H -#include "error.h" -#include "macros.h" -#include "runas.h" -#include "readwrite.h" -#include "time.h" +#include "error.hpp" +#include "macros.hpp" +#include "runas.hpp" +#include "readwrite.hpp" +#include "time.hpp" #endif /* _COMMON_H */ diff --git a/src/common/compat/compat-fcntl.cpp b/src/common/compat/compat-fcntl.cpp index 004939a3d..13ba512b8 100644 --- a/src/common/compat/compat-fcntl.cpp +++ b/src/common/compat/compat-fcntl.cpp @@ -6,8 +6,8 @@ */ #define _LGPL_SOURCE -#include -#include +#include +#include #include #ifdef __linux__ diff --git a/src/common/compat/directory-handle.cpp b/src/common/compat/directory-handle.cpp index 5bfb4b9ee..ba5c6925c 100644 --- a/src/common/compat/directory-handle.cpp +++ b/src/common/compat/directory-handle.cpp @@ -5,13 +5,13 @@ * */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include #include #include diff --git a/src/common/compat/directory-handle.h b/src/common/compat/directory-handle.hpp similarity index 99% rename from src/common/compat/directory-handle.h rename to src/common/compat/directory-handle.hpp index 4a9b65718..0f969554d 100644 --- a/src/common/compat/directory-handle.h +++ b/src/common/compat/directory-handle.hpp @@ -8,8 +8,8 @@ #ifndef _COMPAT_DIRECTORY_HANDLE_H #define _COMPAT_DIRECTORY_HANDLE_H -#include -#include +#include +#include #include #include diff --git a/src/common/compat/dirent.h b/src/common/compat/dirent.hpp similarity index 100% rename from src/common/compat/dirent.h rename to src/common/compat/dirent.hpp diff --git a/src/common/compat/endian.h b/src/common/compat/endian.hpp similarity index 100% rename from src/common/compat/endian.h rename to src/common/compat/endian.hpp diff --git a/src/common/compat/errno.h b/src/common/compat/errno.hpp similarity index 100% rename from src/common/compat/errno.h rename to src/common/compat/errno.hpp diff --git a/src/common/compat/fcntl.h b/src/common/compat/fcntl.hpp similarity index 98% rename from src/common/compat/fcntl.h rename to src/common/compat/fcntl.hpp index 9fca7f0cd..a526ca55d 100644 --- a/src/common/compat/fcntl.h +++ b/src/common/compat/fcntl.hpp @@ -11,7 +11,7 @@ #include #include -#include +#include #if (defined(__CYGWIN__)) typedef long long off64_t; diff --git a/src/common/compat/getenv.h b/src/common/compat/getenv.hpp similarity index 95% rename from src/common/compat/getenv.h rename to src/common/compat/getenv.hpp index 2a6c0033a..7a31fef9e 100644 --- a/src/common/compat/getenv.h +++ b/src/common/compat/getenv.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include static inline int lttng_is_setuid_setgid(void) diff --git a/src/common/compat/mman.h b/src/common/compat/mman.hpp similarity index 100% rename from src/common/compat/mman.h rename to src/common/compat/mman.hpp diff --git a/src/common/compat/netdb.h b/src/common/compat/netdb.hpp similarity index 100% rename from src/common/compat/netdb.h rename to src/common/compat/netdb.hpp diff --git a/src/common/compat/path.h b/src/common/compat/path.hpp similarity index 100% rename from src/common/compat/path.h rename to src/common/compat/path.hpp diff --git a/src/common/compat/paths.h b/src/common/compat/paths.hpp similarity index 100% rename from src/common/compat/paths.h rename to src/common/compat/paths.hpp diff --git a/src/common/compat/poll.cpp b/src/common/compat/poll.cpp index 910b0f62a..4f532a26d 100644 --- a/src/common/compat/poll.cpp +++ b/src/common/compat/poll.cpp @@ -10,12 +10,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include "poll.h" +#include "poll.hpp" #ifdef HAVE_EPOLL diff --git a/src/common/compat/poll.h b/src/common/compat/poll.hpp similarity index 99% rename from src/common/compat/poll.h rename to src/common/compat/poll.hpp index cc2aab8f8..3cb07bf93 100644 --- a/src/common/compat/poll.h +++ b/src/common/compat/poll.hpp @@ -11,7 +11,7 @@ #include #include -#include +#include /* * Used by lttng_poll_clean to free the events structure in a lttng_poll_event. @@ -28,7 +28,7 @@ static inline void __lttng_poll_free(void *events) #include #include #include -#include +#include /* See man epoll(7) for this define path */ #define COMPAT_EPOLL_PROC_PATH "/proc/sys/fs/epoll/max_user_watches" diff --git a/src/common/compat/pthread.h b/src/common/compat/pthread.hpp similarity index 98% rename from src/common/compat/pthread.h rename to src/common/compat/pthread.hpp index dd30c8b9b..209cd275e 100644 --- a/src/common/compat/pthread.h +++ b/src/common/compat/pthread.hpp @@ -9,7 +9,7 @@ #define _COMPAT_PTHREAD_H #include -#include +#include #include #ifdef __FreeBSD__ diff --git a/src/common/compat/socket.h b/src/common/compat/socket.hpp similarity index 98% rename from src/common/compat/socket.h rename to src/common/compat/socket.hpp index ee475a1d1..599998ef5 100644 --- a/src/common/compat/socket.h +++ b/src/common/compat/socket.hpp @@ -12,7 +12,7 @@ #include #include -#include +#include #ifndef MSG_NOSIGNAL # ifdef SO_NOSIGPIPE @@ -29,7 +29,7 @@ ssize_t lttng_recvmsg_nosigpipe(int sockfd, struct msghdr *msg) #else #include -#include +#include static inline ssize_t lttng_recvmsg_nosigpipe(int sockfd, struct msghdr *msg) diff --git a/src/common/compat/string.h b/src/common/compat/string.hpp similarity index 100% rename from src/common/compat/string.h rename to src/common/compat/string.hpp diff --git a/src/common/compat/tid.h b/src/common/compat/tid.hpp similarity index 100% rename from src/common/compat/tid.h rename to src/common/compat/tid.hpp diff --git a/src/common/compat/time.h b/src/common/compat/time.hpp similarity index 97% rename from src/common/compat/time.h rename to src/common/compat/time.hpp index 72a9afff4..37f472a4a 100644 --- a/src/common/compat/time.h +++ b/src/common/compat/time.hpp @@ -16,7 +16,7 @@ typedef uint64_t timer_t; #include #include -#include +#include #undef NSEC_PER_SEC #undef NSEC_PER_MSEC diff --git a/src/common/conditions/buffer-usage.cpp b/src/common/conditions/buffer-usage.cpp index fa28db65b..b1d001dc4 100644 --- a/src/common/conditions/buffer-usage.cpp +++ b/src/common/conditions/buffer-usage.cpp @@ -5,12 +5,12 @@ * */ -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include #include #include diff --git a/src/common/conditions/condition.cpp b/src/common/conditions/condition.cpp index 18b756dce..525932eb2 100644 --- a/src/common/conditions/condition.cpp +++ b/src/common/conditions/condition.cpp @@ -5,17 +5,17 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include enum lttng_condition_type lttng_condition_get_type( diff --git a/src/common/conditions/event-rule-matches.cpp b/src/common/conditions/event-rule-matches.cpp index 3e7776f46..033dbca48 100644 --- a/src/common/conditions/event-rule-matches.cpp +++ b/src/common/conditions/event-rule-matches.cpp @@ -5,18 +5,18 @@ * */ -#include -#include -#include +#include +#include +#include #include #include -#include -#include +#include +#include #include -#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/src/common/conditions/session-consumed-size.cpp b/src/common/conditions/session-consumed-size.cpp index 86a7f332a..8bc70abf6 100644 --- a/src/common/conditions/session-consumed-size.cpp +++ b/src/common/conditions/session-consumed-size.cpp @@ -5,12 +5,12 @@ * */ -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/src/common/conditions/session-rotation.cpp b/src/common/conditions/session-rotation.cpp index 390123a4e..094d1ea94 100644 --- a/src/common/conditions/session-rotation.cpp +++ b/src/common/conditions/session-rotation.cpp @@ -5,12 +5,12 @@ * */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include static diff --git a/src/common/config/config-internal.h b/src/common/config/config-internal.hpp similarity index 100% rename from src/common/config/config-internal.h rename to src/common/config/config-internal.hpp diff --git a/src/common/config/config-session-abi.h b/src/common/config/config-session-abi.hpp similarity index 100% rename from src/common/config/config-session-abi.h rename to src/common/config/config-session-abi.hpp diff --git a/src/common/config/session-config.cpp b/src/common/config/session-config.cpp index 143f8365e..dfbddf291 100644 --- a/src/common/config/session-config.cpp +++ b/src/common/config/session-config.cpp @@ -18,12 +18,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -34,8 +34,8 @@ #include #include -#include "session-config.h" -#include "config-internal.h" +#include "session-config.hpp" +#include "config-internal.hpp" #define CONFIG_USERSPACE_PROBE_LOOKUP_METHOD_NAME_MAX_LEN 7 diff --git a/src/common/config/session-config.h b/src/common/config/session-config.hpp similarity index 98% rename from src/common/config/session-config.h rename to src/common/config/session-config.hpp index e7bb7ef56..71270a4ef 100644 --- a/src/common/config/session-config.h +++ b/src/common/config/session-config.hpp @@ -8,8 +8,8 @@ #ifndef _CONFIG_H #define _CONFIG_H -#include -#include +#include +#include #include struct config_load_session_override_attr { diff --git a/src/common/consumer/consumer-metadata-cache.cpp b/src/common/consumer/consumer-metadata-cache.cpp index fdda6be8b..a810c7dab 100644 --- a/src/common/consumer/consumer-metadata-cache.cpp +++ b/src/common/consumer/consumer-metadata-cache.cpp @@ -14,13 +14,13 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include "consumer-metadata-cache.h" +#include "consumer-metadata-cache.hpp" enum metadata_cache_update_version_status { METADATA_CACHE_UPDATE_STATUS_VERSION_UPDATED, diff --git a/src/common/consumer/consumer-metadata-cache.h b/src/common/consumer/consumer-metadata-cache.hpp similarity index 96% rename from src/common/consumer/consumer-metadata-cache.h rename to src/common/consumer/consumer-metadata-cache.hpp index b8f4efadc..6e60e5c15 100644 --- a/src/common/consumer/consumer-metadata-cache.h +++ b/src/common/consumer/consumer-metadata-cache.hpp @@ -9,8 +9,8 @@ #ifndef CONSUMER_METADATA_CACHE_H #define CONSUMER_METADATA_CACHE_H -#include -#include +#include +#include enum consumer_metadata_cache_write_status { CONSUMER_METADATA_CACHE_WRITE_STATUS_ERROR = -1, diff --git a/src/common/consumer/consumer-stream.cpp b/src/common/consumer/consumer-stream.cpp index ebbd66a8b..f57e37ab8 100644 --- a/src/common/consumer/consumer-stream.cpp +++ b/src/common/consumer/consumer-stream.cpp @@ -12,22 +12,22 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "consumer-stream.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "consumer-stream.hpp" /* * RCU call to free stream. MUST only be used with call_rcu(). diff --git a/src/common/consumer/consumer-stream.h b/src/common/consumer/consumer-stream.hpp similarity index 99% rename from src/common/consumer/consumer-stream.h rename to src/common/consumer/consumer-stream.hpp index 021742e43..a8e5ddd55 100644 --- a/src/common/consumer/consumer-stream.h +++ b/src/common/consumer/consumer-stream.hpp @@ -8,7 +8,7 @@ #ifndef LTTNG_CONSUMER_STREAM_H #define LTTNG_CONSUMER_STREAM_H -#include "consumer.h" +#include "consumer.hpp" enum consumer_stream_open_packet_status { CONSUMER_STREAM_OPEN_PACKET_STATUS_OPENED, diff --git a/src/common/consumer/consumer-testpoint.h b/src/common/consumer/consumer-testpoint.hpp similarity index 93% rename from src/common/consumer/consumer-testpoint.h rename to src/common/consumer/consumer-testpoint.hpp index 737352263..90b66a965 100644 --- a/src/common/consumer/consumer-testpoint.h +++ b/src/common/consumer/consumer-testpoint.hpp @@ -9,7 +9,7 @@ * */ -#include +#include /* Testpoints, internal use only */ TESTPOINT_DECL(consumerd_thread_channel); diff --git a/src/common/consumer/consumer-timer.cpp b/src/common/consumer/consumer-timer.cpp index 51fa1687e..f37bfa350 100644 --- a/src/common/consumer/consumer-timer.cpp +++ b/src/common/consumer/consumer-timer.cpp @@ -10,15 +10,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include typedef int (*sample_positions_cb)(struct lttng_consumer_stream *stream); typedef int (*get_consumed_cb)(struct lttng_consumer_stream *stream, diff --git a/src/common/consumer/consumer-timer.h b/src/common/consumer/consumer-timer.hpp similarity index 98% rename from src/common/consumer/consumer-timer.h rename to src/common/consumer/consumer-timer.hpp index bf1649cad..3445ed57f 100644 --- a/src/common/consumer/consumer-timer.h +++ b/src/common/consumer/consumer-timer.hpp @@ -12,7 +12,7 @@ #include -#include "consumer.h" +#include "consumer.hpp" #define LTTNG_CONSUMER_SIG_SWITCH SIGRTMIN + 10 #define LTTNG_CONSUMER_SIG_TEARDOWN SIGRTMIN + 11 diff --git a/src/common/consumer/consumer.cpp b/src/common/consumer/consumer.cpp index f26ccd71a..685d55f83 100644 --- a/src/common/consumer/consumer.cpp +++ b/src/common/consumer/consumer.cpp @@ -7,43 +7,42 @@ * */ -#include "common/index/ctf-index.h" -#include #define _LGPL_SOURCE +#include #include #include +#include #include #include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include lttng_consumer_global_data the_consumer_data; diff --git a/src/common/consumer/consumer.h b/src/common/consumer/consumer.hpp similarity index 98% rename from src/common/consumer/consumer.h rename to src/common/consumer/consumer.hpp index 1c6eeb39a..4bcfe5d95 100644 --- a/src/common/consumer/consumer.h +++ b/src/common/consumer/consumer.hpp @@ -19,16 +19,16 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include struct lttng_consumer_local_data; diff --git a/src/common/consumer/metadata-bucket.cpp b/src/common/consumer/metadata-bucket.cpp index 160185def..ed78ec947 100644 --- a/src/common/consumer/metadata-bucket.cpp +++ b/src/common/consumer/metadata-bucket.cpp @@ -5,13 +5,13 @@ * */ -#include "metadata-bucket.h" +#include "metadata-bucket.hpp" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include struct metadata_bucket { struct lttng_dynamic_buffer content; diff --git a/src/common/consumer/metadata-bucket.h b/src/common/consumer/metadata-bucket.hpp similarity index 95% rename from src/common/consumer/metadata-bucket.h rename to src/common/consumer/metadata-bucket.hpp index 993d3f483..2c6961c88 100644 --- a/src/common/consumer/metadata-bucket.h +++ b/src/common/consumer/metadata-bucket.hpp @@ -8,7 +8,7 @@ #ifndef METADATA_BUCKET_H #define METADATA_BUCKET_H -#include +#include struct metadata_bucket; diff --git a/src/common/context.cpp b/src/common/context.cpp index ab61a8133..98c29f86c 100644 --- a/src/common/context.cpp +++ b/src/common/context.cpp @@ -5,11 +5,11 @@ * */ -#include "context.h" +#include "context.hpp" #include #include -#include -#include +#include +#include int parse_application_context(const char *str, char **out_provider_name, char **out_ctx_name) diff --git a/src/common/context.h b/src/common/context.hpp similarity index 96% rename from src/common/context.h rename to src/common/context.hpp index f4abd8417..324ef535e 100644 --- a/src/common/context.h +++ b/src/common/context.hpp @@ -8,7 +8,7 @@ #ifndef LTTNG_COMMON_CONTEXT_H #define LTTNG_COMMON_CONTEXT_H -#include +#include /* * Parse string as an application context of the form diff --git a/src/common/credentials.cpp b/src/common/credentials.cpp index fd8b4477b..f936736db 100644 --- a/src/common/credentials.cpp +++ b/src/common/credentials.cpp @@ -6,7 +6,7 @@ */ #include -#include "credentials.h" +#include "credentials.hpp" uid_t lttng_credentials_get_uid(const struct lttng_credentials *creds) { diff --git a/src/common/credentials.h b/src/common/credentials.hpp similarity index 94% rename from src/common/credentials.h rename to src/common/credentials.hpp index 66f2dbebf..340e64ee9 100644 --- a/src/common/credentials.h +++ b/src/common/credentials.hpp @@ -10,9 +10,9 @@ #include #include -#include "macros.h" +#include "macros.hpp" -#include "optional.h" +#include "optional.hpp" struct lttng_credentials { LTTNG_OPTIONAL(uid_t) uid; diff --git a/src/common/daemonize.cpp b/src/common/daemonize.cpp index 16af5a3f7..0ed35556e 100644 --- a/src/common/daemonize.cpp +++ b/src/common/daemonize.cpp @@ -8,15 +8,15 @@ #define _LGPL_SOURCE #include -#include +#include #include #include #include #include -#include -#include +#include +#include int lttng_daemonize(pid_t *child_ppid, int *completion_flag, int close_fds) diff --git a/src/common/daemonize.h b/src/common/daemonize.hpp similarity index 96% rename from src/common/daemonize.h rename to src/common/daemonize.hpp index 2c88f06b7..d1ec1cb42 100644 --- a/src/common/daemonize.h +++ b/src/common/daemonize.hpp @@ -10,7 +10,7 @@ */ #include -#include +#include /* * Daemonize this process by forking and making the parent wait for the child diff --git a/src/common/defaults.cpp b/src/common/defaults.cpp index 830720bd2..d79e42a6b 100644 --- a/src/common/defaults.cpp +++ b/src/common/defaults.cpp @@ -13,9 +13,9 @@ #include #include -#include "defaults.h" -#include "macros.h" -#include "error.h" +#include "defaults.hpp" +#include "macros.hpp" +#include "error.hpp" static int pthread_attr_init_done; static pthread_attr_t tattr; diff --git a/src/common/defaults.h b/src/common/defaults.hpp similarity index 99% rename from src/common/defaults.h rename to src/common/defaults.hpp index b889466fd..61e2891a1 100644 --- a/src/common/defaults.h +++ b/src/common/defaults.hpp @@ -11,7 +11,7 @@ #define _DEFAULTS_H #include -#include +#include /* Default unix group name for tracing. */ #define DEFAULT_TRACING_GROUP "tracing" diff --git a/src/common/domain.cpp b/src/common/domain.cpp index fb088faca..2c39c66e1 100644 --- a/src/common/domain.cpp +++ b/src/common/domain.cpp @@ -5,8 +5,8 @@ * */ -#include "lttng/domain-internal.h" -#include "common/macros.h" +#include "lttng/domain-internal.hpp" +#include "common/macros.hpp" const char *lttng_domain_type_str(enum lttng_domain_type domain_type) { diff --git a/src/common/dynamic-array.cpp b/src/common/dynamic-array.cpp index d723ffacb..ddc691bb1 100644 --- a/src/common/dynamic-array.cpp +++ b/src/common/dynamic-array.cpp @@ -5,7 +5,7 @@ * */ -#include +#include void lttng_dynamic_array_init(struct lttng_dynamic_array *array, size_t element_size, diff --git a/src/common/dynamic-array.h b/src/common/dynamic-array.hpp similarity index 99% rename from src/common/dynamic-array.h rename to src/common/dynamic-array.hpp index 8b08186dd..23f3a39b9 100644 --- a/src/common/dynamic-array.h +++ b/src/common/dynamic-array.hpp @@ -8,7 +8,7 @@ #ifndef LTTNG_DYNAMIC_ARRAY_H #define LTTNG_DYNAMIC_ARRAY_H -#include +#include typedef void (*lttng_dynamic_array_element_destructor)(void *element); typedef void (*lttng_dynamic_pointer_array_destructor)(void *ptr); diff --git a/src/common/dynamic-buffer.cpp b/src/common/dynamic-buffer.cpp index 945434ca9..a12e1485d 100644 --- a/src/common/dynamic-buffer.cpp +++ b/src/common/dynamic-buffer.cpp @@ -5,9 +5,9 @@ * */ -#include -#include -#include +#include +#include +#include /* * Round to (upper) power of two, val is returned if it already is a power of diff --git a/src/common/dynamic-buffer.h b/src/common/dynamic-buffer.hpp similarity index 99% rename from src/common/dynamic-buffer.h rename to src/common/dynamic-buffer.hpp index 0e0dedc9b..65b15752d 100644 --- a/src/common/dynamic-buffer.h +++ b/src/common/dynamic-buffer.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include struct lttng_buffer_view; diff --git a/src/common/endpoint.cpp b/src/common/endpoint.cpp index 3a0bbadcb..52d3d22d3 100644 --- a/src/common/endpoint.cpp +++ b/src/common/endpoint.cpp @@ -5,7 +5,7 @@ * */ -#include +#include static struct lttng_endpoint lttng_session_daemon_notification_endpoint_instance = { diff --git a/src/common/error-query.cpp b/src/common/error-query.cpp index 8072b26bd..b29996651 100644 --- a/src/common/error-query.cpp +++ b/src/common/error-query.cpp @@ -7,17 +7,17 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include #include struct lttng_error_query { diff --git a/src/common/error.cpp b/src/common/error.cpp index 0ec467bcd..150d2e53f 100644 --- a/src/common/error.cpp +++ b/src/common/error.cpp @@ -11,13 +11,13 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include "error.h" +#include "error.hpp" /* * lttng_opt_abort_on_error: unset: -1, disabled: 0, enabled: 1. diff --git a/src/common/error.h b/src/common/error.hpp similarity index 97% rename from src/common/error.h rename to src/common/error.hpp index b3e19c433..fdae1e72c 100644 --- a/src/common/error.h +++ b/src/common/error.hpp @@ -8,22 +8,22 @@ #ifndef _ERROR_H #define _ERROR_H -#include +#include #include #include #include #include #include -#include -#include -#include +#include +#include +#include #ifndef _GNU_SOURCE #error "lttng-tools error.h needs _GNU_SOURCE" #endif #include -#include +#include /* Avoid conflict with Solaris */ #if defined(ERR) && defined(__sun__) diff --git a/src/common/evaluation.cpp b/src/common/evaluation.cpp index 6b3e63494..a0fbc9dd9 100644 --- a/src/common/evaluation.cpp +++ b/src/common/evaluation.cpp @@ -5,14 +5,14 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include void lttng_evaluation_init(struct lttng_evaluation *evaluation, diff --git a/src/common/event-expr/event-expr.cpp b/src/common/event-expr/event-expr.cpp index e80fb1d5d..9306dbeee 100644 --- a/src/common/event-expr/event-expr.cpp +++ b/src/common/event-expr/event-expr.cpp @@ -10,11 +10,11 @@ #define _LGPL_SOURCE #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/common/event-field-value.cpp b/src/common/event-field-value.cpp index 757271313..816017a2d 100644 --- a/src/common/event-field-value.cpp +++ b/src/common/event-field-value.cpp @@ -13,9 +13,9 @@ #include #include -#include -#include -#include +#include +#include +#include static struct lttng_event_field_value *create_empty_field_val( diff --git a/src/common/event-rule/event-rule.cpp b/src/common/event-rule/event-rule.cpp index 7e3f7248e..8c1b81dbd 100644 --- a/src/common/event-rule/event-rule.cpp +++ b/src/common/event-rule/event-rule.cpp @@ -6,22 +6,22 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include enum lttng_event_rule_type lttng_event_rule_get_type( diff --git a/src/common/event-rule/jul-logging.cpp b/src/common/event-rule/jul-logging.cpp index 319a904a2..51cbdc004 100644 --- a/src/common/event-rule/jul-logging.cpp +++ b/src/common/event-rule/jul-logging.cpp @@ -5,19 +5,19 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/common/event-rule/kernel-kprobe.cpp b/src/common/event-rule/kernel-kprobe.cpp index da87fd2b9..628a051c3 100644 --- a/src/common/event-rule/kernel-kprobe.cpp +++ b/src/common/event-rule/kernel-kprobe.cpp @@ -5,21 +5,21 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include +#include #include -#include -#include +#include +#include #include #include diff --git a/src/common/event-rule/kernel-syscall.cpp b/src/common/event-rule/kernel-syscall.cpp index 64ebe47fd..815f99d9d 100644 --- a/src/common/event-rule/kernel-syscall.cpp +++ b/src/common/event-rule/kernel-syscall.cpp @@ -5,18 +5,18 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #define IS_SYSCALL_EVENT_RULE(rule) \ (lttng_event_rule_get_type(rule) == LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL) diff --git a/src/common/event-rule/kernel-tracepoint.cpp b/src/common/event-rule/kernel-tracepoint.cpp index 1b7fbe2a2..e546de1f3 100644 --- a/src/common/event-rule/kernel-tracepoint.cpp +++ b/src/common/event-rule/kernel-tracepoint.cpp @@ -5,19 +5,19 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #define IS_KERNEL_TRACEPOINT_EVENT_RULE(rule) \ diff --git a/src/common/event-rule/kernel-uprobe.cpp b/src/common/event-rule/kernel-uprobe.cpp index fe84f7cda..1a42421d3 100644 --- a/src/common/event-rule/kernel-uprobe.cpp +++ b/src/common/event-rule/kernel-uprobe.cpp @@ -5,18 +5,18 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #define IS_UPROBE_EVENT_RULE(rule) \ (lttng_event_rule_get_type(rule) == LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE) diff --git a/src/common/event-rule/log4j-logging.cpp b/src/common/event-rule/log4j-logging.cpp index 0bef6efab..937331a36 100644 --- a/src/common/event-rule/log4j-logging.cpp +++ b/src/common/event-rule/log4j-logging.cpp @@ -5,19 +5,19 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/common/event-rule/python-logging.cpp b/src/common/event-rule/python-logging.cpp index 4389c8aaf..20b649648 100644 --- a/src/common/event-rule/python-logging.cpp +++ b/src/common/event-rule/python-logging.cpp @@ -5,19 +5,19 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/common/event-rule/user-tracepoint.cpp b/src/common/event-rule/user-tracepoint.cpp index d6d166685..8932ca786 100644 --- a/src/common/event-rule/user-tracepoint.cpp +++ b/src/common/event-rule/user-tracepoint.cpp @@ -5,19 +5,19 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/common/event.cpp b/src/common/event.cpp index 9cef3e9b9..358d05841 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -5,22 +5,20 @@ * */ -#include "common/compat/string.h" -#include "common/macros.h" -#include "lttng/lttng-error.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include + #include -#include +#include #include -#include -#include -#include +#include +#include struct event_list_element { struct lttng_event *event; diff --git a/src/common/fd-handle.cpp b/src/common/fd-handle.cpp index d8b5b785d..7473f0717 100644 --- a/src/common/fd-handle.cpp +++ b/src/common/fd-handle.cpp @@ -8,8 +8,8 @@ #include #include -#include "fd-handle.h" -#include +#include "fd-handle.hpp" +#include struct fd_handle { struct urcu_ref ref; diff --git a/src/common/fd-handle.h b/src/common/fd-handle.hpp similarity index 97% rename from src/common/fd-handle.h rename to src/common/fd-handle.hpp index dab9e2bfa..877e88af8 100644 --- a/src/common/fd-handle.h +++ b/src/common/fd-handle.hpp @@ -8,7 +8,7 @@ #ifndef FD_HANDLE_H #define FD_HANDLE_H -#include +#include /* * Wrapper around a file descriptor providing reference counting semantics. diff --git a/src/common/fd-tracker/fd-tracker.cpp b/src/common/fd-tracker/fd-tracker.cpp index 18071dbd4..9c6f031b0 100644 --- a/src/common/fd-tracker/fd-tracker.cpp +++ b/src/common/fd-tracker/fd-tracker.cpp @@ -16,16 +16,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include - -#include "fd-tracker.h" -#include "inode.h" +#include +#include +#include +#include +#include +#include +#include + +#include "fd-tracker.hpp" +#include "inode.hpp" /* Tracker lock must be taken by the user. */ #define TRACKED_COUNT(tracker) \ diff --git a/src/common/fd-tracker/fd-tracker.h b/src/common/fd-tracker/fd-tracker.hpp similarity index 98% rename from src/common/fd-tracker/fd-tracker.h rename to src/common/fd-tracker/fd-tracker.hpp index 5c9810749..a38c880bd 100644 --- a/src/common/fd-tracker/fd-tracker.h +++ b/src/common/fd-tracker/fd-tracker.hpp @@ -8,8 +8,8 @@ #ifndef FD_TRACKER_H #define FD_TRACKER_H -#include -#include +#include +#include #include #include diff --git a/src/common/fd-tracker/inode.cpp b/src/common/fd-tracker/inode.cpp index 74f706248..b5cdcf1b2 100644 --- a/src/common/fd-tracker/inode.cpp +++ b/src/common/fd-tracker/inode.cpp @@ -5,13 +5,13 @@ * */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -21,7 +21,7 @@ #include #include -#include "inode.h" +#include "inode.hpp" struct inode_id { dev_t device; diff --git a/src/common/fd-tracker/inode.h b/src/common/fd-tracker/inode.hpp similarity index 97% rename from src/common/fd-tracker/inode.h rename to src/common/fd-tracker/inode.hpp index 7e95c0726..d4cb28239 100644 --- a/src/common/fd-tracker/inode.h +++ b/src/common/fd-tracker/inode.hpp @@ -8,7 +8,7 @@ #ifndef FD_TRACKER_INODE_H #define FD_TRACKER_INODE_H -#include +#include #include struct lttng_inode; diff --git a/src/common/fd-tracker/utils-poll.cpp b/src/common/fd-tracker/utils-poll.cpp index 6ea088c03..8c04b07b2 100644 --- a/src/common/fd-tracker/utils-poll.cpp +++ b/src/common/fd-tracker/utils-poll.cpp @@ -5,9 +5,9 @@ * */ -#include +#include -#include "utils.h" +#include "utils.hpp" #ifdef HAVE_EPOLL diff --git a/src/common/fd-tracker/utils.cpp b/src/common/fd-tracker/utils.cpp index 7690fe463..79da7ced6 100644 --- a/src/common/fd-tracker/utils.cpp +++ b/src/common/fd-tracker/utils.cpp @@ -5,9 +5,9 @@ * */ -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/common/fd-tracker/utils.h b/src/common/fd-tracker/utils.hpp similarity index 91% rename from src/common/fd-tracker/utils.h rename to src/common/fd-tracker/utils.hpp index 9c3d48937..064e09c0e 100644 --- a/src/common/fd-tracker/utils.h +++ b/src/common/fd-tracker/utils.hpp @@ -8,9 +8,9 @@ #ifndef FD_TRACKER_UTILS_H #define FD_TRACKER_UTILS_H -#include -#include -#include +#include +#include +#include struct lttng_poll_event; diff --git a/src/common/filter-grammar-test.cpp b/src/common/filter-grammar-test.cpp index 75eb2c6ca..5b8082fd4 100644 --- a/src/common/filter-grammar-test.cpp +++ b/src/common/filter-grammar-test.cpp @@ -15,9 +15,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include /* For error.h */ diff --git a/src/common/filter.cpp b/src/common/filter.cpp index f74b6374b..2bff02031 100644 --- a/src/common/filter.cpp +++ b/src/common/filter.cpp @@ -5,7 +5,7 @@ * */ -#include "filter.h" +#include "filter.hpp" #include struct bytecode_symbol_iterator { diff --git a/src/common/filter.h b/src/common/filter.hpp similarity index 94% rename from src/common/filter.h rename to src/common/filter.hpp index 305434bf6..085d6d034 100644 --- a/src/common/filter.h +++ b/src/common/filter.hpp @@ -8,7 +8,7 @@ #ifndef LTTNG_COMMON_FILTER_H #define LTTNG_COMMON_FILTER_H -#include +#include struct bytecode_symbol_iterator; diff --git a/src/common/filter/filter-ast.h b/src/common/filter/filter-ast.hpp similarity index 100% rename from src/common/filter/filter-ast.h rename to src/common/filter/filter-ast.hpp diff --git a/src/common/filter/filter-ir.h b/src/common/filter/filter-ir.hpp similarity index 99% rename from src/common/filter/filter-ir.h rename to src/common/filter/filter-ir.hpp index 5775e8004..068d3aa5c 100644 --- a/src/common/filter/filter-ir.h +++ b/src/common/filter/filter-ir.hpp @@ -12,7 +12,7 @@ * */ -#include "filter-ast.h" +#include "filter-ast.hpp" enum ir_op_signedness { IR_SIGN_UNKNOWN = 0, diff --git a/src/common/filter/filter-lexer.lpp b/src/common/filter/filter-lexer.lpp index acd4c0be8..12164af01 100644 --- a/src/common/filter/filter-lexer.lpp +++ b/src/common/filter/filter-lexer.lpp @@ -11,7 +11,7 @@ */ #include -#include "filter-ast.h" +#include "filter-ast.hpp" #include "filter-parser.hpp" #include %} diff --git a/src/common/filter/filter-parser.ypp b/src/common/filter/filter-parser.ypp index d654ecc84..89f6b43d9 100644 --- a/src/common/filter/filter-parser.ypp +++ b/src/common/filter/filter-parser.ypp @@ -16,13 +16,13 @@ #include #include #include -#include "common/bytecode/bytecode.h" -#include "filter-ast.h" +#include "common/bytecode/bytecode.hpp" +#include "filter-ast.hpp" #include "filter-parser.hpp" -#include "memstream.h" +#include "memstream.hpp" -#include -#include +#include +#include #define WIDTH_u64_SCANF_IS_A_BROKEN_API "20" #define WIDTH_o64_SCANF_IS_A_BROKEN_API "22" @@ -428,7 +428,7 @@ error: %code provides { -#include "common/macros.h" +#include "common/macros.hpp" void setstring(struct filter_parser_ctx *parser_ctx, YYSTYPE *lvalp, const char *src); } diff --git a/src/common/filter/filter-symbols.h b/src/common/filter/filter-symbols.hpp similarity index 100% rename from src/common/filter/filter-symbols.h rename to src/common/filter/filter-symbols.hpp diff --git a/src/common/filter/filter-visitor-generate-bytecode.cpp b/src/common/filter/filter-visitor-generate-bytecode.cpp index c7e1be782..d7f775775 100644 --- a/src/common/filter/filter-visitor-generate-bytecode.cpp +++ b/src/common/filter/filter-visitor-generate-bytecode.cpp @@ -11,17 +11,17 @@ #include #include -#include -#include -#include - -#include "common/align.h" -#include "common/bytecode/bytecode.h" -#include "common/compat/string.h" -#include "common/macros.h" -#include "common/string-utils/string-utils.h" -#include "filter-ast.h" -#include "filter-ir.h" +#include +#include +#include + +#include "common/align.hpp" +#include "common/bytecode/bytecode.hpp" +#include "common/compat/string.hpp" +#include "common/macros.hpp" +#include "common/string-utils/string-utils.hpp" +#include "filter-ast.hpp" +#include "filter-ir.hpp" #ifndef max_t #define max_t(type, a, b) ((type) ((a) > (b) ? (a) : (b))) diff --git a/src/common/filter/filter-visitor-generate-ir.cpp b/src/common/filter/filter-visitor-generate-ir.cpp index 3705ce4f2..a7236bd10 100644 --- a/src/common/filter/filter-visitor-generate-ir.cpp +++ b/src/common/filter/filter-visitor-generate-ir.cpp @@ -14,13 +14,13 @@ #include #include #include -#include "filter-ast.h" +#include "filter-ast.hpp" #include "filter-parser.hpp" -#include "filter-ir.h" +#include "filter-ir.hpp" -#include -#include -#include +#include +#include +#include static struct ir_op *generate_ir_recursive(struct filter_parser_ctx *ctx, diff --git a/src/common/filter/filter-visitor-ir-check-binary-comparator.cpp b/src/common/filter/filter-visitor-ir-check-binary-comparator.cpp index 480100f25..2699abde8 100644 --- a/src/common/filter/filter-visitor-ir-check-binary-comparator.cpp +++ b/src/common/filter/filter-visitor-ir-check-binary-comparator.cpp @@ -15,11 +15,11 @@ #include #include -#include +#include -#include "filter-ast.h" +#include "filter-ast.hpp" #include "filter-parser.hpp" -#include "filter-ir.h" +#include "filter-ir.hpp" static int check_bin_comparator(struct ir_op *node) diff --git a/src/common/filter/filter-visitor-ir-check-binary-op-nesting.cpp b/src/common/filter/filter-visitor-ir-check-binary-op-nesting.cpp index 290ea0367..9c3dd7673 100644 --- a/src/common/filter/filter-visitor-ir-check-binary-op-nesting.cpp +++ b/src/common/filter/filter-visitor-ir-check-binary-op-nesting.cpp @@ -14,12 +14,12 @@ #include #include #include -#include "filter-ast.h" +#include "filter-ast.hpp" #include "filter-parser.hpp" -#include "filter-ir.h" +#include "filter-ir.hpp" -#include -#include +#include +#include static int check_bin_op_nesting_recursive(struct ir_op *node, int nesting) diff --git a/src/common/filter/filter-visitor-ir-normalize-glob-patterns.cpp b/src/common/filter/filter-visitor-ir-normalize-glob-patterns.cpp index a091b8123..446c720db 100644 --- a/src/common/filter/filter-visitor-ir-normalize-glob-patterns.cpp +++ b/src/common/filter/filter-visitor-ir-normalize-glob-patterns.cpp @@ -15,13 +15,13 @@ #include #include -#include -#include -#include +#include +#include +#include -#include "filter-ast.h" +#include "filter-ast.hpp" #include "filter-parser.hpp" -#include "filter-ir.h" +#include "filter-ir.hpp" static int normalize_glob_patterns(struct ir_op *node) diff --git a/src/common/filter/filter-visitor-ir-validate-globbing.cpp b/src/common/filter/filter-visitor-ir-validate-globbing.cpp index 8f9c785c4..718098a43 100644 --- a/src/common/filter/filter-visitor-ir-validate-globbing.cpp +++ b/src/common/filter/filter-visitor-ir-validate-globbing.cpp @@ -15,12 +15,12 @@ #include #include -#include -#include +#include +#include -#include "filter-ast.h" +#include "filter-ast.hpp" #include "filter-parser.hpp" -#include "filter-ir.h" +#include "filter-ir.hpp" static int validate_globbing(struct ir_op *node) diff --git a/src/common/filter/filter-visitor-ir-validate-string.cpp b/src/common/filter/filter-visitor-ir-validate-string.cpp index 0c18f98bc..9e060ce2b 100644 --- a/src/common/filter/filter-visitor-ir-validate-string.cpp +++ b/src/common/filter/filter-visitor-ir-validate-string.cpp @@ -15,12 +15,12 @@ #include #include -#include -#include +#include +#include -#include "filter-ast.h" +#include "filter-ast.hpp" #include "filter-parser.hpp" -#include "filter-ir.h" +#include "filter-ir.hpp" enum parse_char_result { PARSE_CHAR_UNKNOWN = -2, diff --git a/src/common/filter/filter-visitor-xml.cpp b/src/common/filter/filter-visitor-xml.cpp index eb12452a6..5b531a289 100644 --- a/src/common/filter/filter-visitor-xml.cpp +++ b/src/common/filter/filter-visitor-xml.cpp @@ -14,11 +14,11 @@ #include #include #include -#include "filter-ast.h" +#include "filter-ast.hpp" #include "filter-parser.hpp" -#include -#include +#include +#include #define fprintf_dbg(fd, fmt, args...) fprintf(fd, "%s: " fmt, __func__, ## args) diff --git a/src/common/filter/memstream.h b/src/common/filter/memstream.hpp similarity index 98% rename from src/common/filter/memstream.h rename to src/common/filter/memstream.hpp index 41c768146..26b124a95 100644 --- a/src/common/filter/memstream.h +++ b/src/common/filter/memstream.hpp @@ -21,7 +21,7 @@ FILE *lttng_fmemopen(void *buf, size_t size, const char *mode) #include #include -#include +#include /* * Fallback for systems which don't have fmemopen. Copy buffer to a diff --git a/src/common/fs-handle-internal.h b/src/common/fs-handle-internal.hpp similarity index 100% rename from src/common/fs-handle-internal.h rename to src/common/fs-handle-internal.hpp diff --git a/src/common/fs-handle.cpp b/src/common/fs-handle.cpp index bed0010e7..ffdb883bd 100644 --- a/src/common/fs-handle.cpp +++ b/src/common/fs-handle.cpp @@ -5,9 +5,9 @@ * */ -#include -#include -#include +#include +#include +#include int fs_handle_get_fd(struct fs_handle *handle) { diff --git a/src/common/fs-handle.h b/src/common/fs-handle.hpp similarity index 98% rename from src/common/fs-handle.h rename to src/common/fs-handle.hpp index be6419c88..8b3a882a9 100644 --- a/src/common/fs-handle.h +++ b/src/common/fs-handle.hpp @@ -8,7 +8,7 @@ #ifndef FS_HANDLE_H #define FS_HANDLE_H -#include +#include #include struct fs_handle; diff --git a/src/common/futex.cpp b/src/common/futex.cpp index 3eadf096b..21ab09ab7 100644 --- a/src/common/futex.cpp +++ b/src/common/futex.cpp @@ -12,9 +12,9 @@ #include #include -#include +#include -#include "futex.h" +#include "futex.hpp" /* * This futex wait/wake scheme only works for N wakers / 1 waiters. Hence the diff --git a/src/common/futex.h b/src/common/futex.hpp similarity index 100% rename from src/common/futex.h rename to src/common/futex.hpp diff --git a/src/common/hashtable/hashtable-symbols.h b/src/common/hashtable/hashtable-symbols.hpp similarity index 100% rename from src/common/hashtable/hashtable-symbols.h rename to src/common/hashtable/hashtable-symbols.hpp diff --git a/src/common/hashtable/hashtable.cpp b/src/common/hashtable/hashtable.cpp index c641dad3c..6b87ff71f 100644 --- a/src/common/hashtable/hashtable.cpp +++ b/src/common/hashtable/hashtable.cpp @@ -10,11 +10,11 @@ #include #include -#include -#include +#include +#include -#include "hashtable.h" -#include "utils.h" +#include "hashtable.hpp" +#include "utils.hpp" /* seed_lock protects both seed_init and lttng_ht_seed. */ static pthread_mutex_t seed_lock = PTHREAD_MUTEX_INITIALIZER; diff --git a/src/common/hashtable/hashtable.h b/src/common/hashtable/hashtable.hpp similarity index 99% rename from src/common/hashtable/hashtable.h rename to src/common/hashtable/hashtable.hpp index e129ac5f8..bd5cb948e 100644 --- a/src/common/hashtable/hashtable.h +++ b/src/common/hashtable/hashtable.hpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include diff --git a/src/common/hashtable/seed.cpp b/src/common/hashtable/seed.cpp index 24da1bc95..b541c71cf 100644 --- a/src/common/hashtable/seed.cpp +++ b/src/common/hashtable/seed.cpp @@ -5,7 +5,7 @@ */ #define _LGPL_SOURCE -#include "hashtable.h" -#include "utils.h" +#include "hashtable.hpp" +#include "utils.hpp" unsigned long lttng_ht_seed; diff --git a/src/common/hashtable/utils.cpp b/src/common/hashtable/utils.cpp index 33a5edb9d..516deeb64 100644 --- a/src/common/hashtable/utils.cpp +++ b/src/common/hashtable/utils.cpp @@ -47,10 +47,10 @@ #include /* defines time_t for timings in the test */ #include -#include "utils.h" -#include /* attempt to define endianness */ -#include -#include +#include "utils.hpp" +#include /* attempt to define endianness */ +#include +#include /* * My best guess at if you are big-endian or little-endian. This may diff --git a/src/common/hashtable/utils.h b/src/common/hashtable/utils.hpp similarity index 100% rename from src/common/hashtable/utils.h rename to src/common/hashtable/utils.hpp diff --git a/src/common/health/health.cpp b/src/common/health/health.cpp index 8a07e6426..9d33ffd2f 100644 --- a/src/common/health/health.cpp +++ b/src/common/health/health.cpp @@ -13,12 +13,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include /* * An application-specific error state for unregistered thread keeps diff --git a/src/common/index-allocator.cpp b/src/common/index-allocator.cpp index c48d708d0..7fe18eb18 100644 --- a/src/common/index-allocator.cpp +++ b/src/common/index-allocator.cpp @@ -10,10 +10,10 @@ #include #include -#include "macros.h" -#include "error.h" +#include "macros.hpp" +#include "error.hpp" -#include "index-allocator.h" +#include "index-allocator.hpp" struct lttng_index_allocator { struct cds_list_head unused_list; diff --git a/src/common/index-allocator.h b/src/common/index-allocator.hpp similarity index 100% rename from src/common/index-allocator.h rename to src/common/index-allocator.hpp diff --git a/src/common/index/ctf-index.h b/src/common/index/ctf-index.hpp similarity index 97% rename from src/common/index/ctf-index.h rename to src/common/index/ctf-index.hpp index 7fc7fd834..2b9bc5428 100644 --- a/src/common/index/ctf-index.h +++ b/src/common/index/ctf-index.hpp @@ -10,8 +10,8 @@ #ifndef LTTNG_INDEX_H #define LTTNG_INDEX_H -#include -#include +#include +#include #include #include diff --git a/src/common/index/index.cpp b/src/common/index/index.cpp index 48d30e428..9d6895bae 100644 --- a/src/common/index/index.cpp +++ b/src/common/index/index.cpp @@ -13,12 +13,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include "index.h" +#include "index.hpp" #define WRITE_FILE_FLAGS (O_WRONLY | O_CREAT | O_TRUNC) #define READ_ONLY_FILE_FLAGS O_RDONLY diff --git a/src/common/index/index.h b/src/common/index/index.hpp similarity index 94% rename from src/common/index/index.h rename to src/common/index/index.hpp index 25ecc1975..00d8203d3 100644 --- a/src/common/index/index.h +++ b/src/common/index/index.hpp @@ -13,9 +13,9 @@ #include #include -#include "ctf-index.h" -#include -#include +#include "ctf-index.hpp" +#include +#include struct lttng_index_file { struct fs_handle *file; diff --git a/src/common/ini-config/ini-config.cpp b/src/common/ini-config/ini-config.cpp index 797de0164..98308c9f3 100644 --- a/src/common/ini-config/ini-config.cpp +++ b/src/common/ini-config/ini-config.cpp @@ -5,13 +5,13 @@ * */ -#include "ini-config.h" +#include "ini-config.hpp" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include LTTNG_EXPORT const char *config_str_yes = "yes"; diff --git a/src/common/ini-config/ini-config.h b/src/common/ini-config/ini-config.hpp similarity index 100% rename from src/common/ini-config/ini-config.h rename to src/common/ini-config/ini-config.hpp diff --git a/src/common/ini-config/ini.cpp b/src/common/ini-config/ini.cpp index 1d967a49d..d8ec8cf3e 100644 --- a/src/common/ini-config/ini.cpp +++ b/src/common/ini-config/ini.cpp @@ -36,9 +36,9 @@ #include #include #include -#include +#include -#include "ini.h" +#include "ini.hpp" #if !INI_USE_STACK #include diff --git a/src/common/ini-config/ini.h b/src/common/ini-config/ini.hpp similarity index 100% rename from src/common/ini-config/ini.h rename to src/common/ini-config/ini.hpp diff --git a/src/common/kernel-consumer/kernel-consumer.cpp b/src/common/kernel-consumer/kernel-consumer.cpp index fa3e8a553..95036a44c 100644 --- a/src/common/kernel-consumer/kernel-consumer.cpp +++ b/src/common/kernel-consumer/kernel-consumer.cpp @@ -20,25 +20,25 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "kernel-consumer.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "kernel-consumer.hpp" extern struct lttng_consumer_global_data the_consumer_data; extern int consumer_poll_timeout; diff --git a/src/common/kernel-consumer/kernel-consumer.h b/src/common/kernel-consumer/kernel-consumer.hpp similarity index 96% rename from src/common/kernel-consumer/kernel-consumer.h rename to src/common/kernel-consumer/kernel-consumer.hpp index bd885f838..7070cfaee 100644 --- a/src/common/kernel-consumer/kernel-consumer.h +++ b/src/common/kernel-consumer/kernel-consumer.hpp @@ -11,7 +11,7 @@ #define _LTTNG_KCONSUMER_H #include -#include +#include int lttng_kconsumer_take_snapshot(struct lttng_consumer_stream *stream); int lttng_kconsumer_sample_snapshot_positions( diff --git a/src/common/kernel-ctl/kernel-ctl.cpp b/src/common/kernel-ctl/kernel-ctl.cpp index 8a43239ef..059ab4b0d 100644 --- a/src/common/kernel-ctl/kernel-ctl.cpp +++ b/src/common/kernel-ctl/kernel-ctl.cpp @@ -12,14 +12,14 @@ #define __USE_LINUX_IOCTL_DEFS #include #include -#include -#include -#include +#include +#include +#include #include -#include +#include -#include "kernel-ctl.h" -#include "kernel-ioctl.h" +#include "kernel-ctl.hpp" +#include "kernel-ioctl.hpp" #define LTTNG_IOCTL_CHECK(fildes, request, ...) \ ({ \ diff --git a/src/common/kernel-ctl/kernel-ctl.h b/src/common/kernel-ctl/kernel-ctl.hpp similarity index 96% rename from src/common/kernel-ctl/kernel-ctl.h rename to src/common/kernel-ctl/kernel-ctl.hpp index f512e69f3..4f47488b5 100644 --- a/src/common/kernel-ctl/kernel-ctl.h +++ b/src/common/kernel-ctl/kernel-ctl.hpp @@ -12,9 +12,9 @@ #include #include -#include -#include -#include /* for struct lttng_filter_bytecode */ +#include +#include +#include /* for struct lttng_filter_bytecode */ int kernctl_create_session(int fd); int kernctl_open_metadata(int fd, struct lttng_channel_attr *chops); diff --git a/src/common/kernel-ctl/kernel-ioctl.h b/src/common/kernel-ctl/kernel-ioctl.hpp similarity index 100% rename from src/common/kernel-ctl/kernel-ioctl.h rename to src/common/kernel-ctl/kernel-ioctl.hpp diff --git a/src/common/kernel-probe.cpp b/src/common/kernel-probe.cpp index a05b451c3..979ca7311 100644 --- a/src/common/kernel-probe.cpp +++ b/src/common/kernel-probe.cpp @@ -6,16 +6,16 @@ */ #include "lttng/lttng-error.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include +#include #include #include #include diff --git a/src/common/location.cpp b/src/common/location.cpp index 80c4b4d55..7e6ea79b0 100644 --- a/src/common/location.cpp +++ b/src/common/location.cpp @@ -5,10 +5,10 @@ * */ -#include -#include +#include +#include #include -#include +#include static struct lttng_trace_archive_location *lttng_trace_archive_location_create( diff --git a/src/common/log-level-rule.cpp b/src/common/log-level-rule.cpp index e891222e0..766e8b25b 100644 --- a/src/common/log-level-rule.cpp +++ b/src/common/log-level-rule.cpp @@ -5,13 +5,13 @@ * */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/common/lttng-elf.cpp b/src/common/lttng-elf.cpp index 23d5cb7f0..47d66936f 100644 --- a/src/common/lttng-elf.cpp +++ b/src/common/lttng-elf.cpp @@ -8,11 +8,11 @@ */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/common/lttng-elf.h b/src/common/lttng-elf.hpp similarity index 100% rename from src/common/lttng-elf.h rename to src/common/lttng-elf.hpp diff --git a/src/common/lttng-kernel-old.h b/src/common/lttng-kernel-old.hpp similarity index 98% rename from src/common/lttng-kernel-old.h rename to src/common/lttng-kernel-old.hpp index c36c63358..2ffb75483 100644 --- a/src/common/lttng-kernel-old.h +++ b/src/common/lttng-kernel-old.hpp @@ -10,7 +10,7 @@ #define _LTTNG_KERNEL_OLD_H #include -#include +#include /* * LTTng DebugFS ABI structures. diff --git a/src/common/lttng-kernel.h b/src/common/lttng-kernel.hpp similarity index 99% rename from src/common/lttng-kernel.h rename to src/common/lttng-kernel.hpp index dd9db6f36..6b1f7985d 100644 --- a/src/common/lttng-kernel.h +++ b/src/common/lttng-kernel.hpp @@ -10,7 +10,7 @@ #define _LTTNG_KERNEL_H #include -#include +#include #include #include diff --git a/src/common/macros.h b/src/common/macros.hpp similarity index 99% rename from src/common/macros.h rename to src/common/macros.hpp index 8c35f0c5f..d2b78200e 100644 --- a/src/common/macros.h +++ b/src/common/macros.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include /* * Takes a pointer x and transform it so we can use it to access members diff --git a/src/common/mi-lttng.cpp b/src/common/mi-lttng.cpp index 94963b222..2a1dfa57d 100644 --- a/src/common/mi-lttng.cpp +++ b/src/common/mi-lttng.cpp @@ -8,12 +8,12 @@ #include "lttng/tracker.h" #define _LGPL_SOURCE -#include "mi-lttng.h" -#include -#include -#include +#include "mi-lttng.hpp" +#include +#include +#include #include -#include +#include #define MI_SCHEMA_MAJOR_VERSION 4 diff --git a/src/common/mi-lttng.h b/src/common/mi-lttng.hpp similarity index 99% rename from src/common/mi-lttng.h rename to src/common/mi-lttng.hpp index 78e04199a..182a189ba 100644 --- a/src/common/mi-lttng.h +++ b/src/common/mi-lttng.hpp @@ -11,9 +11,9 @@ #include -#include -#include -#include +#include +#include +#include #include /* Don't want to reference snapshot-internal.h here */ diff --git a/src/common/notification.cpp b/src/common/notification.cpp index 989c20ade..248dd42e7 100644 --- a/src/common/notification.cpp +++ b/src/common/notification.cpp @@ -5,14 +5,14 @@ * */ -#include -#include -#include +#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include struct lttng_notification *lttng_notification_create( struct lttng_trigger *trigger, diff --git a/src/common/optional.h b/src/common/optional.hpp similarity index 100% rename from src/common/optional.h rename to src/common/optional.hpp diff --git a/src/common/path.cpp b/src/common/path.cpp index ff2f86d65..1699cc5a6 100644 --- a/src/common/path.cpp +++ b/src/common/path.cpp @@ -8,9 +8,9 @@ */ #define _LGPL_SOURCE -#include -#include -#include +#include +#include +#include /* * Return a partial realpath(3) of the path even if the full path does not diff --git a/src/common/path.h b/src/common/path.hpp similarity index 100% rename from src/common/path.h rename to src/common/path.hpp diff --git a/src/common/payload-view.cpp b/src/common/payload-view.cpp index f446acacf..d5e67961b 100644 --- a/src/common/payload-view.cpp +++ b/src/common/payload-view.cpp @@ -5,10 +5,10 @@ * */ -#include -#include -#include "payload-view.h" -#include "payload.h" +#include +#include +#include "payload-view.hpp" +#include "payload.hpp" #include bool lttng_payload_view_is_valid(const struct lttng_payload_view *view) diff --git a/src/common/payload-view.h b/src/common/payload-view.hpp similarity index 98% rename from src/common/payload-view.h rename to src/common/payload-view.hpp index deaa9655c..06bb3d157 100644 --- a/src/common/payload-view.h +++ b/src/common/payload-view.hpp @@ -8,8 +8,8 @@ #ifndef LTTNG_PAYLOAD_VIEW_H #define LTTNG_PAYLOAD_VIEW_H -#include -#include +#include +#include struct lttng_payload; struct fd_handle; diff --git a/src/common/payload.cpp b/src/common/payload.cpp index 0097e65bc..fa07dae31 100644 --- a/src/common/payload.cpp +++ b/src/common/payload.cpp @@ -5,10 +5,10 @@ * */ -#include "payload.h" -#include -#include -#include +#include "payload.hpp" +#include +#include +#include static void release_fd_handle_ref(void *ptr) diff --git a/src/common/payload.h b/src/common/payload.hpp similarity index 93% rename from src/common/payload.h rename to src/common/payload.hpp index d6c0cc19e..9747f59ef 100644 --- a/src/common/payload.h +++ b/src/common/payload.hpp @@ -8,9 +8,9 @@ #ifndef LTTNG_PAYLOAD_H #define LTTNG_PAYLOAD_H -#include -#include -#include +#include +#include +#include /* * An lttng_payload encompasses the 'data' (bytes) and any passed file diff --git a/src/common/pipe.cpp b/src/common/pipe.cpp index 2de91f5a0..c2dce7881 100644 --- a/src/common/pipe.cpp +++ b/src/common/pipe.cpp @@ -11,9 +11,9 @@ #include #include -#include +#include -#include "pipe.h" +#include "pipe.hpp" /* * Lock read side of a pipe. diff --git a/src/common/pipe.h b/src/common/pipe.hpp similarity index 98% rename from src/common/pipe.h rename to src/common/pipe.hpp index d9f43d66e..d46e65d68 100644 --- a/src/common/pipe.h +++ b/src/common/pipe.hpp @@ -9,7 +9,7 @@ #define LTTNG_PIPE_H #include -#include +#include #include enum lttng_pipe_state { diff --git a/src/common/readwrite.cpp b/src/common/readwrite.cpp index 857781c6a..8e901c9fe 100644 --- a/src/common/readwrite.cpp +++ b/src/common/readwrite.cpp @@ -9,9 +9,9 @@ #include #include -#include +#include -#include "readwrite.h" +#include "readwrite.hpp" /* * lttng_read and lttng_write take care of EINTR and partial read/write. diff --git a/src/common/readwrite.h b/src/common/readwrite.hpp similarity index 96% rename from src/common/readwrite.h rename to src/common/readwrite.hpp index ac3668a5a..1818fdb26 100644 --- a/src/common/readwrite.h +++ b/src/common/readwrite.hpp @@ -9,7 +9,7 @@ */ #include -#include +#include /* * lttng_read and lttng_write take care of EINTR and partial read/write. diff --git a/src/common/relayd/relayd.cpp b/src/common/relayd/relayd.cpp index 6c2641ac0..28cab7bc5 100644 --- a/src/common/relayd/relayd.cpp +++ b/src/common/relayd/relayd.cpp @@ -12,16 +12,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "relayd.h" +#include +#include +#include +#include +#include +#include +#include +#include + +#include "relayd.hpp" static bool relayd_supports_chunks(const struct lttcomm_relayd_sock *sock) diff --git a/src/common/relayd/relayd.h b/src/common/relayd/relayd.hpp similarity index 94% rename from src/common/relayd/relayd.h rename to src/common/relayd/relayd.hpp index 1fbe22676..d4a903ace 100644 --- a/src/common/relayd/relayd.h +++ b/src/common/relayd/relayd.hpp @@ -11,10 +11,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include struct relayd_stream_rotation_position { uint64_t stream_id; diff --git a/src/common/runas.cpp b/src/common/runas.cpp index eae650ba5..d5b53f2dc 100644 --- a/src/common/runas.cpp +++ b/src/common/runas.cpp @@ -22,24 +22,24 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include -#include "runas.h" +#include "runas.hpp" #define GETPW_BUFFER_FALLBACK_SIZE 4096 diff --git a/src/common/runas.h b/src/common/runas.hpp similarity index 97% rename from src/common/runas.h rename to src/common/runas.hpp index 99c541f0a..1732286b8 100644 --- a/src/common/runas.h +++ b/src/common/runas.hpp @@ -13,8 +13,8 @@ #include #include -#include -#include +#include +#include /* * The run-as process is launched by forking without an exec*() call. This means diff --git a/src/common/session-descriptor.cpp b/src/common/session-descriptor.cpp index e8a602121..9867de83e 100644 --- a/src/common/session-descriptor.cpp +++ b/src/common/session-descriptor.cpp @@ -4,11 +4,11 @@ * SPDX-License-Identifier: LGPL-2.1-only */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/common/sessiond-comm/agent.h b/src/common/sessiond-comm/agent.hpp similarity index 98% rename from src/common/sessiond-comm/agent.h rename to src/common/sessiond-comm/agent.hpp index 92ac068fb..9fcb1f349 100644 --- a/src/common/sessiond-comm/agent.h +++ b/src/common/sessiond-comm/agent.hpp @@ -11,7 +11,7 @@ #include -#include +#include #include /* diff --git a/src/common/sessiond-comm/inet.cpp b/src/common/sessiond-comm/inet.cpp index 20eb613a8..30aa8c613 100644 --- a/src/common/sessiond-comm/inet.cpp +++ b/src/common/sessiond-comm/inet.cpp @@ -15,14 +15,14 @@ #include #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include -#include "inet.h" +#include "inet.hpp" #define RECONNECT_DELAY 200 /* ms */ diff --git a/src/common/sessiond-comm/inet.h b/src/common/sessiond-comm/inet.hpp similarity index 98% rename from src/common/sessiond-comm/inet.h rename to src/common/sessiond-comm/inet.hpp index fd7cffede..dca1cc154 100644 --- a/src/common/sessiond-comm/inet.h +++ b/src/common/sessiond-comm/inet.hpp @@ -10,7 +10,7 @@ #include -#include "sessiond-comm.h" +#include "sessiond-comm.hpp" /* See man tcp(7) for more detail about this value. */ #define LTTCOMM_INET_PROC_SYN_RETRIES_PATH "/proc/sys/net/ipv4/tcp_syn_retries" diff --git a/src/common/sessiond-comm/inet6.cpp b/src/common/sessiond-comm/inet6.cpp index adabebfae..caa4d7eb3 100644 --- a/src/common/sessiond-comm/inet6.cpp +++ b/src/common/sessiond-comm/inet6.cpp @@ -14,14 +14,14 @@ #include #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include -#include "inet6.h" +#include "inet6.hpp" #define RECONNECT_DELAY 200 /* ms */ diff --git a/src/common/sessiond-comm/inet6.h b/src/common/sessiond-comm/inet6.hpp similarity index 97% rename from src/common/sessiond-comm/inet6.h rename to src/common/sessiond-comm/inet6.hpp index b292848e3..d6122fdfa 100644 --- a/src/common/sessiond-comm/inet6.h +++ b/src/common/sessiond-comm/inet6.hpp @@ -10,7 +10,7 @@ #include -#include "sessiond-comm.h" +#include "sessiond-comm.hpp" /* Stub */ struct lttcomm_sock; diff --git a/src/common/sessiond-comm/relayd.h b/src/common/sessiond-comm/relayd.hpp similarity index 98% rename from src/common/sessiond-comm/relayd.h rename to src/common/sessiond-comm/relayd.hpp index 36a91070c..febbe4e73 100644 --- a/src/common/sessiond-comm/relayd.h +++ b/src/common/sessiond-comm/relayd.hpp @@ -13,11 +13,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #define RELAYD_VERSION_COMM_MAJOR VERSION_MAJOR #define RELAYD_VERSION_COMM_MINOR VERSION_MINOR diff --git a/src/common/sessiond-comm/sessiond-comm.cpp b/src/common/sessiond-comm/sessiond-comm.cpp index 9be0cbcac..7b20007a8 100644 --- a/src/common/sessiond-comm/sessiond-comm.cpp +++ b/src/common/sessiond-comm/sessiond-comm.cpp @@ -17,17 +17,17 @@ #include #include -#include -#include +#include +#include -#include "sessiond-comm.h" +#include "sessiond-comm.hpp" /* For Unix socket */ -#include +#include /* For Inet socket */ -#include "inet.h" +#include "inet.hpp" /* For Inet6 socket */ -#include "inet6.h" +#include "inet6.hpp" #define NETWORK_TIMEOUT_ENV "LTTNG_NETWORK_SOCKET_TIMEOUT" diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.hpp similarity index 98% rename from src/common/sessiond-comm/sessiond-comm.h rename to src/common/sessiond-comm/sessiond-comm.hpp index e327e014c..ae3111855 100644 --- a/src/common/sessiond-comm/sessiond-comm.h +++ b/src/common/sessiond-comm/sessiond-comm.hpp @@ -16,26 +16,26 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include "inet.h" -#include "inet6.h" -#include +#include "inet.hpp" +#include "inet6.hpp" +#include /* Queue size of listen(2) */ #define LTTNG_SESSIOND_COMM_MAX_LISTEN 64 diff --git a/src/common/shm.cpp b/src/common/shm.cpp index f1793d7a7..e3fa9b640 100644 --- a/src/common/shm.cpp +++ b/src/common/shm.cpp @@ -16,9 +16,9 @@ #include #include -#include +#include -#include "shm.h" +#include "shm.hpp" /* * Using fork to set umask in the child process (not multi-thread safe). We diff --git a/src/common/shm.h b/src/common/shm.hpp similarity index 100% rename from src/common/shm.h rename to src/common/shm.hpp diff --git a/src/common/snapshot.cpp b/src/common/snapshot.cpp index 5145dd120..618196dd8 100644 --- a/src/common/snapshot.cpp +++ b/src/common/snapshot.cpp @@ -5,12 +5,12 @@ * */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/common/snapshot.h b/src/common/snapshot.hpp similarity index 96% rename from src/common/snapshot.h rename to src/common/snapshot.hpp index 56f350899..d7442152f 100644 --- a/src/common/snapshot.h +++ b/src/common/snapshot.hpp @@ -8,7 +8,7 @@ #ifndef COMMON_SNAPSHOT_H #define COMMON_SNAPSHOT_H -#include +#include #include #include diff --git a/src/common/spawn-viewer.cpp b/src/common/spawn-viewer.cpp index e7d2ca02d..fe1158713 100644 --- a/src/common/spawn-viewer.cpp +++ b/src/common/spawn-viewer.cpp @@ -14,10 +14,10 @@ #include -#include -#include "error.h" -#include "macros.h" -#include "spawn-viewer.h" +#include +#include "error.hpp" +#include "macros.hpp" +#include "spawn-viewer.hpp" static const char *babeltrace_bin = CONFIG_BABELTRACE_BIN; diff --git a/src/common/spawn-viewer.h b/src/common/spawn-viewer.hpp similarity index 100% rename from src/common/spawn-viewer.h rename to src/common/spawn-viewer.hpp diff --git a/src/common/string-utils/format.h b/src/common/string-utils/format.hpp similarity index 100% rename from src/common/string-utils/format.h rename to src/common/string-utils/format.hpp diff --git a/src/common/string-utils/string-utils.cpp b/src/common/string-utils/string-utils.cpp index c2a508dd1..5cfcef256 100644 --- a/src/common/string-utils/string-utils.cpp +++ b/src/common/string-utils/string-utils.cpp @@ -15,8 +15,8 @@ #include #include -#include "string-utils.h" -#include "../macros.h" +#include "string-utils.hpp" +#include "../macros.hpp" enum star_glob_pattern_type_flags { STAR_GLOB_PATTERN_TYPE_FLAG_NONE = 0, diff --git a/src/common/string-utils/string-utils.h b/src/common/string-utils/string-utils.hpp similarity index 94% rename from src/common/string-utils/string-utils.h rename to src/common/string-utils/string-utils.hpp index 3cafa0f8a..4be165f9c 100644 --- a/src/common/string-utils/string-utils.h +++ b/src/common/string-utils/string-utils.hpp @@ -9,8 +9,8 @@ #define _STRING_UTILS_H #include -#include -#include +#include +#include void strutils_normalize_star_glob_pattern(char *pattern); diff --git a/src/common/testpoint/testpoint.cpp b/src/common/testpoint/testpoint.cpp index c70245894..4dfeadd81 100644 --- a/src/common/testpoint/testpoint.cpp +++ b/src/common/testpoint/testpoint.cpp @@ -12,7 +12,7 @@ #include /* for getenv */ #include /* for strncmp */ -#include "testpoint.h" +#include "testpoint.hpp" /* Environment variable used to enable the testpoints facilities. */ static const char *lttng_testpoint_env_var = "LTTNG_TESTPOINT_ENABLE"; diff --git a/src/common/testpoint/testpoint.h b/src/common/testpoint/testpoint.hpp similarity index 100% rename from src/common/testpoint/testpoint.h rename to src/common/testpoint/testpoint.hpp diff --git a/src/common/thread.cpp b/src/common/thread.cpp index 34a620679..fecc0064d 100644 --- a/src/common/thread.cpp +++ b/src/common/thread.cpp @@ -7,8 +7,8 @@ #include -#include -#include "thread.h" +#include +#include "thread.hpp" int lttng_thread_setname(const char *name) diff --git a/src/common/thread.h b/src/common/thread.hpp similarity index 93% rename from src/common/thread.h rename to src/common/thread.hpp index 3caa9dd99..3d4e7bd29 100644 --- a/src/common/thread.h +++ b/src/common/thread.hpp @@ -8,7 +8,7 @@ #ifndef LTTNG_THREAD_H #define LTTNG_THREAD_H -#include +#include /* * Set the current thread name on platforms that support it. The name can diff --git a/src/common/time.cpp b/src/common/time.cpp index 57078331c..714991246 100644 --- a/src/common/time.cpp +++ b/src/common/time.cpp @@ -5,11 +5,11 @@ * */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/common/time.h b/src/common/time.hpp similarity index 96% rename from src/common/time.h rename to src/common/time.hpp index 87adf17d7..724b202b1 100644 --- a/src/common/time.h +++ b/src/common/time.hpp @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include #define MSEC_PER_SEC 1000ULL #define NSEC_PER_SEC 1000000000ULL diff --git a/src/common/trace-chunk-registry.h b/src/common/trace-chunk-registry.hpp similarity index 98% rename from src/common/trace-chunk-registry.h rename to src/common/trace-chunk-registry.hpp index 5442d7997..e634e71e8 100644 --- a/src/common/trace-chunk-registry.h +++ b/src/common/trace-chunk-registry.hpp @@ -11,8 +11,8 @@ #include #include #include -#include -#include +#include +#include struct lttng_trace_chunk_registry; diff --git a/src/common/trace-chunk.cpp b/src/common/trace-chunk.cpp index 92cbd3c34..2bf1a3962 100644 --- a/src/common/trace-chunk.cpp +++ b/src/common/trace-chunk.cpp @@ -5,23 +5,23 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/common/trace-chunk.h b/src/common/trace-chunk.hpp similarity index 97% rename from src/common/trace-chunk.h rename to src/common/trace-chunk.hpp index 4e4440b6a..cf038b951 100644 --- a/src/common/trace-chunk.h +++ b/src/common/trace-chunk.hpp @@ -8,10 +8,10 @@ #ifndef LTTNG_TRACE_CHUNK_H #define LTTNG_TRACE_CHUNK_H -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/common/tracker.cpp b/src/common/tracker.cpp index 0cd0e9027..6bb84d0ca 100644 --- a/src/common/tracker.cpp +++ b/src/common/tracker.cpp @@ -10,11 +10,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/src/common/tracker.h b/src/common/tracker.hpp similarity index 93% rename from src/common/tracker.h rename to src/common/tracker.hpp index 8b3794049..7f4702a7d 100644 --- a/src/common/tracker.h +++ b/src/common/tracker.hpp @@ -12,10 +12,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include struct process_attr_value { enum lttng_process_attr_value_type type; diff --git a/src/common/trigger.cpp b/src/common/trigger.cpp index 2796903fc..be2c49b7c 100644 --- a/src/common/trigger.cpp +++ b/src/common/trigger.cpp @@ -5,24 +5,24 @@ * */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include #include -#include -#include +#include +#include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include bool lttng_trigger_validate(const struct lttng_trigger *trigger) diff --git a/src/common/unix.cpp b/src/common/unix.cpp index 4861b8ea1..0a1b1a5a5 100644 --- a/src/common/unix.cpp +++ b/src/common/unix.cpp @@ -15,12 +15,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include "unix.h" +#include "unix.hpp" /* * Connect to unix socket using the path name. diff --git a/src/common/unix.h b/src/common/unix.hpp similarity index 93% rename from src/common/unix.h rename to src/common/unix.hpp index e7f9e7919..22ddf2edb 100644 --- a/src/common/unix.h +++ b/src/common/unix.hpp @@ -11,10 +11,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include int lttcomm_create_unix_sock(const char *pathname); int lttcomm_create_anon_unix_socketpair(int *fds); diff --git a/src/common/uri.cpp b/src/common/uri.cpp index 393eba815..b15fe25db 100644 --- a/src/common/uri.cpp +++ b/src/common/uri.cpp @@ -7,16 +7,16 @@ #define _LGPL_SOURCE #include -#include +#include #include #include #include -#include -#include -#include +#include +#include +#include -#include "uri.h" +#include "uri.hpp" #define LOOPBACK_ADDR_IPV4 "127.0.0.1" #define LOOPBACK_ADDR_IPV6 "::1" diff --git a/src/common/uri.h b/src/common/uri.hpp similarity index 98% rename from src/common/uri.h rename to src/common/uri.hpp index 7f6ab00a1..fe5c02afd 100644 --- a/src/common/uri.h +++ b/src/common/uri.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include /* Destination type of lttng URI */ enum lttng_dst_type { diff --git a/src/common/userspace-probe.cpp b/src/common/userspace-probe.cpp index 4ade5d84f..7eb4a6d91 100644 --- a/src/common/userspace-probe.cpp +++ b/src/common/userspace-probe.cpp @@ -6,18 +6,18 @@ */ #include "lttng/lttng-error.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include +#include #include #include #include diff --git a/src/common/ust-consumer/ust-consumer.cpp b/src/common/ust-consumer/ust-consumer.cpp index aeafae642..5e9a442eb 100644 --- a/src/common/ust-consumer/ust-consumer.cpp +++ b/src/common/ust-consumer/ust-consumer.cpp @@ -25,22 +25,22 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "ust-consumer.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ust-consumer.hpp" #define INT_MAX_STR_LEN 12 /* includes \0 */ diff --git a/src/common/ust-consumer/ust-consumer.h b/src/common/ust-consumer/ust-consumer.hpp similarity index 99% rename from src/common/ust-consumer/ust-consumer.h rename to src/common/ust-consumer/ust-consumer.hpp index e6590c33c..6fc0dedcb 100644 --- a/src/common/ust-consumer/ust-consumer.h +++ b/src/common/ust-consumer/ust-consumer.hpp @@ -9,8 +9,8 @@ #ifndef _LTTNG_USTCONSUMER_H #define _LTTNG_USTCONSUMER_H -#include -#include +#include +#include #include #ifdef HAVE_LIBLTTNG_UST_CTL diff --git a/src/common/utils.cpp b/src/common/utils.cpp index 5e116a9ab..eb6b00143 100644 --- a/src/common/utils.cpp +++ b/src/common/utils.cpp @@ -6,36 +6,33 @@ * */ -#include "common/macros.h" -#include #define _LGPL_SOURCE #include #include +#include +#include #include +#include #include +#include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include "utils.h" -#include "defaults.h" -#include "time.h" +#include "defaults.hpp" +#include "time.hpp" +#include "utils.hpp" #define PROC_MEMINFO_PATH "/proc/meminfo" #define PROC_MEMINFO_MEMAVAILABLE_LINE "MemAvailable:" diff --git a/src/common/utils.h b/src/common/utils.hpp similarity index 98% rename from src/common/utils.h rename to src/common/utils.hpp index 8b6003b92..0c60a234a 100644 --- a/src/common/utils.h +++ b/src/common/utils.hpp @@ -15,7 +15,7 @@ #include #include -#include +#include #define KIBI_LOG2 10 #define MEBI_LOG2 20 diff --git a/src/common/uuid.cpp b/src/common/uuid.cpp index 77b9a767b..558110fc0 100644 --- a/src/common/uuid.cpp +++ b/src/common/uuid.cpp @@ -6,7 +6,7 @@ * */ -#include +#include #include #include #include @@ -14,7 +14,7 @@ #include #include -#include "uuid.h" +#include "uuid.hpp" static const lttng_uuid nil_uuid = { 0 }; static bool lttng_uuid_is_init; diff --git a/src/common/uuid.h b/src/common/uuid.hpp similarity index 98% rename from src/common/uuid.h rename to src/common/uuid.hpp index 0d3e79aee..431490ef2 100644 --- a/src/common/uuid.h +++ b/src/common/uuid.hpp @@ -8,7 +8,7 @@ #ifndef LTTNG_UUID_H #define LTTNG_UUID_H -#include +#include #include #include #include diff --git a/src/common/waiter.cpp b/src/common/waiter.cpp index aca88eb4d..3ddb68feb 100644 --- a/src/common/waiter.cpp +++ b/src/common/waiter.cpp @@ -6,10 +6,10 @@ * */ -#include "waiter.h" +#include "waiter.hpp" #include #include -#include "error.h" +#include "error.hpp" #include /* diff --git a/src/common/waiter.h b/src/common/waiter.hpp similarity index 97% rename from src/common/waiter.h rename to src/common/waiter.hpp index ed870aeb0..75c9ac447 100644 --- a/src/common/waiter.h +++ b/src/common/waiter.hpp @@ -15,7 +15,7 @@ #include #include #include -#include "macros.h" +#include "macros.hpp" struct lttng_waiter { struct cds_wfs_node wait_queue_node; diff --git a/src/lib/lttng-ctl/Makefile.am b/src/lib/lttng-ctl/Makefile.am index 8d559c9ca..2cf4c36d4 100644 --- a/src/lib/lttng-ctl/Makefile.am +++ b/src/lib/lttng-ctl/Makefile.am @@ -11,7 +11,7 @@ liblttng_ctl_la_SOURCES = \ load.cpp \ lttng-ctl.cpp \ lttng-ctl-health.cpp \ - lttng-ctl-helper.h \ + lttng-ctl-helper.hpp \ rotate.cpp \ save.cpp \ snapshot.cpp \ diff --git a/src/lib/lttng-ctl/channel.cpp b/src/lib/lttng-ctl/channel.cpp index f464e7000..080dbb443 100644 --- a/src/lib/lttng-ctl/channel.cpp +++ b/src/lib/lttng-ctl/channel.cpp @@ -5,20 +5,20 @@ * */ -#include -#include -#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include "lttng-ctl-helper.h" -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "lttng-ctl-helper.hpp" +#include static int handshake(struct lttng_notification_channel *channel); diff --git a/src/lib/lttng-ctl/clear.cpp b/src/lib/lttng-ctl/clear.cpp index fb2b1cae9..114758b0c 100644 --- a/src/lib/lttng-ctl/clear.cpp +++ b/src/lib/lttng-ctl/clear.cpp @@ -13,14 +13,14 @@ #include #include #include -#include -#include -#include -#include -#include -#include - -#include "lttng-ctl-helper.h" +#include +#include +#include +#include +#include +#include + +#include "lttng-ctl-helper.hpp" enum communication_state { COMMUNICATION_STATE_RECEIVE_LTTNG_MSG, diff --git a/src/lib/lttng-ctl/destruction-handle.cpp b/src/lib/lttng-ctl/destruction-handle.cpp index 0bfa303d8..d937b2c73 100644 --- a/src/lib/lttng-ctl/destruction-handle.cpp +++ b/src/lib/lttng-ctl/destruction-handle.cpp @@ -8,16 +8,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "lttng-ctl-helper.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "lttng-ctl-helper.hpp" #include #include diff --git a/src/lib/lttng-ctl/event.cpp b/src/lib/lttng-ctl/event.cpp index 3a6bf22b2..e89aae482 100644 --- a/src/lib/lttng-ctl/event.cpp +++ b/src/lib/lttng-ctl/event.cpp @@ -12,12 +12,12 @@ #define _LGPL_SOURCE #include -#include -#include -#include +#include +#include +#include #include #include -#include +#include struct lttng_event *lttng_event_create(void) { diff --git a/src/lib/lttng-ctl/load.cpp b/src/lib/lttng-ctl/load.cpp index 0032df569..4a07f4212 100644 --- a/src/lib/lttng-ctl/load.cpp +++ b/src/lib/lttng-ctl/load.cpp @@ -11,14 +11,14 @@ #include #include -#include -#include -#include -#include -#include -#include - -#include "lttng-ctl-helper.h" +#include +#include +#include +#include +#include +#include + +#include "lttng-ctl-helper.hpp" struct lttng_load_session_attr *lttng_load_session_attr_create(void) { diff --git a/src/lib/lttng-ctl/lttng-ctl-health.cpp b/src/lib/lttng-ctl/lttng-ctl-health.cpp index d061d9bea..4821548e5 100644 --- a/src/lib/lttng-ctl/lttng-ctl-health.cpp +++ b/src/lib/lttng-ctl/lttng-ctl-health.cpp @@ -16,16 +16,16 @@ #include #include #include -#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include "lttng-ctl-helper.h" +#include "lttng-ctl-helper.hpp" enum health_component { HEALTH_COMPONENT_SESSIOND, diff --git a/src/lib/lttng-ctl/lttng-ctl-helper.h b/src/lib/lttng-ctl/lttng-ctl-helper.hpp similarity index 97% rename from src/lib/lttng-ctl/lttng-ctl-helper.h rename to src/lib/lttng-ctl/lttng-ctl-helper.hpp index b10acd5fe..4b025a4e2 100644 --- a/src/lib/lttng-ctl/lttng-ctl-helper.h +++ b/src/lib/lttng-ctl/lttng-ctl-helper.hpp @@ -10,7 +10,7 @@ #include -#include +#include #include /* Copy helper functions. */ diff --git a/src/lib/lttng-ctl/lttng-ctl.cpp b/src/lib/lttng-ctl/lttng-ctl.cpp index 68f8c1f7e..c5d47ebdc 100644 --- a/src/lib/lttng-ctl/lttng-ctl.cpp +++ b/src/lib/lttng-ctl/lttng-ctl.cpp @@ -18,38 +18,38 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include "lttng-ctl-helper.h" -#include +#include "lttng-ctl-helper.hpp" +#include #include -#include +#include #define COPY_DOMAIN_PACKED(dst, src) \ do { \ diff --git a/src/lib/lttng-ctl/rotate.cpp b/src/lib/lttng-ctl/rotate.cpp index ed198922e..b6a66392a 100644 --- a/src/lib/lttng-ctl/rotate.cpp +++ b/src/lib/lttng-ctl/rotate.cpp @@ -10,12 +10,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include "lttng-ctl-helper.h" +#include "lttng-ctl-helper.hpp" static enum lttng_rotation_status ask_rotation_info( diff --git a/src/lib/lttng-ctl/save.cpp b/src/lib/lttng-ctl/save.cpp index 45894277a..7843df300 100644 --- a/src/lib/lttng-ctl/save.cpp +++ b/src/lib/lttng-ctl/save.cpp @@ -10,10 +10,10 @@ #include #include -#include -#include +#include +#include -#include "lttng-ctl-helper.h" +#include "lttng-ctl-helper.hpp" struct lttng_save_session_attr *lttng_save_session_attr_create(void) { diff --git a/src/lib/lttng-ctl/snapshot.cpp b/src/lib/lttng-ctl/snapshot.cpp index b50403512..b9bac9aa8 100644 --- a/src/lib/lttng-ctl/snapshot.cpp +++ b/src/lib/lttng-ctl/snapshot.cpp @@ -8,12 +8,12 @@ #define _LGPL_SOURCE #include -#include +#include #include #include -#include +#include -#include "lttng-ctl-helper.h" +#include "lttng-ctl-helper.hpp" /* * Add an output object to a session identified by name. diff --git a/src/lib/lttng-ctl/tracker.cpp b/src/lib/lttng-ctl/tracker.cpp index b7fc1f78a..53deced1d 100644 --- a/src/lib/lttng-ctl/tracker.cpp +++ b/src/lib/lttng-ctl/tracker.cpp @@ -5,14 +5,14 @@ * */ -#include +#include +#include -#include "lttng-ctl-helper.h" -#include "lttng/domain.h" -#include "lttng/lttng-error.h" -#include -#include +#include "lttng-ctl-helper.hpp" +#include +#include #include +#include struct lttng_process_attr_tracker_handle { char *session_name; diff --git a/src/vendor/msgpack/lttng-config.h b/src/vendor/msgpack/lttng-config.h index d2f49b281..bd5da44f6 100644 --- a/src/vendor/msgpack/lttng-config.h +++ b/src/vendor/msgpack/lttng-config.h @@ -9,7 +9,7 @@ #define MSGPACK_LTTNG_CONFIG_H #include -#include +#include #if BYTE_ORDER == LITTLE_ENDIAN #define MSGPACK_ENDIAN_LITTLE_BYTE 1 diff --git a/tests/regression/kernel/select_poll_epoll.cpp b/tests/regression/kernel/select_poll_epoll.cpp index d3a21e2fc..5dabf55b6 100644 --- a/tests/regression/kernel/select_poll_epoll.cpp +++ b/tests/regression/kernel/select_poll_epoll.cpp @@ -5,27 +5,28 @@ * */ -#include +#include +#include #include +#include +#include #include -#include -#include -#include -#include -#include +#include +#include #include #include -#include -#include #include -#include -#include -#include -#include -#include #include -#include -#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include #define BUF_SIZE 256 #define NB_FD 1 diff --git a/tests/regression/tools/live/live_test.cpp b/tests/regression/tools/live/live_test.cpp index 76d801e9b..439d862d4 100644 --- a/tests/regression/tools/live/live_test.cpp +++ b/tests/regression/tools/live/live_test.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include @@ -24,13 +24,13 @@ #include #include -#include +#include -#include -#include +#include +#include -#include -#include +#include +#include #define SESSION1 "test1" #define RELAYD_URL "net://localhost" diff --git a/tests/regression/tools/notification/consumer_testpoints.cpp b/tests/regression/tools/notification/consumer_testpoints.cpp index 05db3421a..9f2314acb 100644 --- a/tests/regression/tools/notification/consumer_testpoints.cpp +++ b/tests/regression/tools/notification/consumer_testpoints.cpp @@ -5,10 +5,10 @@ * */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/tests/regression/tools/notification/default_pipe_size_getter.cpp b/tests/regression/tools/notification/default_pipe_size_getter.cpp index 40e2e126f..21efa3996 100644 --- a/tests/regression/tools/notification/default_pipe_size_getter.cpp +++ b/tests/regression/tools/notification/default_pipe_size_getter.cpp @@ -14,8 +14,8 @@ #include #include -#include -#include +#include +#include int lttng_opt_verbose; int lttng_opt_mi; diff --git a/tests/regression/tools/notification/notification.cpp b/tests/regression/tools/notification/notification.cpp index c6205ef63..15f98bf9a 100644 --- a/tests/regression/tools/notification/notification.cpp +++ b/tests/regression/tools/notification/notification.cpp @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/tests/regression/tools/notification/sessiond_testpoints.cpp b/tests/regression/tools/notification/sessiond_testpoints.cpp index fa3fe7f41..f0517ed14 100644 --- a/tests/regression/tools/notification/sessiond_testpoints.cpp +++ b/tests/regression/tools/notification/sessiond_testpoints.cpp @@ -6,10 +6,10 @@ * */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/tests/regression/tools/trigger/hidden/hidden_trigger.cpp b/tests/regression/tools/trigger/hidden/hidden_trigger.cpp index 62c8f5dd0..969cab11e 100644 --- a/tests/regression/tools/trigger/hidden/hidden_trigger.cpp +++ b/tests/regression/tools/trigger/hidden/hidden_trigger.cpp @@ -17,7 +17,7 @@ #include -#include +#include #include #define TEST_COUNT 1 diff --git a/tests/regression/tools/trigger/name/trigger_name.cpp b/tests/regression/tools/trigger/name/trigger_name.cpp index 11459d4bd..1e2a676dc 100644 --- a/tests/regression/tools/trigger/name/trigger_name.cpp +++ b/tests/regression/tools/trigger/name/trigger_name.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #define TEST_COUNT 70 diff --git a/tests/regression/tools/trigger/utils/register-some-triggers.cpp b/tests/regression/tools/trigger/utils/register-some-triggers.cpp index 54eb78303..cbcfbfb82 100644 --- a/tests/regression/tools/trigger/utils/register-some-triggers.cpp +++ b/tests/regression/tools/trigger/utils/register-some-triggers.cpp @@ -7,8 +7,8 @@ /* Utility to register some triggers, for test purposes. */ -#include -#include +#include +#include #include #include diff --git a/tests/regression/ust/clock-override/lttng-ust-clock-override-test.c b/tests/regression/ust/clock-override/lttng-ust-clock-override-test.c index a12a5b76b..a38cd515e 100644 --- a/tests/regression/ust/clock-override/lttng-ust-clock-override-test.c +++ b/tests/regression/ust/clock-override/lttng-ust-clock-override-test.c @@ -11,7 +11,7 @@ */ #include -#include +#include #include #include #include diff --git a/tests/regression/ust/getcpu-override/lttng-ust-getcpu-override-test.c b/tests/regression/ust/getcpu-override/lttng-ust-getcpu-override-test.c index dbe6c1d86..80240f1f5 100644 --- a/tests/regression/ust/getcpu-override/lttng-ust-getcpu-override-test.c +++ b/tests/regression/ust/getcpu-override/lttng-ust-getcpu-override-test.c @@ -10,7 +10,7 @@ */ #include -#include +#include #include #include #include diff --git a/tests/regression/ust/ust-dl/prog.c b/tests/regression/ust/ust-dl/prog.c index bab2644cc..e4288928f 100644 --- a/tests/regression/ust/ust-dl/prog.c +++ b/tests/regression/ust/ust-dl/prog.c @@ -11,7 +11,7 @@ #include #include -#include +#include /* * libfoo has a direct dependency on libbar. diff --git a/tests/unit/ini_config/ini_config.cpp b/tests/unit/ini_config/ini_config.cpp index e1c65e917..874f47f9b 100644 --- a/tests/unit/ini_config/ini_config.cpp +++ b/tests/unit/ini_config/ini_config.cpp @@ -6,9 +6,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/tests/unit/test_action.cpp b/tests/unit/test_action.cpp index 8657be1dc..de2197ed0 100644 --- a/tests/unit/test_action.cpp +++ b/tests/unit/test_action.cpp @@ -16,12 +16,12 @@ #include -#include -#include -#include +#include +#include +#include #include #include -#include +#include #include #include #include diff --git a/tests/unit/test_buffer_view.cpp b/tests/unit/test_buffer_view.cpp index a129d4a9a..764549b83 100644 --- a/tests/unit/test_buffer_view.cpp +++ b/tests/unit/test_buffer_view.cpp @@ -6,7 +6,7 @@ */ -#include +#include #include static const int TEST_COUNT = 5; diff --git a/tests/unit/test_condition.cpp b/tests/unit/test_condition.cpp index 627190109..9ed6b8941 100644 --- a/tests/unit/test_condition.cpp +++ b/tests/unit/test_condition.cpp @@ -18,13 +18,13 @@ #include #include -#include +#include #include -#include +#include #include #include -#include -#include +#include +#include /* For error.h */ int lttng_opt_quiet = 1; diff --git a/tests/unit/test_directory_handle.cpp b/tests/unit/test_directory_handle.cpp index 8dd7dd11a..8a4e61499 100644 --- a/tests/unit/test_directory_handle.cpp +++ b/tests/unit/test_directory_handle.cpp @@ -14,9 +14,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #define TEST_COUNT 9 diff --git a/tests/unit/test_event_expr_to_bytecode.cpp b/tests/unit/test_event_expr_to_bytecode.cpp index fae7eb26e..577dea932 100644 --- a/tests/unit/test_event_expr_to_bytecode.cpp +++ b/tests/unit/test_event_expr_to_bytecode.cpp @@ -5,8 +5,8 @@ * */ -#include -#include +#include +#include #include #include diff --git a/tests/unit/test_event_rule.cpp b/tests/unit/test_event_rule.cpp index d0e33a1f8..351937444 100644 --- a/tests/unit/test_event_rule.cpp +++ b/tests/unit/test_event_rule.cpp @@ -14,29 +14,29 @@ #include -#include -#include +#include +#include #include -#include +#include #include -#include +#include #include -#include +#include #include -#include +#include #include -#include +#include #include -#include +#include #include -#include +#include #include #include -#include +#include #include -#include +#include #include -#include "bin/lttng/loglevel.h" +#include "bin/lttng/loglevel.hpp" /* For error.h. */ int lttng_opt_quiet = 1; diff --git a/tests/unit/test_fd_tracker.cpp b/tests/unit/test_fd_tracker.cpp index 544dc84ea..63f3d0afa 100644 --- a/tests/unit/test_fd_tracker.cpp +++ b/tests/unit/test_fd_tracker.cpp @@ -21,11 +21,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* For error.h */ int lttng_opt_quiet = 1; diff --git a/tests/unit/test_kernel_data.cpp b/tests/unit/test_kernel_data.cpp index cf2f53564..eae335be2 100644 --- a/tests/unit/test_kernel_data.cpp +++ b/tests/unit/test_kernel_data.cpp @@ -11,9 +11,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/tests/unit/test_kernel_probe.cpp b/tests/unit/test_kernel_probe.cpp index 91211eb4e..1ec6945d4 100644 --- a/tests/unit/test_kernel_probe.cpp +++ b/tests/unit/test_kernel_probe.cpp @@ -14,9 +14,9 @@ #include -#include -#include -#include +#include +#include +#include #include /* For error.h */ diff --git a/tests/unit/test_log_level_rule.cpp b/tests/unit/test_log_level_rule.cpp index 894800665..b756387fb 100644 --- a/tests/unit/test_log_level_rule.cpp +++ b/tests/unit/test_log_level_rule.cpp @@ -14,9 +14,9 @@ #include -#include -#include -#include +#include +#include +#include #include /* For error.h. */ diff --git a/tests/unit/test_notification.cpp b/tests/unit/test_notification.cpp index 8e2006f3d..e870cbef6 100644 --- a/tests/unit/test_notification.cpp +++ b/tests/unit/test_notification.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include /* For error.h */ int lttng_opt_quiet = 1; diff --git a/tests/unit/test_payload.cpp b/tests/unit/test_payload.cpp index 53565f5eb..de50ed383 100644 --- a/tests/unit/test_payload.cpp +++ b/tests/unit/test_payload.cpp @@ -7,9 +7,9 @@ #include -#include -#include -#include +#include +#include +#include #include static const int TEST_COUNT = 5; diff --git a/tests/unit/test_rate_policy.cpp b/tests/unit/test_rate_policy.cpp index d9ae4b7b6..95c095f5a 100644 --- a/tests/unit/test_rate_policy.cpp +++ b/tests/unit/test_rate_policy.cpp @@ -14,9 +14,9 @@ #include -#include -#include -#include +#include +#include +#include #include /* For error.h. */ diff --git a/tests/unit/test_relayd_backward_compat_group_by_session.cpp b/tests/unit/test_relayd_backward_compat_group_by_session.cpp index 1fde89cbe..42cb0156a 100644 --- a/tests/unit/test_relayd_backward_compat_group_by_session.cpp +++ b/tests/unit/test_relayd_backward_compat_group_by_session.cpp @@ -11,9 +11,9 @@ #include #include -#include +#include -#include "backward-compatibility-group-by.h" +#include "backward-compatibility-group-by.hpp" /* Number of TAP tests in this file */ #define NUM_TESTS_PER_TEST 1 diff --git a/tests/unit/test_session.cpp b/tests/unit/test_session.cpp index c403e2355..05c1f81b6 100644 --- a/tests/unit/test_session.cpp +++ b/tests/unit/test_session.cpp @@ -8,20 +8,20 @@ #include #include #include -#include -#include #include +#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #define SESSION1 "test1" diff --git a/tests/unit/test_string_utils.cpp b/tests/unit/test_string_utils.cpp index 9f1f45094..ff06bf9b6 100644 --- a/tests/unit/test_string_utils.cpp +++ b/tests/unit/test_string_utils.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include /* Number of TAP tests in this file */ diff --git a/tests/unit/test_unix_socket.cpp b/tests/unit/test_unix_socket.cpp index 2d59ba8ee..2ff65a679 100644 --- a/tests/unit/test_unix_socket.cpp +++ b/tests/unit/test_unix_socket.cpp @@ -6,16 +6,16 @@ */ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include +#include #include #include #include diff --git a/tests/unit/test_uri.cpp b/tests/unit/test_uri.cpp index a65ce6218..e89396e34 100644 --- a/tests/unit/test_uri.cpp +++ b/tests/unit/test_uri.cpp @@ -9,7 +9,7 @@ #include -#include +#include /* For error.h */ int lttng_opt_quiet = 1; diff --git a/tests/unit/test_ust_data.cpp b/tests/unit/test_ust_data.cpp index e62f6b571..9cfdac4f3 100644 --- a/tests/unit/test_ust_data.cpp +++ b/tests/unit/test_ust_data.cpp @@ -13,12 +13,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/tests/unit/test_utils_compat_poll.cpp b/tests/unit/test_utils_compat_poll.cpp index eb6d94a5e..f34ef5d0e 100644 --- a/tests/unit/test_utils_compat_poll.cpp +++ b/tests/unit/test_utils_compat_poll.cpp @@ -18,10 +18,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include /* Verification without trashing test order in the child process */ #define childok(e, test, ...) do { \ diff --git a/tests/unit/test_utils_compat_pthread.cpp b/tests/unit/test_utils_compat_pthread.cpp index 2ce437372..55e584b8b 100644 --- a/tests/unit/test_utils_compat_pthread.cpp +++ b/tests/unit/test_utils_compat_pthread.cpp @@ -7,7 +7,7 @@ #include #include -#include "common/compat/pthread.h" +#include "common/compat/pthread.hpp" #include diff --git a/tests/unit/test_utils_expand_path.cpp b/tests/unit/test_utils_expand_path.cpp index e85cbbced..3cb1a8160 100644 --- a/tests/unit/test_utils_expand_path.cpp +++ b/tests/unit/test_utils_expand_path.cpp @@ -15,9 +15,9 @@ #include -#include -#include -#include +#include +#include +#include /* For error.h */ int lttng_opt_quiet = 1; diff --git a/tests/unit/test_utils_parse_size_suffix.cpp b/tests/unit/test_utils_parse_size_suffix.cpp index 2cd917272..296ed88b8 100644 --- a/tests/unit/test_utils_parse_size_suffix.cpp +++ b/tests/unit/test_utils_parse_size_suffix.cpp @@ -10,7 +10,7 @@ #include -#include +#include /* For error.h */ int lttng_opt_quiet = 1; diff --git a/tests/unit/test_utils_parse_time_suffix.cpp b/tests/unit/test_utils_parse_time_suffix.cpp index e444464bc..97c2c78ba 100644 --- a/tests/unit/test_utils_parse_time_suffix.cpp +++ b/tests/unit/test_utils_parse_time_suffix.cpp @@ -11,7 +11,7 @@ #include -#include +#include /* For error.h */ int lttng_opt_quiet = 1; diff --git a/tests/unit/test_uuid.cpp b/tests/unit/test_uuid.cpp index 2355084a5..26ec6b6c6 100644 --- a/tests/unit/test_uuid.cpp +++ b/tests/unit/test_uuid.cpp @@ -11,7 +11,7 @@ #include -#include "common/uuid.h" +#include "common/uuid.hpp" #define NR_TESTS 21 diff --git a/tests/utils/testapp/Makefile.am b/tests/utils/testapp/Makefile.am index 5b3805c6b..55a7ba7eb 100644 --- a/tests/utils/testapp/Makefile.am +++ b/tests/utils/testapp/Makefile.am @@ -24,4 +24,4 @@ SUBDIRS += \ gen-ust-events-ns endif # IS_LINUX -noinst_HEADERS = signal-helper.h +noinst_HEADERS = signal-helper.hpp diff --git a/tests/utils/testapp/gen-ns-events/gen-ns-events.cpp b/tests/utils/testapp/gen-ns-events/gen-ns-events.cpp index 7ecf22b35..80afdb6d6 100644 --- a/tests/utils/testapp/gen-ns-events/gen-ns-events.cpp +++ b/tests/utils/testapp/gen-ns-events/gen-ns-events.cpp @@ -20,10 +20,10 @@ #include #include -#include -#include +#include +#include -#include "signal-helper.h" +#include "signal-helper.hpp" #include "utils.h" #define LTTNG_PROC_NS_PATH_MAX 40 diff --git a/tests/utils/testapp/gen-syscall-events/gen-syscall-events.cpp b/tests/utils/testapp/gen-syscall-events/gen-syscall-events.cpp index 6a246867d..9b19d2d2d 100644 --- a/tests/utils/testapp/gen-syscall-events/gen-syscall-events.cpp +++ b/tests/utils/testapp/gen-syscall-events/gen-syscall-events.cpp @@ -9,8 +9,8 @@ #include #include #include -#include -#include +#include +#include #include "utils.h" diff --git a/tests/utils/testapp/gen-ust-events-ns/gen-ust-events-ns.cpp b/tests/utils/testapp/gen-ust-events-ns/gen-ust-events-ns.cpp index 84d8bf563..ba506b113 100644 --- a/tests/utils/testapp/gen-ust-events-ns/gen-ust-events-ns.cpp +++ b/tests/utils/testapp/gen-ust-events-ns/gen-ust-events-ns.cpp @@ -19,10 +19,10 @@ #include #include -#include -#include +#include +#include -#include "signal-helper.h" +#include "signal-helper.hpp" #include "utils.h" #define TRACEPOINT_DEFINE diff --git a/tests/utils/testapp/gen-ust-events/gen-ust-events.cpp b/tests/utils/testapp/gen-ust-events/gen-ust-events.cpp index cf8819977..b66f1ce8c 100644 --- a/tests/utils/testapp/gen-ust-events/gen-ust-events.cpp +++ b/tests/utils/testapp/gen-ust-events/gen-ust-events.cpp @@ -22,7 +22,7 @@ #include #include #include "utils.h" -#include "signal-helper.h" +#include "signal-helper.hpp" #define TRACEPOINT_DEFINE #include "tp.h" diff --git a/tests/utils/testapp/gen-ust-nevents-str/gen-ust-nevents-str.cpp b/tests/utils/testapp/gen-ust-nevents-str/gen-ust-nevents-str.cpp index d68501bee..d59dfa3d8 100644 --- a/tests/utils/testapp/gen-ust-nevents-str/gen-ust-nevents-str.cpp +++ b/tests/utils/testapp/gen-ust-nevents-str/gen-ust-nevents-str.cpp @@ -7,7 +7,7 @@ #define _LGPL_SOURCE #include -#include "signal-helper.h" +#include "signal-helper.hpp" #define TRACEPOINT_DEFINE #include "tp.h" diff --git a/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.cpp b/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.cpp index ec71023de..a2aae040f 100644 --- a/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.cpp +++ b/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.cpp @@ -17,7 +17,7 @@ #include #include #include "utils.h" -#include "signal-helper.h" +#include "signal-helper.hpp" #define TRACEPOINT_DEFINE #include "tp.h" diff --git a/tests/utils/testapp/gen-ust-tracef/gen-ust-tracef.cpp b/tests/utils/testapp/gen-ust-tracef/gen-ust-tracef.cpp index f0f6cc63c..31aa3798f 100644 --- a/tests/utils/testapp/gen-ust-tracef/gen-ust-tracef.cpp +++ b/tests/utils/testapp/gen-ust-tracef/gen-ust-tracef.cpp @@ -17,9 +17,9 @@ #include #include -#include +#include #include -#include "signal-helper.h" +#include "signal-helper.hpp" const char *str = "test string"; diff --git a/tests/utils/testapp/signal-helper.h b/tests/utils/testapp/signal-helper.hpp similarity index 100% rename from tests/utils/testapp/signal-helper.h rename to tests/utils/testapp/signal-helper.hpp diff --git a/tests/utils/testapp/userspace-probe-elf-cxx-binary/Makefile.am b/tests/utils/testapp/userspace-probe-elf-cxx-binary/Makefile.am index 6483ae899..7d095c131 100644 --- a/tests/utils/testapp/userspace-probe-elf-cxx-binary/Makefile.am +++ b/tests/utils/testapp/userspace-probe-elf-cxx-binary/Makefile.am @@ -3,4 +3,4 @@ # no optimization AM_CPPFLAGS = -O0 noinst_PROGRAMS = userspace-probe-elf-cxx-binary -userspace_probe_elf_cxx_binary_SOURCES = userspace-probe-elf-cxx-binary.cpp test_class.cpp test_class.h +userspace_probe_elf_cxx_binary_SOURCES = userspace-probe-elf-cxx-binary.cpp test_class.cpp test_class.hpp diff --git a/tests/utils/testapp/userspace-probe-elf-cxx-binary/test_class.cpp b/tests/utils/testapp/userspace-probe-elf-cxx-binary/test_class.cpp index 83bde0b20..05a20c7a1 100644 --- a/tests/utils/testapp/userspace-probe-elf-cxx-binary/test_class.cpp +++ b/tests/utils/testapp/userspace-probe-elf-cxx-binary/test_class.cpp @@ -5,7 +5,7 @@ * */ -#include "test_class.h" +#include "test_class.hpp" test_class::test_class() { test_member = 1; } diff --git a/tests/utils/testapp/userspace-probe-elf-cxx-binary/test_class.h b/tests/utils/testapp/userspace-probe-elf-cxx-binary/test_class.hpp similarity index 100% rename from tests/utils/testapp/userspace-probe-elf-cxx-binary/test_class.h rename to tests/utils/testapp/userspace-probe-elf-cxx-binary/test_class.hpp diff --git a/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary.cpp b/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary.cpp index 2e169c8fc..544628ff9 100644 --- a/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary.cpp +++ b/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary.cpp @@ -5,7 +5,7 @@ * */ -#include "test_class.h" +#include "test_class.hpp" volatile int not_a_function = 0; diff --git a/tests/utils/utils.cpp b/tests/utils/utils.cpp index fee74e961..0f1bd28c7 100644 --- a/tests/utils/utils.cpp +++ b/tests/utils/utils.cpp @@ -5,8 +5,8 @@ * */ -#include -#include +#include +#include #include #include #include @@ -17,8 +17,8 @@ #include #include -#include -#include +#include +#include #include "utils.h" diff --git a/tests/utils/xml-utils/extract_xml.cpp b/tests/utils/xml-utils/extract_xml.cpp index bc5fc3e51..9bfd50bda 100644 --- a/tests/utils/xml-utils/extract_xml.cpp +++ b/tests/utils/xml-utils/extract_xml.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #if defined(LIBXML_XPATH_ENABLED) diff --git a/tests/utils/xml-utils/validate_xml.cpp b/tests/utils/xml-utils/validate_xml.cpp index 92f08f203..b185161b5 100644 --- a/tests/utils/xml-utils/validate_xml.cpp +++ b/tests/utils/xml-utils/validate_xml.cpp @@ -25,9 +25,7 @@ #include #include -#include - -#include +#include struct validation_ctx { xmlSchemaParserCtxtPtr parser_ctx; -- 2.34.1