Skip to content

Commit

Permalink
runtime: support configurations without moninj, log or dds
Browse files Browse the repository at this point in the history
sbourdeauducq committed Nov 6, 2016
1 parent 7dcc987 commit 453e8b7
Showing 3 changed files with 9 additions and 2 deletions.
7 changes: 5 additions & 2 deletions artiq/runtime.rs/libksupport/api.rs
Original file line number Diff line number Diff line change
@@ -105,13 +105,16 @@ static mut API: &'static [(&'static str, *const ())] = &[
api!(rtio_input_timestamp),
api!(rtio_input_data),

// #if ((defined CONFIG_RTIO_DDS_COUNT) && (CONFIG_RTIO_DDS_COUNT > 0))
#[cfg(rtio_dds_count)]
api!(dds_init),
#[cfg(rtio_dds_count)]
api!(dds_init_sync),
#[cfg(rtio_dds_count)]
api!(dds_batch_enter),
#[cfg(rtio_dds_count)]
api!(dds_batch_exit),
#[cfg(rtio_dds_count)]
api!(dds_set),
// #endif

api!(i2c_init),
api!(i2c_start),
2 changes: 2 additions & 0 deletions artiq/runtime.rs/src/lib.rs
Original file line number Diff line number Diff line change
@@ -75,6 +75,7 @@ mod rpc_proto;

mod kernel;
mod session;
#[cfg(has_rtio_moninj)]
mod moninj;
#[cfg(has_rtio_analyzer)]
mod analyzer;
@@ -109,6 +110,7 @@ pub unsafe extern fn rust_main() {

let mut scheduler = sched::Scheduler::new();
scheduler.spawner().spawn(16384, session::thread);
#[cfg(has_rtio_moninj)]
scheduler.spawner().spawn(4096, moninj::thread);
#[cfg(has_rtio_analyzer)]
scheduler.spawner().spawn(4096, analyzer::thread);
2 changes: 2 additions & 0 deletions artiq/runtime/rtio.c
Original file line number Diff line number Diff line change
@@ -124,6 +124,7 @@ unsigned int rtio_input_data(int channel)

void rtio_log_va(long long int timestamp, const char *fmt, va_list args)
{
#ifdef CONFIG_RTIO_LOG_CHANNEL
// This executes on the kernel CPU's stack, which is specifically designed
// for allocation of this kind of massive buffers.
int len = vsnprintf(NULL, 0, fmt, args);
@@ -152,6 +153,7 @@ void rtio_log_va(long long int timestamp, const char *fmt, va_list args)
i = 0;
}
}
#endif
}

void rtio_log(long long int timestamp, const char *fmt, ...)

0 comments on commit 453e8b7

Please sign in to comment.