Module: xenomai-3
Branch: master
Commit: 7ed693c136e204f4723598e050cd82d7cf244a84
URL:    
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=7ed693c136e204f4723598e050cd82d7cf244a84

Author: Philippe Gerum <r...@xenomai.org>
Date:   Sun Jun 21 11:52:39 2015 +0200

testsuite/smokey: convert progress messages to smokey traces

---

 testsuite/smokey/bufp/bufp.c               |    4 ++--
 testsuite/smokey/iddp/iddp.c               |    4 ++--
 testsuite/smokey/posix-cond/posix-cond.c   |   26 +++++++++++-----------
 testsuite/smokey/posix-mutex/posix-mutex.c |   32 ++++++++++++++--------------
 testsuite/smokey/rtdm/rtdm.c               |   18 ++++++++--------
 testsuite/smokey/sched-quota/sched-quota.c |   12 +++++------
 testsuite/smokey/sched-tp/sched-tp.c       |   16 +++++++-------
 testsuite/smokey/sigdebug/sigdebug.c       |    6 +++---
 testsuite/smokey/vdso-access/vdso-access.c |    4 ++--
 testsuite/smokey/xddp/xddp.c               |    6 +++---
 10 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/testsuite/smokey/bufp/bufp.c b/testsuite/smokey/bufp/bufp.c
index 638cde9..4705ee1 100644
--- a/testsuite/smokey/bufp/bufp.c
+++ b/testsuite/smokey/bufp/bufp.c
@@ -84,7 +84,7 @@ static void *server(void *arg)
                        fail("recvfrom");
                }
                smokey_trace("%s: received %d bytes, %ld from port %d",
-                            __FUNCTION__, ret, data, claddr.sipc_port);
+                            __func__, ret, data, claddr.sipc_port);
        }
 
        return NULL;
@@ -123,7 +123,7 @@ static void *client(void *arg)
                        close(s);
                        fail("sendto");
                }
-               smokey_trace("%s: sent %d bytes, %ld", __FUNCTION__, ret, data);
+               smokey_trace("%s: sent %d bytes, %ld", __func__, ret, data);
                ts.tv_sec = 0;
                ts.tv_nsec = 100000000; /* 100 ms */
                clock_nanosleep(CLOCK_REALTIME, 0, &ts, NULL);
diff --git a/testsuite/smokey/iddp/iddp.c b/testsuite/smokey/iddp/iddp.c
index ccc4ea4..2117e31 100644
--- a/testsuite/smokey/iddp/iddp.c
+++ b/testsuite/smokey/iddp/iddp.c
@@ -84,7 +84,7 @@ static void *server(void *arg)
                        fail("recvfrom");
                }
                smokey_trace("%s: received %d bytes, %ld from port %d",
-                            __FUNCTION__, ret, data, claddr.sipc_port);
+                            __func__, ret, data, claddr.sipc_port);
        }
 
        return NULL;
@@ -127,7 +127,7 @@ static void *client(void *arg)
                        close(s);
                        fail("sendto");
                }
-               smokey_trace("%s: sent %d bytes, %ld", __FUNCTION__, ret, data);
+               smokey_trace("%s: sent %d bytes, %ld", __func__, ret, data);
                ts.tv_sec = 0;
                ts.tv_nsec = 100000000; /* 100 ms */
                clock_nanosleep(CLOCK_REALTIME, 0, &ts, NULL);
diff --git a/testsuite/smokey/posix-cond/posix-cond.c 
b/testsuite/smokey/posix-cond/posix-cond.c
index cd5c922..cea2516 100644
--- a/testsuite/smokey/posix-cond/posix-cond.c
+++ b/testsuite/smokey/posix-cond/posix-cond.c
@@ -162,12 +162,12 @@ static void check_inner(const char *file, int line, const 
char *fn, const char *
        exit(EXIT_FAILURE);
 }
 #define check(msg, status, expected) \
-       check_inner(__FILE__, __LINE__, __FUNCTION__, msg, status, expected)
+       check_inner(__FILE__, __LINE__, __func__, msg, status, expected)
 
 #define check_unix(msg, status, expected)                              \
        ({                                                              \
                int s = (status);                                       \
-               check_inner(__FILE__, __LINE__, __FUNCTION__, msg, s < 0 ? 
-errno : s, expected); \
+               check_inner(__FILE__, __LINE__, __func__, msg, s < 0 ? -errno : 
s, expected); \
        })
 
 static void check_sleep_inner(const char *fn,
@@ -182,7 +182,7 @@ static void check_sleep_inner(const char *fn,
        }
 }
 #define check_sleep(prefix, start) \
-       check_sleep_inner(__FUNCTION__, prefix, start)
+       check_sleep_inner(__func__, prefix, start)
 
 struct cond_mutex {
        pthread_mutex_t *mutex;
@@ -216,7 +216,7 @@ static void simple_condwait(void)
        };
        pthread_t cond_signaler_tid;
 
-       fprintf(stderr, "%s\n", __FUNCTION__);
+       smokey_trace("%s", __func__);
 
        check("mutex_init", mutex_init(&mutex, PTHREAD_MUTEX_DEFAULT, 0), 0);
        check("cond_init", cond_init(&cond, 0), 0);
@@ -241,7 +241,7 @@ static void relative_condwait(void)
        pthread_mutex_t mutex;
        pthread_cond_t cond;
 
-       fprintf(stderr, "%s\n", __FUNCTION__);
+       smokey_trace("%s", __func__);
 
        check("mutex_init", mutex_init(&mutex, PTHREAD_MUTEX_DEFAULT, 0), 0);
        check("cond_init", cond_init(&cond, 0), 0);
@@ -264,7 +264,7 @@ static void absolute_condwait(void)
        pthread_mutex_t mutex;
        pthread_cond_t cond;
 
-       fprintf(stderr, "%s\n", __FUNCTION__);
+       smokey_trace("%s", __func__);
 
        check("mutex_init", mutex_init(&mutex, PTHREAD_MUTEX_DEFAULT, 0), 0);
        check("cond_init", cond_init(&cond, 1), 0);
@@ -320,7 +320,7 @@ static void sig_norestart_condwait(void)
        };
        sigemptyset(&sa.sa_mask);
 
-       fprintf(stderr, "%s\n", __FUNCTION__);
+       smokey_trace("%s", __func__);
 
        check_unix("sigaction", sigaction(SIGRTMIN, &sa, NULL), 0);
        check("mutex_init", mutex_init(&mutex, PTHREAD_MUTEX_DEFAULT, 0), 0);
@@ -358,7 +358,7 @@ static void sig_restart_condwait(void)
        };
        sigemptyset(&sa.sa_mask);
 
-       fprintf(stderr, "%s\n", __FUNCTION__);
+       smokey_trace("%s", __func__);
 
        check_unix("sigaction", sigaction(SIGRTMIN, &sa, NULL), 0);
        check("mutex_init", mutex_init(&mutex, PTHREAD_MUTEX_DEFAULT, 0), 0);
@@ -412,7 +412,7 @@ static void sig_norestart_condwait_mutex(void)
        };
        sigemptyset(&sa.sa_mask);
 
-       fprintf(stderr, "%s\n", __FUNCTION__);
+       smokey_trace("%s", __func__);
 
        check_unix("sigaction", sigaction(SIGRTMIN, &sa, NULL), 0);
        check("mutex_init", mutex_init(&mutex, PTHREAD_MUTEX_DEFAULT, 0), 0);
@@ -452,7 +452,7 @@ static void sig_restart_condwait_mutex(void)
        };
        sigemptyset(&sa.sa_mask);
 
-       fprintf(stderr, "%s\n", __FUNCTION__);
+       smokey_trace("%s", __func__);
 
        check_unix("sigaction", sigaction(SIGRTMIN, &sa, NULL), 0);
        check("mutex_init", mutex_init(&mutex, PTHREAD_MUTEX_DEFAULT, 0), 0);
@@ -508,7 +508,7 @@ static void sig_norestart_double(void)
        };
        sigemptyset(&sa.sa_mask);
 
-       fprintf(stderr, "%s\n", __FUNCTION__);
+       smokey_trace("%s", __func__);
 
        check_unix("sigaction", sigaction(SIGRTMIN, &sa, NULL), 0);
        check("mutex_init", mutex_init(&mutex, PTHREAD_MUTEX_DEFAULT, 0), 0);
@@ -548,7 +548,7 @@ static void sig_restart_double(void)
        };
        sigemptyset(&sa.sa_mask);
 
-       fprintf(stderr, "%s\n", __FUNCTION__);
+       smokey_trace("%s", __func__);
 
        check_unix("sigaction", sigaction(SIGRTMIN, &sa, NULL), 0);
        check("mutex_init", mutex_init(&mutex, PTHREAD_MUTEX_DEFAULT, 0), 0);
@@ -604,7 +604,7 @@ static void cond_destroy_whilewait(void)
        };
        sigemptyset(&sa.sa_mask);
 
-       fprintf(stderr, "%s\n", __FUNCTION__);
+       smokey_trace("%s", __func__);
 
        check_unix("sigaction", sigaction(SIGRTMIN, &sa, NULL), 0);
        check("mutex_init", mutex_init(&mutex, PTHREAD_MUTEX_DEFAULT, 0), 0);
diff --git a/testsuite/smokey/posix-mutex/posix-mutex.c 
b/testsuite/smokey/posix-mutex/posix-mutex.c
index 770463b..173182f 100644
--- a/testsuite/smokey/posix-mutex/posix-mutex.c
+++ b/testsuite/smokey/posix-mutex/posix-mutex.c
@@ -57,8 +57,8 @@ static void sigdebug(int sig, siginfo_t *si, void *context)
 {
        unsigned int reason = sigdebug_reason(si);
 
-       printf("\nSIGDEBUG received, reason %d: %s\n", reason,
-              reason <= SIGDEBUG_WATCHDOG ? reason_str[reason] : "<unknown>");
+       smokey_trace("\nSIGDEBUG received, reason %d: %s\n", reason,
+                    reason <= SIGDEBUG_WATCHDOG ? reason_str[reason] : 
"<unknown>");
 }
 
 static inline unsigned long long timer_get_tsc(void)
@@ -281,7 +281,7 @@ static void autoinit_simple_wait(void)
        pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
        pthread_t waiter_tid;
 
-       fprintf(stderr, "autoinit_simple_wait\n");
+       smokey_trace("%s", __func__);
 
        dispatch("simple mutex_lock 1", MUTEX_LOCK, 1, 0, &mutex);
        dispatch("simple thread_create", THREAD_CREATE, 1, 0, &waiter_tid, 2,
@@ -309,7 +309,7 @@ static void simple_wait(void)
        pthread_mutex_t mutex;
        pthread_t waiter_tid;
 
-       fprintf(stderr, "simple_wait\n");
+       smokey_trace("%s", __func__);
 
        dispatch("simple mutex_init", MUTEX_CREATE, 1, 0, &mutex, 0, 0);
        dispatch("simple mutex_lock 1", MUTEX_LOCK, 1, 0, &mutex);
@@ -338,7 +338,7 @@ static void autoinit_recursive_wait(void)
        pthread_mutex_t mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
        pthread_t waiter_tid;
 
-       fprintf(stderr, "autoinit_recursive_wait\n");
+       smokey_trace("%s", __func__);
 
        dispatch("rec mutex_lock 1", MUTEX_LOCK, 1, 0, &mutex);
        dispatch("rec mutex_lock 2", MUTEX_LOCK, 1, 0, &mutex);
@@ -370,7 +370,7 @@ static void recursive_wait(void)
        pthread_mutex_t mutex;
        pthread_t waiter_tid;
 
-       fprintf(stderr, "recursive_wait\n");
+       smokey_trace("%s", __func__);
 
        dispatch("rec mutex_init", MUTEX_CREATE, 1, 0, &mutex, 0,
                 PTHREAD_MUTEX_RECURSIVE);
@@ -405,7 +405,7 @@ static void autoinit_errorcheck_wait(void)
        pthread_t waiter_tid;
        int err;
 
-       fprintf(stderr, "autoinit_errorcheck_wait\n");
+       smokey_trace("%s", __func__);
 
        dispatch("errorcheck mutex_lock 1", MUTEX_LOCK, 1, 0, &mutex);
 
@@ -447,7 +447,7 @@ static void errorcheck_wait(void)
        pthread_t waiter_tid;
        int err;
 
-       fprintf(stderr, "errorcheck_wait\n");
+       smokey_trace("%s", __func__);
 
        dispatch("errorcheck mutex_init", MUTEX_CREATE, 1, 0, &mutex, 0,
                 PTHREAD_MUTEX_ERRORCHECK);
@@ -509,7 +509,7 @@ static void timed_mutex(void)
        pthread_mutex_t mutex;
        pthread_t waiter_tid;
 
-       fprintf(stderr, "timed_mutex\n");
+       smokey_trace("%s", __func__);
 
        dispatch("timed_mutex mutex_init", MUTEX_CREATE, 1, 0, &mutex, 1, 0);
        dispatch("timed_mutex mutex_lock 1", MUTEX_LOCK, 1, 0, &mutex);
@@ -529,7 +529,7 @@ static void mode_switch(void)
        /* Cause a switch to secondary mode */
        __real_sched_yield();
 
-       fprintf(stderr, "mode_switch\n");
+       smokey_trace("%s", __func__);
 
        dispatch("switch mutex_init", MUTEX_CREATE, 1, 0, &mutex, 1, 0);
 
@@ -553,7 +553,7 @@ static void pi_wait(void)
        smokey_note("PTHREAD_PRIO_INHERIT not supported");
        return;
 #endif
-       fprintf(stderr, "pi_wait\n");
+       smokey_trace("%s", __func__);
 
        dispatch("pi mutex_init", MUTEX_CREATE, 1, 0, &mutex, 1, 0);
        dispatch("pi mutex_lock 1", MUTEX_LOCK, 1, 0, &mutex);
@@ -593,7 +593,7 @@ static void lock_stealing(void)
           priority. Then main thread releases the mutex, but locks it again
           without giving the waiter a chance to get it beforehand. */
 
-       fprintf(stderr, "lock_stealing\n");
+       smokey_trace("%s", __func__);
 
        dispatch("lock_stealing mutex_init", MUTEX_CREATE, 1, 0, &mutex, 1, 0);
        dispatch("lock_stealing mutex_lock 1", MUTEX_LOCK, 1, 0, &mutex);
@@ -673,7 +673,7 @@ static void deny_stealing(void)
        pthread_mutex_t mutex;
        pthread_t lowprio_tid;
 
-       fprintf(stderr, "deny_stealing\n");
+       smokey_trace("%s", __func__);
 
        dispatch("deny_stealing mutex_init", MUTEX_CREATE, 1, 0, &mutex, 1, 0);
        dispatch("deny_stealing mutex_lock 1", MUTEX_LOCK, 1, 0, &mutex);
@@ -762,7 +762,7 @@ static void simple_condwait(void)
        };
        pthread_t cond_signaler_tid;
 
-       fprintf(stderr, "simple_condwait\n");
+       smokey_trace("%s", __func__);
 
        dispatch("simple_condwait mutex_init", MUTEX_CREATE, 1, 0, &mutex);
        dispatch("simple_condwait cond_init", COND_CREATE, 1, 0, &cond);
@@ -800,7 +800,7 @@ static void recursive_condwait(void)
        };
        pthread_t cond_signaler_tid;
 
-       fprintf(stderr, "recursive_condwait\n");
+       smokey_trace("%s", __func__);
 
        dispatch("rec_condwait mutex_init", MUTEX_CREATE, 1, 0, &mutex, 0,
                 PTHREAD_MUTEX_RECURSIVE);
@@ -860,7 +860,7 @@ static void auto_switchback(void)
        pthread_t nrt_lock_tid;
        pthread_mutex_t mutex;
 
-       fprintf(stderr, "auto_switchback\n");
+       smokey_trace("%s", __func__);
 
        dispatch("auto_switchback mutex_init", MUTEX_CREATE, 1, 0, &mutex, 1,
                 PTHREAD_MUTEX_RECURSIVE);
diff --git a/testsuite/smokey/rtdm/rtdm.c b/testsuite/smokey/rtdm/rtdm.c
index 1e2d6bc..e22b78c 100644
--- a/testsuite/smokey/rtdm/rtdm.c
+++ b/testsuite/smokey/rtdm/rtdm.c
@@ -43,14 +43,14 @@ static void check_inner(const char *fn, int line, const 
char *msg,
 
 #define check(msg, status, expected) ({                                        
\
        int __status = status;                                          \
-       check_inner(__FUNCTION__, __LINE__, msg,                        \
+       check_inner(__func__, __LINE__, msg,                    \
                    __status < 0 ? -errno : __status, expected);        \
        __status;                                                       \
 })
 
 #define check_no_error(msg, status) ({                                 \
        int __status = status;                                          \
-       check_inner(__FUNCTION__, __LINE__, msg,                        \
+       check_inner(__func__, __LINE__, msg,                    \
                    __status < 0 ? -errno : 0, 0);                      \
        __status;                                                       \
 })
@@ -68,7 +68,7 @@ static void check_sleep_inner(const char *fn, int line,
        }
 }
 #define check_sleep(msg, start) \
-       check_sleep_inner(__FUNCTION__, __LINE__, msg, start)
+       check_sleep_inner(__func__, __LINE__, msg, start)
 
 static const char *devname = "/dev/rtdm/rtdm0";
 static const char *devname2 = "/dev/rtdm/rtdm1";
@@ -82,17 +82,17 @@ static int run_rtdm(struct smokey_test *t, int argc, char 
*const argv[])
        if (status < 0 || WEXITSTATUS(status))
                return -ENOSYS;
 
-       printf("Setup\n");
+       smokey_trace("Setup");
        dev = check_no_error("open", open(devname, O_RDWR));
 
-       printf("Exclusive open\n");
+       smokey_trace("Exclusive open");
        check("open", open(devname, O_RDWR), -EBUSY);
 
-       printf("Successive open\n");
+       smokey_trace("Successive open");
        dev2 = check("open", open(devname2, O_RDWR), dev + 1);
        check("close", close(dev2), 0);
 
-       printf("Defer close by pending reference\n");
+       smokey_trace("Defer close by pending reference");
        check("ioctl", ioctl(dev, RTTST_RTIOC_RTDM_DEFER_CLOSE,
                             RTTST_RTDM_DEFER_CLOSE_CONTEXT), 0);
        start = timer_get_tsc();
@@ -103,13 +103,13 @@ static int run_rtdm(struct smokey_test *t, int argc, char 
*const argv[])
        usleep(301000);
        dev = check("open", open(devname, O_RDWR), dev);
 
-       printf("Normal close\n");
+       smokey_trace("Normal close");
        check("ioctl", ioctl(dev, RTTST_RTIOC_RTDM_DEFER_CLOSE,
                             RTTST_RTDM_NORMAL_CLOSE), 0);
        check("close", close(dev), 0);
        dev = check("open", open(devname, O_RDWR), dev);
 
-       printf("Deferred module unload\n");
+       smokey_trace("Deferred module unload");
        check("ioctl", ioctl(dev, RTTST_RTIOC_RTDM_DEFER_CLOSE,
                             RTTST_RTDM_DEFER_CLOSE_CONTEXT), 0);
        start = timer_get_tsc();
diff --git a/testsuite/smokey/sched-quota/sched-quota.c 
b/testsuite/smokey/sched-quota/sched-quota.c
index ece17e9..e51c78e 100644
--- a/testsuite/smokey/sched-quota/sched-quota.c
+++ b/testsuite/smokey/sched-quota/sched-quota.c
@@ -182,8 +182,8 @@ static double run_quota(int quota)
        if (ret)
                error(1, ret, "sched_setconfig_np(set-quota, tgid=%d)", tgid);
 
-       printf("new thread group #%d on CPU0, quota sum is %d%%\n",
-              tgid, cf.quota.info.quota_sum);
+       smokey_trace("new thread group #%d on CPU0, quota sum is %d%%",
+                    tgid, cf.quota.info.quota_sum);
 
        for (n = 0; n < nrthreads; n++) {
                sprintf(label, "t%d", n);
@@ -208,7 +208,7 @@ static double run_quota(int quota)
        percent = ((double)count / TEST_SECS) * 100.0 / loops_per_sec;
 
        for (n = 0; n < nrthreads; n++) {
-               __real_printf("done quota_thread[%d], count=%lu\n", n, 
counts[n]);
+               smokey_trace("done quota_thread[%d], count=%lu", n, counts[n]);
                pthread_cancel(threads[n]);
                pthread_join(threads[n], NULL);
        }
@@ -322,11 +322,11 @@ static int run_sched_quota(struct smokey_test *t, int 
argc, char *const argv[])
        calibrate();    /* Warming up, ignore result. */
        loops_per_sec = calibrate();
 
-       printf("calibrating: %Lu loops/sec\n", loops_per_sec);
+       smokey_trace("calibrating: %Lu loops/sec", loops_per_sec);
 
        effective = run_quota(quota);
-       __real_printf("%d thread%s: cap=%d%%, effective=%.1f%%\n",
-                     nrthreads, nrthreads > 1 ? "s": "", quota, effective);
+       smokey_trace("%d thread%s: cap=%d%%, effective=%.1f%%",
+                    nrthreads, nrthreads > 1 ? "s": "", quota, effective);
 
        return 0;
 }
diff --git a/testsuite/smokey/sched-tp/sched-tp.c 
b/testsuite/smokey/sched-tp/sched-tp.c
index 8635a97..4f5f7bc 100644
--- a/testsuite/smokey/sched-tp/sched-tp.c
+++ b/testsuite/smokey/sched-tp/sched-tp.c
@@ -169,15 +169,15 @@ static int run_sched_tp(struct smokey_test *t, int argc, 
char *const argv[])
        if (ret)
                error(1, ret, "sched_getconfig_np");
 
-       printf("check: %d windows\n", p->tp.nr_windows);
+       smokey_trace("check: %d windows", p->tp.nr_windows);
        for (n = 0; n < 4; n++)
-               printf("[%d] offset = { %ld s, %ld ns }, duration = { %ld s, 
%ld ns }, ptid = %d\n",
-                      n,
-                      p->tp.windows[n].offset.tv_sec,
-                      p->tp.windows[n].offset.tv_nsec,
-                      p->tp.windows[n].duration.tv_sec,
-                      p->tp.windows[n].duration.tv_nsec,
-                      p->tp.windows[n].ptid);
+               smokey_trace("[%d] offset = { %ld s, %ld ns }, duration = { %ld 
s, %ld ns }, ptid = %d",
+                            n,
+                            p->tp.windows[n].offset.tv_sec,
+                            p->tp.windows[n].offset.tv_nsec,
+                            p->tp.windows[n].duration.tv_sec,
+                            p->tp.windows[n].duration.tv_nsec,
+                            p->tp.windows[n].ptid);
 
        sem_init(&barrier, 0, 0);
        create_thread(threadA, 0);
diff --git a/testsuite/smokey/sigdebug/sigdebug.c 
b/testsuite/smokey/sigdebug/sigdebug.c
index 0e7efc5..dfd315e 100644
--- a/testsuite/smokey/sigdebug/sigdebug.c
+++ b/testsuite/smokey/sigdebug/sigdebug.c
@@ -69,20 +69,20 @@ static void check_sigdebug_inner(const char *fn, int line, 
const char *reason)
 
 #define check(msg, status, expected) ({                                        
\
        int __status = status;                                          \
-       check_inner(__FUNCTION__, __LINE__, msg, __status, expected);   \
+       check_inner(__func__, __LINE__, msg, __status, expected);       \
        __status;                                                       \
 })
 
 #define check_no_error(msg, status) ({                                 \
        int __status = status;                                          \
-       check_inner(__FUNCTION__, __LINE__, msg,                        \
+       check_inner(__func__, __LINE__, msg,                            \
                    __status < 0 ? __status : 0, 0);                    \
        __status;                                                       \
 })
 
 #define check_sigdebug_received(reason) do {                           \
        const char *__reason = reason;                                  \
-       check_sigdebug_inner(__FUNCTION__, __LINE__, __reason);         \
+       check_sigdebug_inner(__func__, __LINE__, __reason);             \
 } while (0)
 
 static void *rt_thread_body(void *cookie)
diff --git a/testsuite/smokey/vdso-access/vdso-access.c 
b/testsuite/smokey/vdso-access/vdso-access.c
index fbd0800..42c1b28 100644
--- a/testsuite/smokey/vdso-access/vdso-access.c
+++ b/testsuite/smokey/vdso-access/vdso-access.c
@@ -24,8 +24,8 @@ int run_vdso_access(struct smokey_test *t, int argc, char 
*const argv[])
                return 1;
        }
 
-       printf("VDSO: features detected: %llx\n",
-              (long long)cobalt_vdso->features);
+       smokey_trace("VDSO: features detected: %llx",
+                    (long long)cobalt_vdso->features);
 
        return 0;
 }
diff --git a/testsuite/smokey/xddp/xddp.c b/testsuite/smokey/xddp/xddp.c
index d6cb871..a311854 100644
--- a/testsuite/smokey/xddp/xddp.c
+++ b/testsuite/smokey/xddp/xddp.c
@@ -87,7 +87,7 @@ static void *realtime_thread1(void *arg)
                        fail("recvfrom");
                }
 
-               smokey_trace("%s: %ld relayed by peer", __FUNCTION__, data);
+               smokey_trace("%s: %ld relayed by peer", __func__, data);
        }
 
        return NULL;
@@ -151,7 +151,7 @@ static void *realtime_thread2(void *arg)
                fail("getpeername");
 
        smokey_trace("%s: NRT peer is reading from /dev/rtp%d",
-                    __FUNCTION__, saddr.sipc_port);
+                    __func__, saddr.sipc_port);
 
        FD_ZERO(&set);
        FD_SET(s, &set);
@@ -173,7 +173,7 @@ static void *realtime_thread2(void *arg)
                if (ret != sizeof(data))
                        fail("sendto");
 
-               smokey_trace("%s: sent %d bytes, %ld", __FUNCTION__, ret, data);
+               smokey_trace("%s: sent %d bytes, %ld", __func__, ret, data);
 
                ts.tv_sec = 0;
                ts.tv_nsec = 100000000; /* 100 ms */


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://xenomai.org/mailman/listinfo/xenomai-git

Reply via email to