diff options
| -rw-r--r-- | runtime/transport/ChangeLog | 5 | ||||
| -rw-r--r-- | runtime/transport/transport.c | 8 | ||||
| -rw-r--r-- | runtime/transport/transport.txt | 24 |
3 files changed, 21 insertions, 16 deletions
diff --git a/runtime/transport/ChangeLog b/runtime/transport/ChangeLog index f9c5af19..6b63669c 100644 --- a/runtime/transport/ChangeLog +++ b/runtime/transport/ChangeLog @@ -1,3 +1,8 @@ +2006-09-26 David Smith <dsmith@redhat.com> + + * transport.c: Changed 'stpd' references to 'staprun'. + * transport.txt: Ditto. + 2006-09-26 Martin Hunt <hunt@redhat.com> * transport.c (_stp_handle_start): Don't initialize timers here. diff --git a/runtime/transport/transport.c b/runtime/transport/transport.c index e7dd7d97..70c0f157 100644 --- a/runtime/transport/transport.c +++ b/runtime/transport/transport.c @@ -118,7 +118,7 @@ static void _stp_handle_subbufs_consumed(int pid, struct consumed_info *info) /* common cleanup code. */ /* This is called from the kernel thread when an exit was requested */ -/* by stpd or the exit() function. It is also called by transport_close() */ +/* by staprun or the exit() function. It is also called by transport_close() */ /* when the module is removed. In that case "dont_rmmod" is set to 1. */ /* We need to call it both times because we want to clean up properly */ /* when someone does /sbin/rmmod on a loaded systemtap module. */ @@ -147,7 +147,7 @@ static void _stp_cleanup_and_exit (int dont_rmmod) } #endif kbug("transport_send STP_EXIT\n"); - /* tell stpd to exit (if it is still there) */ + /* tell staprun to exit (if it is still there) */ _stp_transport_send(STP_EXIT, &dont_rmmod, sizeof(int)); kbug("done with transport_send STP_EXIT\n"); } @@ -219,7 +219,7 @@ void _stp_transport_close() * done. * * This function is called in response to an STP_TRANSPORT - * message from stpd cmd. It replies with a similar message + * message from staprun cmd. It replies with a similar message * containing the final parameters used. */ @@ -266,7 +266,7 @@ int _stp_transport_open(struct transport_info *info) /** * _stp_transport_init() is called from the module initialization. - * It does the bare minimum to exchange commands with stpd + * It does the bare minimum to exchange commands with staprun */ int _stp_transport_init(void) { diff --git a/runtime/transport/transport.txt b/runtime/transport/transport.txt index 5118cc0c..d88bc426 100644 --- a/runtime/transport/transport.txt +++ b/runtime/transport/transport.txt @@ -17,9 +17,9 @@ int _stp_transport_init(void) *** Module is now loaded *** -In stpd, librelay.c, init_stp() forks any commands specified with +In staprun, librelay.c, init_stp() forks any commands specified with the "-c" parameter. Then it sends STP_TRANSPORT_INFO message with -the buffer size (if it was specified on the stpd command line) and +the buffer size (if it was specified on the staprun command line) and the pid from the fork (or 0 otherwise). In procfs.c, _stp_proc_write_cmd() receives the message. It calls @@ -29,7 +29,7 @@ _stp_transport_open() initializes relayfs if necessary. It returns a STP_TRANSPORT_INFO message with the transport_mode (relayfs or procfs-only), and buffer information. -stpd receives the STP_TRANSPORT_INFO message in stp_main_loop(), +staprun receives the STP_TRANSPORT_INFO message in stp_main_loop(), It initializes relayfs (if necessary) and replies with an STP_START message. @@ -40,10 +40,10 @@ _stp_proc_write_cmd() receives the STP_START. It calls _stp_handle_start(). _stp_handle_start() calls probe_start(), which the translator generates. It allocates memory and registers probes. When that returns, an atomic variable is set indicating probe_start finished. An STP_START -message is returned to stpd with the return value from probe_start() +message is returned to staprun with the return value from probe_start() -stpd receives the STP_START message in stp_main_loop(). If the return value -is < 0 (indicating probe_start failed to register probes, etc) stpd +staprun receives the STP_START message in stp_main_loop(). If the return value +is < 0 (indicating probe_start failed to register probes, etc) staprun cleans up and exits. *** Probes running. Everything Up. *** @@ -53,17 +53,17 @@ SHUTDOWN AND UNLOADING There are 3 ways to initiate shutdown. -1. stpd can initiate it. This happens when stpd receives a ^C or +1. staprun can initiate it. This happens when staprun receives a ^C or a child specified with "-c" exits. 2. Something can call _stp_exit(). -3. rmmod. This can happen when stpd dies for an unexpected reason +3. rmmod. This can happen when staprun dies for an unexpected reason and the module is still loaded. So the user does an rmmod. Also, when -STP_START fails, stpd simply rmmods the module. +STP_START fails, staprun simply rmmods the module. -For #1, stpd sends an STP_EXIT message. +For #1, staprun sends an STP_EXIT message. _stp_proc_write_cmd() receives the STP_EXIT. It sets _stp_exit_flag and returns. @@ -72,14 +72,14 @@ _stp_exit_flag is set. It checks to see if probe_start() finished because we don't want to start exiting until then. It will cancel itself, and call _stp_cleanup_and_exit(0). That will call probe_exit() which unregisters the probes. Then it sends an STP_EXIT(0) message to -stpd. stpd gets the message and calls cleanup_and_exit(0) +staprun. staprun gets the message and calls cleanup_and_exit(0) For #2, _stp_exit() sets _stp_exit_flag. For #3, cleanup_module() calls _stp_transport_close(). _stp_transport_close() cancels the work_queue, then calls _stp_cleanup_and_exit(1). The "1" is passed as an argument to -the STP_EXIT message. Stpd calls cleanup_and_exit(1), which cleans +the STP_EXIT message. Staprun calls cleanup_and_exit(1), which cleans up everything on its side, but does not do an "rmmod". Finally, _stp_unregister_procfs() to remove the procfs stuff. |