Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-06 15:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

libtest: Simplify runtime measurement support

Browse Source 
Use the test case allocator functions T_zalloc() and T_malloc().
Restore the task affinity of the runner task.
This commit is contained in:
Sebastian Huber
2020-11-10 10:40:51 +01:00
parent eae22cc03e
commit 33cd037bf1
1 changed files with 32 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
cpukit/libtest/t-test-rtems-measure.c
View File

@@ -43,7 +43,6 @@ typedef struct {
} load_context; } load_context;
struct T_measure_runtime_context { struct T_measure_runtime_context {
T_destructor destructor;
size_t sample_count; size_t sample_count;
T_ticks *samples; T_ticks *samples;
size_t cache_line_size; size_t cache_line_size;
@@ -52,6 +51,9 @@ struct T_measure_runtime_context {
rtems_id runner; rtems_id runner;
uint32_t load_count; uint32_t load_count;
load_context *load_contexts; load_context *load_contexts;
#ifdef RTEMS_SMP
cpu_set_t cpus;
#endif
}; };
static unsigned int static unsigned int
@@ -127,34 +129,28 @@ load_worker(rtems_task_argument arg)
} }
static void static void
destroy_worker(const T_measure_runtime_context *ctx) destroy(void *ptr)
{ {
const T_measure_runtime_context *ctx;
uint32_t load; uint32_t load;
ctx = ptr;
for (load = 0; load < ctx->load_count; ++load) { for (load = 0; load < ctx->load_count; ++load) {
const load_context *lctx; const load_context *lctx;
lctx = &ctx->load_contexts[load]; lctx = &ctx->load_contexts[load];
if (lctx->chunk != ctx->chunk) {
free(RTEMS_DEVOLATILE(unsigned int *, lctx->chunk));
}
if (lctx->id != 0) { if (lctx->id != 0) {
rtems_task_delete(lctx->id); (void)rtems_task_delete(lctx->id);
} }
} }
}
static void #ifdef RTEMS_SMP
destroy(T_destructor *dtor) (void)rtems_task_set_affinity(RTEMS_SELF, sizeof(ctx->cpus),
{ &ctx->cpus);
T_measure_runtime_context *ctx; #endif
ctx = (T_measure_runtime_context *)dtor;
destroy_worker(ctx);
free(ctx);
} }
static void * static void *
@@ -166,7 +162,7 @@ add_offset(const volatile void *p, uintptr_t o)
static void * static void *
align_up(const volatile void *p, uintptr_t a) align_up(const volatile void *p, uintptr_t a)
{ {
return (void *)(((uintptr_t)p + a - 1) & ~(a - 1)); return (void *)RTEMS_ALIGN_UP((uintptr_t)p, a);
} }
T_measure_runtime_context * T_measure_runtime_context *
@@ -178,7 +174,6 @@ T_measure_runtime_create(const T_measure_runtime_config *config)
size_t chunk_size; size_t chunk_size;
size_t load_size; size_t load_size;
uint32_t load_count; uint32_t load_count;
bool success;
uint32_t i; uint32_t i;
#ifdef RTEMS_SMP #ifdef RTEMS_SMP
cpu_set_t cpu; cpu_set_t cpu;
@@ -203,13 +198,21 @@ T_measure_runtime_create(const T_measure_runtime_config *config)
load_count = rtems_scheduler_get_processor_maximum(); load_count = rtems_scheduler_get_processor_maximum();
load_size = load_count * sizeof(ctx->load_contexts[0]); load_size = load_count * sizeof(ctx->load_contexts[0]);
ctx = malloc(sizeof(*ctx) + sample_size + load_size + chunk_size + ctx = T_zalloc(sizeof(*ctx) + sample_size + load_size + chunk_size +
2 * cache_line_size); 2 * cache_line_size, destroy);
if (ctx == NULL) { if (ctx == NULL) {
return NULL; return NULL;
} }
#ifdef RTEMS_SMP
(void)rtems_task_get_affinity(RTEMS_SELF, sizeof(ctx->cpus),
&ctx->cpus);
CPU_ZERO(&cpu);
CPU_SET(0, &cpu);
(void)rtems_task_set_affinity(RTEMS_SELF, sizeof(cpu), &cpu);
#endif
ctx->sample_count = config->sample_count; ctx->sample_count = config->sample_count;
ctx->samples = add_offset(ctx, sizeof(*ctx)); ctx->samples = add_offset(ctx, sizeof(*ctx));
ctx->cache_line_size = cache_line_size; ctx->cache_line_size = cache_line_size;
@@ -221,45 +224,39 @@ T_measure_runtime_create(const T_measure_runtime_config *config)
ctx->samples = align_up(ctx->samples, cache_line_size); ctx->samples = align_up(ctx->samples, cache_line_size);
ctx->chunk = align_up(ctx->chunk, cache_line_size); ctx->chunk = align_up(ctx->chunk, cache_line_size);
memset(ctx->load_contexts, 0, load_size);
success = true;
for (i = 0; i < load_count; ++i) { for (i = 0; i < load_count; ++i) {
rtems_status_code sc; rtems_status_code sc;
rtems_id id; rtems_id id;
load_context *lctx; load_context *lctx;
#ifdef RTEMS_SMP rtems_task_priority max_prio;
rtems_task_priority priority;
rtems_id scheduler; rtems_id scheduler;
sc = rtems_scheduler_ident_by_processor(i, &scheduler); sc = rtems_scheduler_ident_by_processor(i, &scheduler);
if (sc != RTEMS_SUCCESSFUL) { if (sc != RTEMS_SUCCESSFUL) {
continue; continue;
} }
#endif
sc = rtems_task_create(rtems_build_name('L', 'O', 'A', 'D'), sc = rtems_task_create(rtems_build_name('L', 'O', 'A', 'D'),
RTEMS_MAXIMUM_PRIORITY - 1, RTEMS_MINIMUM_STACK_SIZE, 1, RTEMS_MINIMUM_STACK_SIZE, RTEMS_DEFAULT_MODES,
RTEMS_DEFAULT_MODES, RTEMS_DEFAULT_ATTRIBUTES, &id); RTEMS_DEFAULT_ATTRIBUTES, &id);
if (sc != RTEMS_SUCCESSFUL) { if (sc != RTEMS_SUCCESSFUL) {
success = false; return NULL;
break;
} }
lctx = &ctx->load_contexts[i]; lctx = &ctx->load_contexts[i];
lctx->master = ctx; lctx->master = ctx;
lctx->id = id; lctx->id = id;
lctx->chunk = malloc(chunk_size); lctx->chunk = T_malloc(chunk_size);
if (lctx->chunk == NULL) { if (lctx->chunk == NULL) {
lctx->chunk = ctx->chunk; lctx->chunk = ctx->chunk;
} }
#ifdef RTEMS_SMP (void)rtems_scheduler_get_maximum_priority(scheduler, &max_prio);
(void)rtems_scheduler_get_maximum_priority(scheduler, &priority); (void)rtems_task_set_scheduler(id, scheduler, max_prio - 1);
(void)rtems_task_set_scheduler(id, scheduler, priority - 1);
#ifdef RTEMS_SMP
CPU_ZERO(&cpu); CPU_ZERO(&cpu);
CPU_SET((int)i, &cpu); CPU_SET((int)i, &cpu);
(void)rtems_task_set_affinity(id, sizeof(cpu), &cpu); (void)rtems_task_set_affinity(id, sizeof(cpu), &cpu);
@@ -272,18 +269,6 @@ T_measure_runtime_create(const T_measure_runtime_config *config)
suspend_worker(lctx); suspend_worker(lctx);
} }
if (success) {
#ifdef RTEMS_SMP
CPU_ZERO(&cpu);
CPU_SET(0, &cpu);
(void)rtems_task_set_affinity(RTEMS_SELF, sizeof(cpu), &cpu);
#endif
} else {
destroy(&ctx->destructor);
return NULL;
}
T_add_destructor(&ctx->destructor, destroy);
return ctx; return ctx;
} }