Skip to content

fix: tui source version tracecontext #239

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
swananan merged 3 commits into from
Jun 30, 2026
Merged

fix: tui source version tracecontext #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a2031c
fix: parse source shortcut by token
swananan Jun 29, 2026
a1f0dba
chore: align process protocol dependency
swananan Jun 29, 2026
70999da
fix: return trace context overflow errors
swananan Jun 29, 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
79 changes: 40 additions & 39 deletions ghostscope-compiler/src/ebpf/codegen/args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
name: materialized.name.clone(),
};
Ok(ComplexArg {
var_name_index: self.trace_context.add_variable_name(display_name),
type_index: self.trace_context.add_type(optimized_type),
var_name_index: self.trace_context.add_variable_name(display_name)?,
type_index: self.trace_context.add_type(optimized_type)?,
access_path: Vec::new(),
data_len: 0,
source: ComplexArgSource::ImmediateBytes { bytes: Vec::new() },
Expand All @@ -46,8 +46,8 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
let module_hint =
Self::module_path_for_offsets(materialized.module_path.as_deref());
Ok(ComplexArg {
var_name_index: self.trace_context.add_variable_name(display_name),
type_index: self.trace_context.add_type(dwarf_type.clone()),
var_name_index: self.trace_context.add_variable_name(display_name)?,
type_index: self.trace_context.add_type(dwarf_type.clone())?,
access_path: Vec::new(),
data_len,
source: ComplexArgSource::RuntimeRead {
Expand Down Expand Up @@ -80,8 +80,8 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
};
let data_len = Self::compute_read_size_for_type(&dwarf_type).clamp(1, 8);
Ok(ComplexArg {
var_name_index: self.trace_context.add_variable_name(display_name),
type_index: self.trace_context.add_type(dwarf_type),
var_name_index: self.trace_context.add_variable_name(display_name)?,
type_index: self.trace_context.add_type(dwarf_type)?,
access_path: Vec::new(),
data_len,
source: ComplexArgSource::ComputedInt { value, byte_len: data_len },
Expand Down Expand Up @@ -110,8 +110,8 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
Ok(ComplexArg {
var_name_index: self
.trace_context
.add_variable_name(self.expr_to_name(expr)),
type_index: self.trace_context.add_type(dwarf_type),
.add_variable_name(self.expr_to_name(expr))?,
type_index: self.trace_context.add_type(dwarf_type)?,
access_path: Vec::new(),
data_len,
source: ComplexArgSource::MemDump {
Expand All @@ -132,8 +132,8 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
self.expr_to_name(source_expr),
target_type
);
let var_name_index = self.trace_context.add_variable_name(display_name.clone());
let type_index = self.trace_context.add_type(dwarf_type.clone());
let var_name_index = self.trace_context.add_variable_name(display_name.clone())?;
let type_index = self.trace_context.add_type(dwarf_type.clone())?;

if matches!(
ghostscope_dwarf::strip_type_aliases(&dwarf_type),
Expand Down Expand Up @@ -206,10 +206,10 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
E::Variable(name) if self.alias_variable_exists(name) => {
let aliased = self.get_alias_variable(name).expect("alias exists");
let addr_i64 = self.resolve_ptr_i64_from_expr(&aliased)?;
let var_name_index = self.trace_context.add_variable_name(name.clone());
let var_name_index = self.trace_context.add_variable_name(name.clone())?;
Ok(ComplexArg {
var_name_index,
type_index: self.add_synthesized_type_index_for_kind(TypeKind::Pointer),
type_index: self.add_synthesized_type_index_for_kind(TypeKind::Pointer)?,
access_path: Vec::new(),
data_len: 8,
source: ComplexArgSource::ComputedInt {
Expand All @@ -221,7 +221,7 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
// 1) Script variables first
E::Variable(name) if self.variable_exists(name) => {
let val = self.load_variable(name)?;
let var_name_index = self.trace_context.add_variable_name(name.clone());
let var_name_index = self.trace_context.add_variable_name(name.clone())?;
// If this is a string variable, print its contents instead of address
if self
.get_variable_type(name)
Expand All @@ -242,7 +242,7 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
};
return Ok(ComplexArg {
var_name_index,
type_index: self.trace_context.add_type(array_type),
type_index: self.trace_context.add_type(array_type)?,
access_path: Vec::new(),
data_len: bytes.len(),
source: ComplexArgSource::ImmediateBytes { bytes },
Expand All @@ -266,7 +266,7 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
};
Ok(ComplexArg {
var_name_index,
type_index: self.add_synthesized_type_index_for_kind(kind),
type_index: self.add_synthesized_type_index_for_kind(kind)?,
access_path: Vec::new(),
data_len: byte_len,
source: ComplexArgSource::ComputedInt {
Expand All @@ -283,7 +283,8 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
.map_err(|e| CodeGenError::Builder(e.to_string()))?;
Ok(ComplexArg {
var_name_index,
type_index: self.add_synthesized_type_index_for_kind(TypeKind::Pointer),
type_index: self
.add_synthesized_type_index_for_kind(TypeKind::Pointer)?,
access_path: Vec::new(),
data_len: 8,
source: ComplexArgSource::ComputedInt {
Expand Down Expand Up @@ -315,8 +316,8 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
Ok(ComplexArg {
var_name_index: self
.trace_context
.add_variable_name("__str_literal".to_string()),
type_index: self.trace_context.add_type(array_type),
.add_variable_name("__str_literal".to_string())?,
type_index: self.trace_context.add_type(array_type)?,
access_path: Vec::new(),
data_len: bytes.len(),
source: ComplexArgSource::ImmediateBytes { bytes },
Expand All @@ -335,8 +336,8 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
Ok(ComplexArg {
var_name_index: self
.trace_context
.add_variable_name("__int_literal".to_string()),
type_index: self.trace_context.add_type(int_type),
.add_variable_name("__int_literal".to_string())?,
type_index: self.trace_context.add_type(int_type)?,
access_path: Vec::new(),
data_len: 8,
source: ComplexArgSource::ImmediateBytes { bytes },
Expand All @@ -356,8 +357,8 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
return Ok(ComplexArg {
var_name_index: self
.trace_context
.add_variable_name(self.expr_to_name(expr)),
type_index: self.trace_context.add_type(ptr_ty),
.add_variable_name(self.expr_to_name(expr))?,
type_index: self.trace_context.add_type(ptr_ty)?,
access_path: Vec::new(),
data_len: 8,
source: ComplexArgSource::ComputedAddress {
Expand Down Expand Up @@ -401,8 +402,8 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
Ok(ComplexArg {
var_name_index: self
.trace_context
.add_variable_name(self.expr_to_name(expr)),
type_index: self.trace_context.add_type(ptr_ty),
.add_variable_name(self.expr_to_name(expr))?,
type_index: self.trace_context.add_type(ptr_ty)?,
access_path: Vec::new(),
data_len: 8,
source: ComplexArgSource::AddressValue {
Expand Down Expand Up @@ -440,8 +441,8 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
return Ok(ComplexArg {
var_name_index: self
.trace_context
.add_variable_name(self.expr_to_name(expr)),
type_index: self.add_synthesized_type_index_for_kind(kind),
.add_variable_name(self.expr_to_name(expr))?,
type_index: self.add_synthesized_type_index_for_kind(kind)?,
access_path: Vec::new(),
data_len: byte_len,
source: ComplexArgSource::ComputedInt { value, byte_len },
Expand All @@ -467,8 +468,8 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
return Ok(ComplexArg {
var_name_index: self
.trace_context
.add_variable_name(self.expr_to_name(expr)),
type_index: self.add_synthesized_type_index_for_kind(kind),
.add_variable_name(self.expr_to_name(expr))?,
type_index: self.add_synthesized_type_index_for_kind(kind)?,
access_path: Vec::new(),
data_len: byte_len,
source: ComplexArgSource::ComputedInt { value, byte_len },
Expand Down Expand Up @@ -557,8 +558,8 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
return Ok(ComplexArg {
var_name_index: self
.trace_context
.add_variable_name(self.expr_to_name(expr)),
type_index: self.trace_context.add_type(ptr_ti),
.add_variable_name(self.expr_to_name(expr))?,
type_index: self.trace_context.add_type(ptr_ti)?,
access_path: Vec::new(),
data_len: 8,
source: ComplexArgSource::AddressValue {
Expand All @@ -570,8 +571,8 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
return Ok(ComplexArg {
var_name_index: self
.trace_context
.add_variable_name(self.expr_to_name(expr)),
type_index: self.trace_context.add_type(elem_ty.clone()),
.add_variable_name(self.expr_to_name(expr))?,
type_index: self.trace_context.add_type(elem_ty.clone())?,
access_path: Vec::new(),
data_len,
source: ComplexArgSource::RuntimeRead {
Expand Down Expand Up @@ -602,8 +603,8 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
Ok(ComplexArg {
var_name_index: self
.trace_context
.add_variable_name(self.expr_to_name(expr)),
type_index: self.add_synthesized_type_index_for_kind(kind),
.add_variable_name(self.expr_to_name(expr))?,
type_index: self.add_synthesized_type_index_for_kind(kind)?,
access_path: Vec::new(),
data_len: byte_len,
source: ComplexArgSource::ComputedInt {
Expand Down Expand Up @@ -637,8 +638,8 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
Ok(ComplexArg {
var_name_index: self
.trace_context
.add_variable_name(self.expr_to_name(other)),
type_index: self.add_synthesized_type_index_for_kind(kind),
.add_variable_name(self.expr_to_name(other))?,
type_index: self.add_synthesized_type_index_for_kind(kind)?,
access_path: Vec::new(),
data_len: byte_len,
source: ComplexArgSource::ComputedInt {
Expand Down Expand Up @@ -690,13 +691,13 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
| ComplexArgSource::ComputedAddress { .. }
| ComplexArgSource::ImmediateBytes { .. } => {
// Use ComplexFormat with "{}" to render address/immediate nicely
let fmt_idx = self.trace_context.add_string("{}".to_string());
let fmt_idx = self.trace_context.add_string("{}".to_string())?;
self.generate_print_complex_format_instruction(fmt_idx, &[arg])?;
Ok(1)
}
ComplexArgSource::MemDump { .. } | ComplexArgSource::MemDumpDynamic { .. } => {
// Use ComplexFormat with "{}"; generate_print_complex_format_instruction handles MemDump
let fmt_idx = self.trace_context.add_string("{}".to_string());
let fmt_idx = self.trace_context.add_string("{}".to_string())?;
self.generate_print_complex_format_instruction(fmt_idx, &[arg])?;
Ok(1)
}
Expand Down Expand Up @@ -899,7 +900,7 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
return compile(self);
}

let expr_index = self.trace_context.add_string(self.expr_to_name(expr));
let expr_index = self.trace_context.add_string(self.expr_to_name(expr))?;
let entry_event_bytes = self.compile_time_event_bytes_upper_bound;

self.reset_condition_error()?;
Expand Down
4 changes: 2 additions & 2 deletions ghostscope-compiler/src/ebpf/codegen/backtrace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3663,7 +3663,7 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
(&hit_value, hit_end),
(&ctx.context.i32_type().const_zero(), miss_end),
]);
Ok(phi.as_basic_value().into_int_value())
Ok::<_, CodeGenError>(phi.as_basic_value().into_int_value())
};
Ok(BtModuleRangeMeta {
found: found_phi.as_basic_value().into_int_value(),
Expand Down Expand Up @@ -3922,7 +3922,7 @@ impl<'ctx, 'dw> EbpfContext<'ctx, 'dw> {
.build_phi(ctx.context.i64_type(), name)
.map_err(|e| CodeGenError::LLVMError(e.to_string()))?;
phi.add_incoming(&[(&hit_value, hit_end), (&zero_i64, miss_end)]);
Ok(phi.as_basic_value().into_int_value())
Ok::<_, CodeGenError>(phi.as_basic_value().into_int_value())
};
Ok(BtModuleRangeValue {
found: found_phi.as_basic_value().into_int_value(),
Expand Down
Loading
Loading