Skip to content

Use <lttng/lttng.h> in lttngpy and clean up includes (backport #222) #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
christophebedard merged 2 commits into from
Jan 23, 2026
+11 −23
Merged

Use <lttng/lttng.h> in lttngpy and clean up includes (backport #222) #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de832d6
Use <lttng/lttng.h> in lttngpy and clean up includes (#222)
reeceholland Jan 22, 2026
58d91cb
Fix conflict: remove lttngpy/src/lttngpy/snapshot.cpp
christophebedard Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions lttngpy/src/lttngpy/channel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Include lttng-error.h before channel.h, otherwise lttng_error_code isn't known
// TODO(mosfet80): order it alphabetically once liblttng-ctl 2.14+ is fixed:
// https://review.lttng.org/c/lttng-tools/+/15165
#include <lttng/lttng-error.h>
#include <lttng/channel.h>
#include <lttng/constant.h>
#include <lttng/domain.h>
#include <lttng/event.h>
#include <lttng/handle.h>
#include <lttng/lttng.h>

#include <optional>
#include <string>
Expand Down
3 changes: 2 additions & 1 deletion lttngpy/src/lttngpy/channel.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
#ifndef LTTNGPY__CHANNEL_HPP_
#define LTTNGPY__CHANNEL_HPP_

#include <lttng/domain.h>
#include <lttng/lttng.h>

#include <optional>
#include <string>

namespace lttngpy
Expand Down
2 changes: 1 addition & 1 deletion lttngpy/src/lttngpy/context_app.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include <lttng/lttng-error.h>
#include <lttng/lttng.h>

#include <string>
#include <variant>
Expand Down
2 changes: 1 addition & 1 deletion lttngpy/src/lttngpy/context_lttng.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include <lttng/event.h>
#include <lttng/lttng.h>

#include <map>
#include <optional>
Expand Down
2 changes: 1 addition & 1 deletion lttngpy/src/lttngpy/context_lttng.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#ifndef LTTNGPY__CONTEXT_LTTNG_HPP_
#define LTTNGPY__CONTEXT_LTTNG_HPP_

#include <lttng/event.h>
#include <lttng/lttng.h>

#include <optional>
#include <string>
Expand Down
3 changes: 1 addition & 2 deletions lttngpy/src/lttngpy/context_perf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include <lttng/event.h>
#include <lttng/lttng-error.h>
#include <lttng/lttng.h>

#include <algorithm>
#include <map>
Expand Down
2 changes: 1 addition & 1 deletion lttngpy/src/lttngpy/context_perf.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#ifndef LTTNGPY__CONTEXT_PERF_HPP_
#define LTTNGPY__CONTEXT_PERF_HPP_

#include <lttng/event.h>
#include <lttng/lttng.h>

#include <string>
#include <variant>
Expand Down
4 changes: 1 addition & 3 deletions lttngpy/src/lttngpy/event.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include <lttng/domain.h>
#include <lttng/event.h>
#include <lttng/lttng-error.h>
#include <lttng/lttng.h>
#include <string.h>

#include <map>
Expand Down
3 changes: 1 addition & 2 deletions lttngpy/src/lttngpy/event.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
#ifndef LTTNGPY__EVENT_HPP_
#define LTTNGPY__EVENT_HPP_

#include <lttng/domain.h>
#include <lttng/event.h>
#include <lttng/lttng.h>

#include <set>
#include <string>
Expand Down
3 changes: 1 addition & 2 deletions lttngpy/src/lttngpy/session.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include <lttng/lttng-error.h>
#include <lttng/session.h>
#include <lttng/lttng.h>

#include <set>
#include <string>
Expand Down
Loading