Changeset 70443b40 in rtems


Ignore:
Timestamp:
Sep 4, 2007, 11:19:47 PM (12 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
2a645ad1
Parents:
5fb9e2f
Message:

2007-09-04 Joel Sherrill <joel.sherrill@…>

  • libmisc/monitor/mon-monitor.c, libmisc/monitor/mon-object.c, libmisc/monitor/monitor.h: Merge minor parts of Thomas' improvements that are needed by osmonweb.
Location:
cpukit
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    r5fb9e2f r70443b40  
     12007-09-04      Joel Sherrill <joel.sherrill@oarcorp.com>
     2
     3        * libmisc/monitor/mon-monitor.c, libmisc/monitor/mon-object.c,
     4        libmisc/monitor/monitor.h: Merge minor parts of Thomas' improvements
     5        that are needed by osmonweb.
     6
    172007-09-04      Joel Sherrill <joel.sherrill@oarcorp.com>
    28
  • cpukit/libmisc/monitor/mon-monitor.c

    r5fb9e2f r70443b40  
    579579        rtems_monitor_server_init(monitor_flags);
    580580
    581     /*
    582      * Start the monitor task itself
    583      */
    584 
    585     status = rtems_task_start(rtems_monitor_task_id,
    586                               rtems_monitor_task,
    587                               monitor_flags);
    588     if (status != RTEMS_SUCCESSFUL)
    589     {
     581    if (!(monitor_flags & RTEMS_MONITOR_NOTASK)) {
     582      /*
     583       * Start the monitor task itself
     584       */
     585      status = rtems_task_start(
     586        rtems_monitor_task_id, rtems_monitor_task, monitor_flags);
     587      if (status != RTEMS_SUCCESSFUL) {
    590588        rtems_error(status, "could not start monitor");
    591589        return;
    592     }
    593 }
     590      }
     591   }
     592}
  • cpukit/libmisc/monitor/mon-object.c

    r5fb9e2f r70443b40  
    316316    int arg;
    317317    rtems_monitor_object_info_t *info = 0;
    318     rtems_monitor_object_type_t  type ;
     318    rtems_monitor_object_type_t  type;
    319319
    320320    /* what is the default type? */
  • cpukit/libmisc/monitor/monitor.h

    r5fb9e2f r70443b40  
    1919
    2020/* Forward decls from symbols.h */
    21 typedef struct _rtems_symbol_t rtems_symbol_t ;
     21typedef struct _rtems_symbol_t rtems_symbol_t;
    2222typedef struct _rtems_symbol_table_t rtems_symbol_table_t;
    2323
     
    5353#define RTEMS_MONITOR_SUSPEND   0x0001          /* suspend monitor on startup */
    5454#define RTEMS_MONITOR_GLOBAL    0x0002          /* monitor should be global */
    55 
     55#define RTEMS_MONITOR_NOTASK    0x0004 /* do not start monitor task */
     56#define RTEMS_MONITOR_NOSYMLOAD 0x0008 /* do not load symbols       */
     57#define RTEMS_MONITOR_WAITQUIT  0x0010 /* wait for monitor task to terminate */
    5658
    5759/*
     
    284286
    285287union _rtems_monitor_command_arg_t {
    286   rtems_monitor_object_type_t   monitor_object ;
    287   rtems_status_code             status_code ;
    288   rtems_symbol_table_t          **symbol_table ;
    289   rtems_monitor_command_entry_t *monitor_command_entry ;
     288  rtems_monitor_object_type_t   monitor_object;
     289  rtems_status_code             status_code;
     290  rtems_symbol_table_t          **symbol_table;
     291  rtems_monitor_command_entry_t *monitor_command_entry;
    290292};
    291293
     
    429431
    430432
     433/* mon-object.c */
     434rtems_monitor_object_info_t *rtems_monitor_object_lookup(
     435  rtems_monitor_object_type_t type
     436);
     437
     438/* shared data */
    431439extern rtems_symbol_table_t *rtems_monitor_symbols;
    432440
Note: See TracChangeset for help on using the changeset viewer.