diff options
| author | David Smith <dsmith@redhat.com> | 2009-05-21 16:57:04 -0500 |
|---|---|---|
| committer | David Smith <dsmith@redhat.com> | 2009-05-21 16:57:04 -0500 |
| commit | c8e9eb18d8d13d099a4a177fe53de507c1d9ce8b (patch) | |
| tree | ab2388afb795ed1a7ead2fbbf8b9d1b368a8231f /runtime/transport/control.c | |
| parent | dd9a3bcbef65bde65491d959e9458bc641924811 (diff) | |
| parent | 3863e7999255deeaa7f8f4bba7df893773812537 (diff) | |
| download | systemtap-steved-c8e9eb18d8d13d099a4a177fe53de507c1d9ce8b.tar.gz systemtap-steved-c8e9eb18d8d13d099a4a177fe53de507c1d9ce8b.tar.xz systemtap-steved-c8e9eb18d8d13d099a4a177fe53de507c1d9ce8b.zip | |
Merge commit 'origin/master' into pr7043
Conflicts:
runtime/print.c
runtime/transport/transport.c
runtime/transport/transport_msgs.h
Diffstat (limited to 'runtime/transport/control.c')
| -rw-r--r-- | runtime/transport/control.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/runtime/transport/control.c b/runtime/transport/control.c index 4e07a0a7..a1624152 100644 --- a/runtime/transport/control.c +++ b/runtime/transport/control.c @@ -18,6 +18,8 @@ static _stp_mempool_t *_stp_pool_q; static struct list_head _stp_ctl_ready_q; static DEFINE_SPINLOCK(_stp_ctl_ready_lock); +static void _stp_cleanup_and_exit(int send_exit); + static ssize_t _stp_ctl_write_cmd(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { u32 type; @@ -51,7 +53,7 @@ static ssize_t _stp_ctl_write_cmd(struct file *file, const char __user *buf, siz } break; case STP_EXIT: - _stp_exit_flag = 1; + _stp_cleanup_and_exit(1); break; case STP_BULK: #ifdef STP_BULKMODE @@ -98,6 +100,9 @@ static void _stp_ctl_write_dbug(int type, void *data, int len) case STP_TRANSPORT: _dbug("sending STP_TRANSPORT\n"); break; + case STP_REQUEST_EXIT: + _dbug("sending STP_REQUEST_EXIT\n"); + break; default: _dbug("ERROR: unknown message type: %d\n", type); break; |