diff options
| author | David Smith <dsmith@redhat.com> | 2009-05-26 14:08:57 -0500 |
|---|---|---|
| committer | David Smith <dsmith@redhat.com> | 2009-05-26 14:08:57 -0500 |
| commit | a655ff03c59722c229a40909d0de9e3dfe63483e (patch) | |
| tree | 4d30b5012cd042ee626d3f5de2c731c76ae76908 | |
| parent | e57421f400d17786c1fdbead5fbca27a1fbe4ec5 (diff) | |
| download | systemtap-steved-a655ff03c59722c229a40909d0de9e3dfe63483e.tar.gz systemtap-steved-a655ff03c59722c229a40909d0de9e3dfe63483e.tar.xz systemtap-steved-a655ff03c59722c229a40909d0de9e3dfe63483e.zip | |
Cleanup and better original transport support.
* runtime/print.h: Moved _stp_reserve_bytes() prototype here.
* runtime/vsprintf.c (_stp_vsnprintf): Includes print.h to get
_stp_reserve_bytes() prototype.
* runtime/transport/transport.c (_stp_remove_root_dir): Better cleanup
for STP_TRANSPORT_VERSION == 1.
(_stp_transport_fs_close): Ditto.
| -rw-r--r-- | runtime/print.h | 1 | ||||
| -rw-r--r-- | runtime/transport/transport.c | 11 | ||||
| -rw-r--r-- | runtime/vsprintf.c | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/runtime/print.h b/runtime/print.h index d5c588a3..c2731a2f 100644 --- a/runtime/print.h +++ b/runtime/print.h @@ -12,5 +12,6 @@ static int _stp_print_init(void); static void _stp_print_cleanup(void); +static void *_stp_reserve_bytes(int numbytes); #endif /* _STP_PRINT_H_ */ diff --git a/runtime/transport/transport.c b/runtime/transport/transport.c index ab0806f2..8425536a 100644 --- a/runtime/transport/transport.c +++ b/runtime/transport/transport.c @@ -470,8 +470,13 @@ static void _stp_remove_root_dir(void) errk("Unable to lock transport directory.\n"); return; } - if (simple_empty(__stp_root_dir)) + if (simple_empty(__stp_root_dir)) { +#if STP_TRANSPORT_VERSION == 1 + relayfs_remove_dir(__stp_root_dir); +#else debugfs_remove(__stp_root_dir); +#endif + } _stp_unlock_transport_dir(); __stp_root_dir = NULL; } @@ -529,7 +534,11 @@ static void _stp_transport_fs_close(void) _stp_transport_data_fs_close(); if (__stp_module_dir) { +#if STP_TRANSPORT_VERSION == 1 + relayfs_remove_dir(__stp_module_dir); +#else debugfs_remove(__stp_module_dir); +#endif __stp_module_dir = NULL; } diff --git a/runtime/vsprintf.c b/runtime/vsprintf.c index 674946b9..5875d509 100644 --- a/runtime/vsprintf.c +++ b/runtime/vsprintf.c @@ -12,11 +12,9 @@ #ifndef _VSPRINTF_C_ #define _VSPRINTF_C_ +#include "print.h" #include "transport/transport.h" -//forward declaration for _stp_vsnprintf -static void * _stp_reserve_bytes (int); - static int skip_atoi(const char **s) { int i=0; |