Skip to content

Commit b15dd03

Browse files
doctorlai-msrcxfoukasmatthewbalkwill
authored
syncs from the dev branch to the main branch (#122)
* Adding a emulator * Add Python/ctypesgen dependencies for emulator * Add jbpf_agent_hooks.h and generate py * Add time helper functions * Test emulator * Add missing file * Add missing fields * Fix time event initialization * Refactor * Remove protobuf, update jbpf_stats_report.o * Add xran helper functions, and create random stream_id * Clang-format * Fix cppcheck issue * Refactor default values * Default num_codelet_descriptors to len(codelet_descriptors) * Enable ASAN in tests, ignore ODR, cleanup * Clangformat * Support custom helper functions and refactor * Fix clang-format * Move definitions above users include file * Remove XRAN * Add Custom init code * Add yaml_to_json, refactor * Fix path * Add debug option to emulator_utils.jbpf_handle_out_bufs * Match codelet_descriptor in yaml * Add missing define agent hooks * Revert * jbpf_handle_out_bufs should return how many messages that have been processed * Add some debug output when calling periodic_call and report_stats hook * Add a test to make sure the report_stats is actually called * Add comment * Clang-format -i * Add debug printf * Continued work * Add matching ck_epoch_end * Clang * Continued testing * Add more debugging * Clang * Debug * Debug print * Add more debugging message * More debugging * Add tests for report_stats and periodic_call, add debugging * Clang-format * Pipeline integration * simple_output2.o * Add missing files * Refactor & debug * COntinued work * Continued work * Revert and Cleanup * Revert * Fix * Ignore dynamic builds * Fix * Fix syntax * Fix syntax * Keep static mode only * Revert * Emulate time and add a test * Add test * Fix clang-format * Add missing file * Fix compilation under ubuntu20 * Init draft of adding both options * Fix * Pipeline * Move autogen wrappers * Fix cppcheck issue * Build both by default * Fix JBPF_SHARED_LIB * Fix build under ubuntu24.04 * Fix segfault at Static * Add emulator tests to github action, fix RELEASE * Typo * First round of addressing comments * Improve test description comments * Add some more doc * Add to ARM pipeline * Sync dev with main (#105) * Add helper function for fixed points (#71) * Add helper function for fixed points * Addressing the comments * Revert * Continued work * Fix the algorithms and tests * Minor tweaks * Cleanup * Avoid clang optimise the code * Fix implementations * Test fixed_to_float and fixed_to_double * Fix type * Add 2 more tests * Cleanup * Clang format inconsistent fix * Add more tests in the codelet * Increase MAX_NUM_HOOKS from 64 to 128 (#90) * Increase MAX_NUM_HOOKS from 64 to 96 * Increase MAX_NUM_HOOKS to 128 --------- Co-authored-by: Zhihua Lai <[email protected]> Co-authored-by: matthewbalkwill <[email protected]> * Refactor docker files * Add to github actions * Add System Information * Merge and fix * Fix comments * Readme * More doc * Update docs * Move emulator tests to the end * Add debug messages * Add more debug * Update codelet to provide more information * Comment * Fix print error * Revert "Update codelet to provide more information" This reverts commit 95dc9e4. * Fix segfault * Use smart ptr * Revert "Adding a emulator" * Revert "Enable Building Both libjbpf.a and libjbpf.so with cmake option -DJBPF_STATIC=Both" --------- Co-authored-by: Xenofon Foukas <[email protected]> Co-authored-by: matthewbalkwill <[email protected]>
1 parent ee1fb64 commit b15dd03

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/io/jbpf_io_channel.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -442,11 +442,9 @@ jbpf_io_destroy_out_channel(struct jbpf_io_channel_list* channel_list, struct jb
442442
ck_epoch_end(local_out_channel_list_epoch_record, NULL);
443443
ck_epoch_call(local_out_channel_list_epoch_record, &io_channel->epoch_entry, io_channel_destructor);
444444
ck_epoch_barrier(local_out_channel_list_epoch_record);
445-
jbpf_logger(
446-
JBPF_INFO,
447-
"Barrier reached and channel %p was destroyed (stream id %s)\n",
448-
io_channel,
449-
io_channel->stream_id.id);
445+
char sname[JBPF_IO_STREAM_ID_LEN * 3];
446+
_jbpf_io_tohex_str(io_channel->stream_id.id, JBPF_IO_STREAM_ID_LEN, sname, JBPF_IO_STREAM_ID_LEN * 3);
447+
jbpf_logger(JBPF_INFO, "Barrier reached and channel %p was destroyed (stream id %s)\n", io_channel, sname);
450448
}
451449

452450
void
@@ -673,7 +671,9 @@ jbpf_io_channel_send_data(struct jbpf_io_channel* channel, void* data, size_t si
673671

674672
jbpf_channel_buf_ptr data_buf = jbpf_io_channel_reserve_buf(channel);
675673
if (!data_buf) {
676-
jbpf_logger(JBPF_ERROR, "Error reserving buffer for channel %s\n", channel->stream_id.id);
674+
char sname[JBPF_IO_STREAM_ID_LEN * 3];
675+
_jbpf_io_tohex_str(channel->stream_id.id, JBPF_IO_STREAM_ID_LEN, sname, JBPF_IO_STREAM_ID_LEN * 3);
676+
jbpf_logger(JBPF_ERROR, "Error reserving buffer for channel %s\n", sname);
677677
return -1;
678678
}
679679
memcpy(data_buf, data, size);

0 commit comments

Comments
 (0)