Cleanup: Get rid of globals find_rt_cpu_number / set_namef

Author: hdiethelm

src/rtapi/uspace_rtapi_app.cc

@@ -234,7 +234,7 @@ static void parse_cpu_list(const char *path, cpu_set_t *cpuset) {
     fclose(fp);
 }
 
-int find_rt_cpu_number() {
+int RtapiApp::find_rt_cpu_number() {
     if (getenv("RTAPI_CPU_NUMBER"))
         return atoi(getenv("RTAPI_CPU_NUMBER"));
 
@@ -269,7 +269,7 @@ int find_rt_cpu_number() {
 #endif
 }
 
-void set_namef(const char *fmt, ...) {
+void RtapiApp::set_namef(const char *fmt, ...) {
     char *buf = NULL;
     va_list ap;
 

src/rtapi/uspace_rtapi_app.hh

@@ -110,6 +110,8 @@ struct RtapiApp {
     virtual int run_threads(int fd, int (*callback)(int fd)) = 0;
     virtual long long do_get_time(void) = 0;
     virtual void do_delay(long ns) = 0;
+    static int find_rt_cpu_number();
+    static void set_namef(const char *fmt, ...);
     int policy;
     long period;
     static struct rtapi_task *task_array[MAX_TASKS];
@@ -119,8 +121,5 @@ template <class T = rtapi_task> T *rtapi_get_task(int task_id) {
     return static_cast<T *>(RtapiApp::get_task(task_id));
 }
 
-int find_rt_cpu_number();
-void set_namef(const char *fmt, ...);
-
 #define WITH_ROOT WithRoot root
 #endif

src/rtapi/uspace_rtapi_main.cc

@@ -70,7 +70,7 @@ static boost::lockfree::queue<message_t, boost::lockfree::capacity<128>> rtapi_m
 
 static pthread_t queue_thread;
 static void *queue_function(void * /*arg*/) {
-    set_namef("rtapi_app:mesg");
+    RtapiApp::set_namef("rtapi_app:mesg");
     // note: can't use anything in this function that requires App() to exist
     // but it's OK to use functions that aren't safe for realtime (that's the
     // point of running this in a thread)