Skip to content
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

fix: Rebuild C headers for smcache to expose token name #704

Merged
merged 2 commits into from
Oct 31, 2022
Merged

fix: Rebuild C headers for smcache to expose token name #704

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
033a7cc
fix: Rebuild C headers for smcache to expose token name
kamilogorek Oct 31, 2022
b5ac978
changelog
kamilogorek Oct 31, 2022
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 10.1.1

**Fixed**:

- Rebuild C headers for `SourceMapCache` to expose token `name` ([#704](https://github.com/getsentry/symbolic/pull/704))

## 10.1.0

**Features**:
Expand Down
122 changes: 63 additions & 59 deletions symbolic-cabi/include/symbolic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,36 +177,6 @@ typedef struct SymbolicProguardRemapResult {
uintptr_t len;
} SymbolicProguardRemapResult;

typedef struct SymbolicStrVec {
struct SymbolicStr *strs;
uintptr_t len;
} SymbolicStrVec;

/**
* Represents a single token after lookup.
*/
typedef struct SymbolicSmTokenMatch {
/**
* The line number in the original source file.
*/
uint32_t line;
/**
* The column number in the original source file.
*/
uint32_t col;
/**
* The path to the original source.
*/
struct SymbolicStr src;
/**
* The name of the function containing the token.
*/
struct SymbolicStr function_name;
struct SymbolicStrVec pre_context;
struct SymbolicStr context_line;
struct SymbolicStrVec post_context;
} SymbolicSmTokenMatch;

/**
* Represents a single token after lookup.
*/
Expand Down Expand Up @@ -245,6 +215,40 @@ typedef struct SymbolicTokenMatch {
struct SymbolicStr function_name;
} SymbolicTokenMatch;

typedef struct SymbolicStrVec {
struct SymbolicStr *strs;
uintptr_t len;
} SymbolicStrVec;

/**
* Represents a single token after lookup.
*/
typedef struct SymbolicSmTokenMatch {
/**
* The line number in the original source file.
*/
uint32_t line;
/**
* The column number in the original source file.
*/
uint32_t col;
/**
* The path to the original source.
*/
struct SymbolicStr src;
/**
* The name of the source location as it is defined in the SourceMap.
*/
struct SymbolicStr name;
/**
* The name of the function containing the token.
*/
struct SymbolicStr function_name;
struct SymbolicStrVec pre_context;
struct SymbolicStr context_line;
struct SymbolicStrVec post_context;
} SymbolicSmTokenMatch;

/**
* Represents a single symbol after lookup.
*/
Expand Down Expand Up @@ -550,35 +554,6 @@ bool symbolic_proguardmapper_has_line_info(const struct SymbolicProguardMapper *
*/
void symbolic_proguardmapper_result_free(struct SymbolicProguardRemapResult *result);

/**
* Creates an sourcemapcache from a given minified source and sourcemap contents.
*
* This shares the underlying memory and does not copy it if that is
* possible. Will ignore utf-8 decoding errors.
*/
struct SymbolicSourceMapCache *symbolic_sourcemapcache_from_bytes(const char *source_content,
uintptr_t source_len,
const char *sourcemap_content,
uintptr_t sourcemap_len);

/**
* Frees an SourceMapCache.
*/
void symbolic_sourcemapcache_free(struct SymbolicSourceMapCache *view);

/**
* Looks up a token.
*/
struct SymbolicSmTokenMatch *symbolic_sourcemapcache_lookup_token(const struct SymbolicSourceMapCache *source_map,
uint32_t line,
uint32_t col,
uint32_t context_lines);

/**
* Free a token match.
*/
void symbolic_sourcemapcache_token_match_free(struct SymbolicSmTokenMatch *token_match);

/**
* Creates a source view from a given path.
*
Expand Down Expand Up @@ -674,6 +649,35 @@ uint32_t symbolic_sourcemapview_get_tokens(const struct SymbolicSourceMapView *s
*/
void symbolic_token_match_free(struct SymbolicTokenMatch *token_match);

/**
* Creates an sourcemapcache from a given minified source and sourcemap contents.
*
* This shares the underlying memory and does not copy it if that is
* possible. Will ignore utf-8 decoding errors.
*/
struct SymbolicSourceMapCache *symbolic_sourcemapcache_from_bytes(const char *source_content,
uintptr_t source_len,
const char *sourcemap_content,
uintptr_t sourcemap_len);

/**
* Frees an SourceMapCache.
*/
void symbolic_sourcemapcache_free(struct SymbolicSourceMapCache *view);

/**
* Looks up a token.
*/
struct SymbolicSmTokenMatch *symbolic_sourcemapcache_lookup_token(const struct SymbolicSourceMapCache *source_map,
uint32_t line,
uint32_t col,
uint32_t context_lines);

/**
* Free a token match.
*/
void symbolic_sourcemapcache_token_match_free(struct SymbolicSmTokenMatch *token_match);

/**
* Creates a symcache from a given path.
*/
Expand Down