Changeset 501
- Timestamp:
- 08/15/07 02:23:09 (1 year ago)
- Files:
-
- version_0/ext/ed.h (modified) (2 diffs)
- version_0/ext/em.cpp (modified) (1 diff)
- version_0/ext/pipe.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
version_0/ext/ed.h
r454 r501 269 269 { 270 270 public: 271 PipeDescriptor ( FILE*, pid_t, EventMachine_t*);271 PipeDescriptor (int, pid_t, EventMachine_t*); 272 272 virtual ~PipeDescriptor(); 273 273 … … 297 297 time_t LastIo; 298 298 int InactivityTimeout; 299 //FILE *MyStream;300 299 301 300 deque<OutboundPage> OutboundPages; version_0/ext/em.cpp
r393 r501 1376 1376 if (f > 0) { 1377 1377 close (sv[1]); 1378 PipeDescriptor *pd = new PipeDescriptor ( fdopen(sv[0], "r+"), f, this);1378 PipeDescriptor *pd = new PipeDescriptor (sv[0], f, this); 1379 1379 if (!pd) 1380 1380 throw std::runtime_error ("unable to allocate pipe"); version_0/ext/pipe.cpp
r408 r501 28 28 ******************************/ 29 29 30 PipeDescriptor::PipeDescriptor ( FILE *fp, pid_t subpid, EventMachine_t *parent_em):31 EventableDescriptor (f ileno (fp), parent_em),30 PipeDescriptor::PipeDescriptor (int fd, pid_t subpid, EventMachine_t *parent_em): 31 EventableDescriptor (fd, parent_em), 32 32 bReadAttemptedAfterClose (false), 33 33 LastIo (gCurrentLoopTime), 34 34 InactivityTimeout (0), 35 //MyStream (fp),36 35 OutboundDataSize (0), 37 36 SubprocessPid (subpid)