From 33bb451fafb346462c485fd41b7971f9e49e2e80 Mon Sep 17 00:00:00 2001 From: Dan Kalowsky Date: Tue, 28 Apr 2015 11:35:52 -0700 Subject: [PATCH] Renaming K_workload to _k_node_workload_get Updating micro kernel functions to follow a consistent naming convention. Part of that process is the removal of camelCase naming conventions for the preferred_underscore_method. Change accomplished with the following script: #!/bin/bash echo "Searching for ${1} to replace with ${2}" find . -type f \( -iname \*.c -o -iname \*.h -o -iname \*.s -o -iname \*.kconf \) \ -not \( -path host/src/genIdt -prune \) \ \ -not \( -path host/src/gen_tables -prune \) \ -print | xargs sed -i "s/"${1}"/"${2}"/g" Change-Id: I6b3d61c9ae7b024bb82356678cc2fc1d433dd3bc Signed-off-by: Dan Kalowsky --- include/microkernel/entries.h | 2 +- kernel/microkernel/idle.c | 4 ++-- kernel/microkernel/include/kticks.h | 2 +- scripts/sysgen.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/microkernel/entries.h b/include/microkernel/entries.h index 161b9c89319..9f7b7e9874e 100644 --- a/include/microkernel/entries.h +++ b/include/microkernel/entries.h @@ -45,7 +45,7 @@ typedef void (*kernelfunc)(struct k_args *); extern void K_nop(struct k_args *); extern void _k_offload_to_fiber(struct k_args *); -extern void K_workload(struct k_args *); +extern void _k_node_workload_get(struct k_args *); extern void _k_sem_signal(struct k_args *); extern void _k_sem_group_signal(struct k_args *); extern void _k_sem_reset(struct k_args *); diff --git a/kernel/microkernel/idle.c b/kernel/microkernel/idle.c index dbbc083e4af..7eb277c1d15 100644 --- a/kernel/microkernel/idle.c +++ b/kernel/microkernel/idle.c @@ -136,7 +136,7 @@ void workload_monitor_calibrate(void) #ifdef CONFIG_WORKLOAD_MONITOR -void K_workload(struct k_args *P) +void _k_node_workload_get(struct k_args *P) { unsigned int k, t; signed int iret; @@ -162,7 +162,7 @@ void K_workload(struct k_args *P) P->Args.u1.rval = iret; } #else -void K_workload(struct k_args *P) +void _k_node_workload_get(struct k_args *P) { P->Args.u1.rval = 0; } diff --git a/kernel/microkernel/include/kticks.h b/kernel/microkernel/include/kticks.h index f41f39e4e9b..a05c540b69b 100644 --- a/kernel/microkernel/include/kticks.h +++ b/kernel/microkernel/include/kticks.h @@ -64,7 +64,7 @@ extern void _k_timer_stop(struct k_args *P); extern void _k_task_sleep(struct k_args *P); extern void _k_task_wakeup(struct k_args *P); extern void _k_time_elapse(struct k_args *P); -extern void K_workload(struct k_args *P); +extern void _k_node_workload_get(struct k_args *P); extern int64_t _LowTimeGet(void); extern void _LowTimeInc(int inc); diff --git a/scripts/sysgen.py b/scripts/sysgen.py index fe59dbb1f2b..e8d7b0a0481 100755 --- a/scripts/sysgen.py +++ b/scripts/sysgen.py @@ -759,7 +759,7 @@ def kernel_main_c_kernel_services(): "/* 2 */ (kernelfunc) NULL,", # unused "/* 3 */ (kernelfunc) NULL,", # unused "/* 4 */ _k_offload_to_fiber,", # required -"/* 5 */ K_workload,", # required +"/* 5 */ _k_node_workload_get,", # required "/* 6 */ _k_sem_signal,", # depends on semaphores "/* 7 */ _k_sem_group_signal,", # depends on semaphores "/* 8 */ _k_sem_reset,", # depends on semaphores