Changeset b97bc8bc in rtems

Timestamp:

05/07/14 16:27:19 (10 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

8fa3422

Parents:

0960fee

Message:

tests: Add locked_printf_plugin()

Add locked_vprintf(). Return an int just like printf(), etc.

Location:

testsuites/support

Files:

• include/test_support.h (modified) (2 diffs)
• src/locked_print.c (modified) (4 diffs)

testsuites/support/include/test_support.h

@@ -10 +10 @@
 #ifndef __TEST_SUPPORT_h
 #define __TEST_SUPPORT_h
+
+#include <stdarg.h>
 
 #ifdef __cplusplus
@@ -66 +68 @@
 /*********************************************************************/
 /*********************************************************************/
-extern void locked_print_initialize(void);
-extern void locked_printf(const char *fmt, ...);
-extern void locked_printk(const char *fmt, ...);
+
+void locked_print_initialize(void);
+
+int locked_printf(const char *fmt, ...);
+
+int locked_vprintf(const char *fmt, va_list ap);
+
+int locked_printf_plugin(void *context, const char *fmt, ...);
+
+void locked_printk(const char *fmt, ...);
 
 #ifdef __cplusplus

testsuites/support/src/locked_print.c

@@ -12 +12 @@
 #endif
 
-#include <rtems.h>
-#include <rtems/system.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdarg.h>
-
+#include "test_support.h"
 #include "tmacros.h"
 
@@ -46 +41 @@
 }
 
-void locked_printf(const char *fmt, ...) {
-  va_list           ap;       /* points to each unnamed argument in turn */
+int locked_vprintf(const char *fmt, va_list ap)
+{
+  int rv;
   rtems_status_code sc;
 
@@ -57 +53 @@
   } while (sc != RTEMS_SUCCESSFUL );
 
+  rv = vprintf(fmt, ap);
+
+  /* Release the semaphore  */
+  rtems_semaphore_release( locked_print_semaphore );
+
+  return rv;
+}
+
+int locked_printf_plugin(void *context, const char *fmt, ...)
+{
+  int rv;
+  va_list ap;
+
+  (void) context;
+
+  va_start(ap, fmt);
+  rv = locked_vprintf(fmt, ap);
+  va_end(ap);
+
+  return rv;
+}
+
+int locked_printf(const char *fmt, ...)
+{
+  int               rv;
+  va_list           ap;       /* points to each unnamed argument in turn */
 
   va_start(ap, fmt); /* make ap point to 1st unnamed arg */
-  vprintf(fmt, ap);
+  rv = locked_vprintf(fmt, ap);
   va_end(ap);        /* clean up when done */
 
-  /* Release the semaphore  */
-  sc = rtems_semaphore_release( locked_print_semaphore );
-} 
+  return rv;
+}
 
-void locked_printk(const char *fmt, ...) {
+void locked_printk(const char *fmt, ...)
+{
   va_list           ap;       /* points to each unnamed argument in turn */
   rtems_status_code sc;
@@ -83 +105 @@
 
   /* Release the semaphore  */
-  sc = rtems_semaphore_release( locked_print_semaphore );
-} 
+  rtems_semaphore_release( locked_print_semaphore );
+}