Skip to content

GitLab

Commit 53817980 authored by Marco Perronet's avatar Marco Perronet
Browse files

Remove evil forward declarations

parent e0be6a60
Hide whitespace changes
Inline Side-by-side
build.rs
View file @ 53817980
use std::path::Path;
use std::process::Command;
fn main() {
// Tell Cargo that if the given file changes, to rerun this build script.
println!("cargo:rerun-if-changed=src/events_generation/binary_parser/record.c");
println!("cargo:rerun-if-changed=src/events_generation/binary_parser/stream.c");
println!("cargo:rerun-if-changed=src/events_generation/binary_parser/stream.h");
println!("cargo:rerun-if-changed=src/events_generation/binary_parser/lib/libtraceevent");
println!("cargo:rerun-if-changed=src/events_generation/binary_parser/lib/libtracefs");
println!("cargo:rerun-if-changed=src/events_generation/binary_parser/lib/trace-cmd");
// Compile the trace-cmd libraries.
let mut build_libs_command = Command::new("./build_libs.sh");
build_libs_command.current_dir("src/events_generation/binary_parser/lib");
build_libs_command.status().expect("Failed to build trace-cmd libraries.");
// Build our own library and statically link it to the rust binary.
cc::Build::new()
.file("src/events_generation/binary_parser/stream.c")
.file("src/events_generation/binary_parser/record.c")
.include(Path::new("src/events_generation/binary_parser/lib/build_output/usr/include/traceevent"))
.include(Path::new("src/events_generation/binary_parser/lib/build_output/usr/include/tracefs"))
.include(Path::new("src/events_generation/binary_parser/lib/build_output/usr/include/trace-cmd"))
.flag("-Lsrc/events_generation/binary_parser/lib/build_output/usr/lib64")
.compile("binparse");
// Linker options for rustc (link trace-cmd libraries).
println!("cargo:rustc-link-lib=dylib=traceevent");
println!("cargo:rustc-link-lib=dylib=tracefs");
......
trace-cmd @ 3e4b4ebc
Compare 88e1a5e1...3e4b4ebc
Subproject commit 88e1a5e1a5fec0345f51b3683564c5118004fb8e
Subproject commit 3e4b4ebc7009c66044c064519e5b7bbc0102c74a
src/events_generation/binary_parser/record.c deleted 100644 → 0
View file @ e0be6a60
#include "stream.h"
enum {
TRACECMD_RECORD_NOSPLICE = (1 << 0), /* Use read instead of splice */
TRACECMD_RECORD_SNAPSHOT = (1 << 1), /* Extract from snapshot */
TRACECMD_RECORD_BLOCK_SPLICE = (1 << 2), /* Block on splice write */
TRACECMD_RECORD_NOBRASS = (1 << 3), /* Splice directly without a brass pipe */
TRACECMD_RECORD_POLL = (1 << 4), /* Use O_NONBLOCK, poll trace buffers */
};
struct tracecmd_recorder;
void tracecmd_stop_recording(struct tracecmd_recorder *recorder);
struct tracecmd_recorder *tracecmd_create_buffer_recorder_fd(int fd, int cpu, unsigned flags, const char *buffer);
int tracecmd_start_recording(struct tracecmd_recorder *recorder, unsigned long sleep);
void tracecmd_free_recorder(struct tracecmd_recorder *recorder);
// Used by each child recorder after forking. Each child has its own "recorder" instance
static struct tracecmd_recorder *recorder;
static int sleep_time = 1000;
// If true, the thread must stop (could be the main thread or a child recorder)
static int finished = 0;
void finish() {
if (recorder)
tracecmd_stop_recording(recorder); // Only executed by child recorders
finished = 1;
}
void stop_threads(struct recorder_data *recorders, int cpu_cnt) {
int i;
// int ret;
// struct rbftrace_event_raw *event = malloc(sizeof(*event));
/* Tell all threads to finish up */
for (i = 0; i < cpu_cnt; i++) {
if (recorders[i].pid > 0) {
kill(recorders[i].pid, SIGUSR1);
}
}
/* Flush out the pipes */
/* Edit: we do this from rust in the event generator */
// do {
// ret = read_stream(recorders, cpu_cnt, event);
// printf("Flushed: ");
// print_event(event);
// } while (ret > 0);
// free(event);
}
void wait_threads(struct recorder_data *recorders, int cpu_cnt) {
int i;
for (i = 0; i < cpu_cnt; i++) {
if (recorders[i].pid > 0) {
waitpid(recorders[i].pid, NULL, 0);
recorders[i].pid = -1;
fprintf(stderr, "Waited recorder #%d\n", i);
}
}
}
/* Returns recorder pid */
// TODO shall we set real-time priority? In that case, we might need to use add_filter_pid
int create_recorder(int cpu, int *event_pipe, char *tracefs_path) {
pid_t pid;
pid = fork();
// Father
if (pid != 0)
return pid;
// Child
signal(SIGINT, SIG_IGN); // Ignore sigint
signal(SIGUSR1, finish); // Stop on sigusr
close(event_pipe[0]);
recorder = tracecmd_create_buffer_recorder_fd(event_pipe[1], cpu, TRACECMD_RECORD_BLOCK_SPLICE, tracefs_path);
tracefs_put_tracing_file(tracefs_path);
if (!recorder) {
printf("Can't create recorder\n");
exit(-1);
}
while (!finished) {
if (tracecmd_start_recording(recorder, sleep_time) < 0)
break;
}
tracecmd_free_recorder(recorder);
recorder = NULL;
exit(0);
}
/* Create recorders: one for each cpu */
struct recorder_data *create_recorders(struct tracefs_instance *tracefs, int cpu_cnt) {
struct recorder_data *recorders = calloc(cpu_cnt, sizeof(*recorders));
char *tracefs_path = tracefs_instance_get_dir(tracefs);
int *event_pipe = NULL;
int ret;
for (int i = 0; i < cpu_cnt; i++) {
/* Setup recorder */
recorders[i].cpu = i;
recorders[i].record = NULL;
event_pipe = recorders[i].event_pipe;
ret = pipe(event_pipe);
if (ret < 0) {
printf("Pipe error\n");
free(recorders);
return NULL;
}
recorders[i].stream = init_stream(event_pipe[0], i, cpu_cnt);
if (!recorders[i].stream) {
printf("Stream error\n");
free(recorders);
return NULL;
}
fflush(stdout);
/* Start recorder thread */
ret = create_recorder(i, event_pipe, tracefs_path);
recorders[i].pid = ret;
if (ret < 0) {
printf("Fork error\n");
free(recorders);
return NULL;
}
if (event_pipe)
close(event_pipe[1]);
}
return recorders;
}
src/events_generation/binary_parser/stream.c deleted 100644 → 0
View file @ e0be6a60
#include "stream.h"
enum tracecmd_file_states {
TRACECMD_FILE_INIT = 1,
TRACECMD_FILE_HEADERS,
TRACECMD_FILE_FTRACE_EVENTS,
TRACECMD_FILE_ALL_EVENTS,
TRACECMD_FILE_KALLSYMS,
TRACECMD_FILE_PRINTK,
TRACECMD_FILE_CMD_LINES,
TRACECMD_FILE_CPU_COUNT,
TRACECMD_FILE_OPTIONS,
TRACECMD_FILE_CPU_LATENCY,
TRACECMD_FILE_CPU_FLYRECORD,
};
// libtracecmd private
struct tracecmd_output *tracecmd_create_init_fd(int fd);
void tracecmd_output_free(struct tracecmd_output *handle);
struct tracecmd_input *tracecmd_alloc_fd(int fd, int flags);
int tracecmd_read_headers(struct tracecmd_input *handle, enum tracecmd_file_states state);
int tracecmd_make_pipe(struct tracecmd_input *handle, int cpu, int fd, int cpus);
// TODO rewrite this without these horrible static variables and gotos
struct tracecmd_input *init_stream(int read_fd, int cpu, int cpu_cnt) {
struct tracecmd_output *trace_output;
static struct tracecmd_input *trace_input;
static FILE *fp = NULL;
int fd1;
int fd2;
long flags;
if (fp && trace_input)
goto make_pipe;
// Create temporary file
fp = tmpfile();
if (!fp)
return NULL;
fd1 = fileno(fp);
fd2 = dup(fd1);
// Write tracecmd binary header in the file to pretend that we are reading from a valid trace.dat file
trace_output = tracecmd_create_init_fd(fd2);
if (!trace_output) {
fclose(fp);
return NULL;
}
tracecmd_output_free(trace_output);
lseek(fd2, 0, SEEK_SET);
// Get handle for event stream. This function will check that the fd corresponds to a valid trace.dat file
trace_input = tracecmd_alloc_fd(fd2, 0);
if (!trace_input) {
close(fd2);
goto fail;
}
// Consume binary header
if (tracecmd_read_headers(trace_input, TRACECMD_FILE_PRINTK) < 0)
goto fail_free_input;
make_pipe:
/* Do not block on this pipe */
flags = fcntl(read_fd, F_GETFL);
fcntl(read_fd, F_SETFL, flags | O_NONBLOCK);
if (tracecmd_make_pipe(trace_input, cpu, read_fd, cpu_cnt) < 0)
goto fail_free_input;
return trace_input;
fail_free_input:
tracecmd_close(trace_input);
fail:
fclose(fp);
return NULL;
}
/* Read a single event, parse it into "rbf_event" in our format */
/* Returns 1 if an event was read, 0 otherwise (e.g. there were no events to read) */
int read_stream(struct recorder_data *recorders, int cpu_cnt, struct rbftrace_event_raw *rbf_event) {
struct tep_record *record;
struct recorder_data *rec;
struct recorder_data *last_rec;
struct tep_handle *event_parser;
struct tep_event *event;
struct timeval tv = { 1 , 0 };
fd_set rfds;
int top_rfd = 0;
int nr_fd;
int ret;
int i;
last_rec = NULL;
/* Reads a record for each recorder thread */
again:
for (i = 0; i < cpu_cnt; i++) {
rec = &recorders[i];
if (!rec->record)
rec->record = tracecmd_read_data(rec->stream, rec->cpu);
record = rec->record;
/* Pipe has closed */
if (!record && errno == EINVAL)
rec->closed = 1;
/* Picks the smallest timestamp */
if (record && (!last_rec || record->ts < last_rec->record->ts))
last_rec = rec;
}
/* Find the event */
if (last_rec) {
record = last_rec->record;
last_rec->record = NULL;
event_parser = tracecmd_get_tep(last_rec->stream);
/* Most recent event. The most recent timestamp is stored in the record. */
event = tep_find_event_by_record(event_parser, record);
if (rbf_event != NULL) {
if (parse_event_rbftrace(event, rbf_event, record) < 0) {
printf("Parser error: field not found\n");
}
}
tracecmd_free_record(record);
return 1;
}
nr_fd = 0;
FD_ZERO(&rfds);
for (i = 0; i < cpu_cnt; i++) {
/* Do not process closed pipes */
if (recorders[i].closed)
continue;
nr_fd++;
if (recorders[i].event_pipe[0] > top_rfd)
top_rfd = recorders[i].event_pipe[0];
FD_SET(recorders[i].event_pipe[0], &rfds);
}
if (!nr_fd)
return 0;
ret = select(top_rfd + 1, &rfds, NULL, NULL, &tv);
if (ret > 0)
goto again;
return ret;
}
/* prev_state mapping
0 => R
1 => S
2 => D
...
16 => X
32 => Z
256 => R+ (The flag at 256 seems to trigger the "+")
{ 0x0000, "R" },
{ 0x0001, "S" },
{ 0x0002, "D" },
{ 0x0004, "T" },
{ 0x0008, "t" },
{ 0x0010, "X" },
{ 0x0020, "Z" },
{ 0x0040, "P" },
{ 0x0080, "I" }
*/
int parse_event_rbftrace(struct tep_event *source, struct rbftrace_event_raw *target, struct tep_record *record) {
unsigned long long val;
bool is_switch = false;
target->ts = record->ts;
if (tep_get_common_field_val(NULL, source, "common_type", record, &val, 0) < 0) {
printf("Field common_type not found\n");
return -1;
}
target->id = val;
// Depends if it's a wakeup/exit event or a switch event
if (tep_get_field_val(NULL, source, "prev_pid", record, &val, 0) == 0) {
is_switch = true;
target->pid = val;
} else if (tep_get_field_val(NULL, source, "pid", record, &val, 0) == 0) {
target->pid = val;
} else {
printf("Field pid or prev_pid not found\n");
return -1;
}
if (is_switch) {
if (tep_get_field_val(NULL, source, "prev_prio", record, &val, 0) < 0) {
printf("Field prev_prio not found\n");
return -1;
}
target->prio = val;
if (tep_get_field_val(NULL, source, "prev_state", record, &val, 0) < 0) {
printf("Field prev_state not found\n");
return -1;
}
target->prev_state = val;
if (tep_get_field_val(NULL, source, "next_pid", record, &val, 0) < 0) {
printf("Field next_pid not found\n");
return -1;
}
target->next_pid = val;
if (tep_get_field_val(NULL, source, "next_prio", record, &val, 0) < 0) {
printf("Field next_prio not found\n");
return -1;
}
target->next_prio = val;
} else {
// Shared by sched_wakeup and sched_switch
if (tep_get_field_val(NULL, source, "prio", record, &val, 0) < 0) {
printf("Field prio not found\n");
return -1;
}
target->prio = val;
// These fields are for sched_wakeup only
if (tep_get_field_val(NULL, source, "success", record, &val, 0) == 0) {
target->success = val;
if (tep_get_field_val(NULL, source, "target_cpu", record, &val, 0) < 0) {
printf("Field target_cpu not found\n");
return -1;
}
target->target_cpu = val;
}
}
return 0;
}
src/events_generation/binary_parser/stream.h deleted 100644 → 0
View file @ e0be6a60
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <errno.h>
#include <stdlib.h>
#include <stdarg.h>
#include <getopt.h>
#include <time.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/wait.h>
#include <sys/socket.h>
#include <sys/syscall.h>
#include <unistd.h>
#include <ctype.h>
#include <errno.h>
#include <limits.h>
// trace-cmd libraries
#include <event-parse.h>
#include <tracefs.h>
#include <trace-cmd.h>
// Don't use these! These ids are machine-dependent
#define WAKEUP_ID 316
#define WAKEUP_NEW_ID 315
#define SWITCH_ID 314
#define EXIT_ID 311
struct rbftrace_event_raw {
unsigned short id;
unsigned long long ts;
/* Common fields. If sched_switch, this information refers to the prev process */
pid_t pid;
int prio;
/* sched_switch only */
long prev_state; // Current state of the previous process
pid_t next_pid;
int next_prio;
/* sched_wakeup only*/
int success;
int target_cpu;
};
/* Data of recorder threads */
struct recorder_data {
int pid;
int event_pipe[2];
int cpu;
int closed;
struct tracecmd_input *stream;
struct tep_record *record;
};
/* Record */
struct recorder_data *create_recorders(struct tracefs_instance *tracefs, int cpu_cnt);
int create_recorder(int cpu, int *event_pipe, char *tracefs_path);
void stop_threads(struct recorder_data *recorders, int cpu_cnt);
void wait_threads(struct recorder_data *recorders, int cpu_cnt);
/* Stream */
int parse_event_rbftrace(struct tep_event *source, struct rbftrace_event_raw *target, struct tep_record *record);
struct tracecmd_input *init_stream(int read_fd, int cpu, int cpu_cnt);
int read_stream(struct recorder_data *recorders, int cpu_cnt, struct rbftrace_event_raw *rbf_event);
void print_event(struct rbftrace_event_raw *event);
src/events_generation/binary_parser/trace-rbftrace.c 0 → 120000
View file @ 53817980
lib/trace-cmd/lib/trace-cmd/trace-rbftrace.c
\ No newline at end of file
src/events_generation/bindings.rs
View file @ 53817980
......@@ -389,33 +389,33 @@ fn bindgen_test_layout_recorder_data() {
);
}
extern "C" {
pub fn create_recorders(
pub fn rbftrace_create_recorders(
tracefs: *mut tracefs_instance,
cpu_cnt: ::std::os::raw::c_int,
) -> *mut recorder_data;
}
extern "C" {
pub fn create_recorder(
pub fn rbftrace_create_recorder(
cpu: ::std::os::raw::c_int,
event_pipe: *mut ::std::os::raw::c_int,
tracefs_path: *mut ::std::os::raw::c_char,
) -> ::std::os::raw::c_int;
}
extern "C" {
pub fn stop_threads(recorders: *mut recorder_data, cpu_cnt: ::std::os::raw::c_int);
pub fn rbftrace_stop_threads(recorders: *mut recorder_data, cpu_cnt: ::std::os::raw::c_int);
}
extern "C" {
pub fn wait_threads(recorders: *mut recorder_data, cpu_cnt: ::std::os::raw::c_int);
pub fn rbftrace_wait_threads(recorders: *mut recorder_data, cpu_cnt: ::std::os::raw::c_int);
}
extern "C" {
pub fn init_stream(
pub fn rbftrace_init_stream(
read_fd: ::std::os::raw::c_int,
cpu: ::std::os::raw::c_int,
cpu_cnt: ::std::os::raw::c_int,
) -> *mut tracecmd_input;
}
extern "C" {
pub fn read_stream(
pub fn rbftrace_read_stream(
recorders: *mut recorder_data,
cpu_cnt: ::std::os::raw::c_int,
rbf_event: *mut rbftrace_event_raw,
......
src/events_generation/wrappers.rs
View file @ 53817980
......@@ -9,14 +9,14 @@ use std::ptr;
pub fn init_recorders(tracefs: *mut tracefs_instance, cpu_cnt: i32) -> *mut recorder_data {
unsafe {
return create_recorders(tracefs, cpu_cnt);
return rbftrace_create_recorders(tracefs, cpu_cnt);
}
}
pub fn read_stream_raw(recorders: *mut recorder_data, cpu_cnt: i32) -> Option<rbftrace_event_raw> {
unsafe {
let mut event = MaybeUninit::<rbftrace_event_raw>::uninit();
let ret = read_stream(recorders, cpu_cnt, event.as_mut_ptr());
let ret = rbftrace_read_stream(recorders, cpu_cnt, event.as_mut_ptr());
if ret > 0 {
Some(event.assume_init())
......@@ -28,13 +28,13 @@ pub fn read_stream_raw(recorders: *mut recorder_data, cpu_cnt: i32) -> Option<rb
pub fn stop_recorder_threads(recorders: *mut recorder_data, cpu_cnt: i32) {
unsafe {
stop_threads(recorders, cpu_cnt);
rbftrace_stop_threads(recorders, cpu_cnt);
}
}
pub fn wait_recorder_threads(recorders: *mut recorder_data, cpu_cnt: i32) {
unsafe {
wait_threads(recorders, cpu_cnt);
rbftrace_wait_threads(recorders, cpu_cnt);
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment