cory/tildefriends
4
5
Fork 1
Code Issues 29 Pull Requests 1 Actions Releases 26 Wiki Activity

Fix trace producing invalid JSON.

Browse Source 
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4159 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
Cory McWilliams 2023-02-01 03:15:22 +00:00
parent 582ee0e4d7
commit a8cecb5c64
1 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/trace.c
View File

@ -108,6 +108,43 @@ void tf_trace_counter(tf_trace_t* trace, const char* name, int argc, const char*
trace->callback(trace, line, p, trace->user_data); trace->callback(trace, line, p, trace->user_data);
} }
static int _tf_trace_escape_name(char* out, size_t out_size, const char* name)
{
int p = 0;
for (const char* c = name; *c && (size_t)p < out_size; c++)
{
switch (*c)
{
case '"':
case '\\':
out[p++] = '\\';
if ((size_t)p + 1 < out_size)
{
out[p++] = *c;
}
break;
case '\t':
out[p++] = '\\';
if ((size_t)p + 1 < out_size)
{
out[p++] = 't';
}
break;
case '\n':
out[p++] = '\\';
if ((size_t)p + 1 < out_size)
{
out[p++] = 'n';
}
break;
default:
out[p++] = *c;
break;
}
}
return p;
}
void tf_trace_begin(tf_trace_t* trace, const char* name) void tf_trace_begin(tf_trace_t* trace, const char* name)
{ {
if (!trace) if (!trace)
@ -131,23 +168,7 @@ void tf_trace_begin(tf_trace_t* trace, const char* name)
char line[1024]; char line[1024];
int p = snprintf(line, sizeof(line), "{\"ph\": \"B\", \"pid\": %d, \"tid\": 0, \"ts\": %" PRId64 ", \"name\": \"", getpid(), _trace_ts()); int p = snprintf(line, sizeof(line), "{\"ph\": \"B\", \"pid\": %d, \"tid\": 0, \"ts\": %" PRId64 ", \"name\": \"", getpid(), _trace_ts());
for (const char* c = name; *c && p < (int)sizeof(line); c++) p += _tf_trace_escape_name(line + p, sizeof(line) - p, name);
{
switch (*c)
{
case '"':
case '\\':
line[p++] = '\\';
if (p < (int)sizeof(line))
{
line[p++] = *c;
}
break;
default:
line[p++] = *c;
break;
}
}
p += snprintf(line + p, sizeof(line) - p, "\"},"); p += snprintf(line + p, sizeof(line) - p, "\"},");
trace->callback(trace, line, p, trace->user_data); trace->callback(trace, line, p, trace->user_data);
} }
@ -177,23 +198,7 @@ void tf_trace_end(tf_trace_t* trace)
char line[1024]; char line[1024];
int p = snprintf(line, sizeof(line), "{\"ph\": \"E\", \"pid\": %d, \"tid\": 0, \"ts\": %" PRId64 ", \"name\": \"", getpid(), _trace_ts()); int p = snprintf(line, sizeof(line), "{\"ph\": \"E\", \"pid\": %d, \"tid\": 0, \"ts\": %" PRId64 ", \"name\": \"", getpid(), _trace_ts());
for (const char* c = name; *c && p < (int)sizeof(line); c++) p += _tf_trace_escape_name(line + p, sizeof(line) - p, name);
{
switch (*c)
{
case '"':
case '\\':
line[p++] = '\\';
if (p < (int)sizeof(line))
{
line[p++] = *c;
}
break;
default:
line[p++] = *c;
break;
}
}
p += snprintf(line + p, sizeof(line) - p, "\"},"); p += snprintf(line + p, sizeof(line) - p, "\"},");
trace->callback(trace, line, p, trace->user_data); trace->callback(trace, line, p, trace->user_data);
} }