aboutsummaryrefslogtreecommitdiffhomepage
path: root/io.h
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-03-09 11:28:24 -0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-03-09 11:28:24 -0800
commit14a35e7c21095f31a8d4a7a7c61b172d6e3780be (patch)
tree60c1bde016f9c92955817de5f865f0ead3d2000f /io.h
parentd173bb6e0a13863e23c606f1454c35788b3a6cf6 (diff)
Flip the switch to stop draining threads before exec (!)
Diffstat (limited to 'io.h')
-rw-r--r--io.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/io.h b/io.h
index df1cef9d..806ec70c 100644
--- a/io.h
+++ b/io.h
@@ -17,7 +17,7 @@ enum io_mode
class io_data_t
{
private:
- /** buffer to save output in for IO_BUFFER. Note that in the original fish, the buffer was a pointer to a buffer_t stored in the param2 union down below, and when an io_data_t was duplicated the pointer was copied so that two io_data_ts referenced the same buffer. It's not clear to me how this was ever cleaned up correctly. But it's important that they share the same buffer for reasons I don't yet understand either. But we can get correct sharing and cleanup with shared_ptr. */
+ /** buffer to save output in for IO_BUFFER. Note that in the original fish, the buffer was a pointer to a buffer_t stored in the param2 union down below, and when an io_data_t was duplicated the pointer was copied so that two io_data_ts referenced the same buffer. It's not clear to me how this was ever cleaned up correctly. But it's important that they share the same buffer for reasons I don't yet understand either. We can get correct sharing and cleanup with shared_ptr. */
shared_ptr<std::vector<char> > out_buffer;
/* No assignment allowed */
@@ -36,7 +36,7 @@ public:
{
/** Fds for IO_PIPE and for IO_BUFFER */
int pipe_fd[2];
- /** fd to redirect specified fd to, for IO_FD*/
+ /** fd to redirect specified fd to, for IO_FD */
int old_fd;
} param1;