diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-17 23:53:48 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-17 23:53:48 +0000 |
| commit | 123a51002844491ec5f48983a8f77bf9dd9395a4 (patch) | |
| tree | dd78868c943ec85737a3fdb913b9662d5cb53be0 | |
| parent | 84a28feb48ef30f9070f3192db34017975c141c1 (diff) | |
| download | ATCD-123a51002844491ec5f48983a8f77bf9dd9395a4.tar.gz | |
ChangeLogTag:Thu Sep 17 18:53:05 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | apps/JAWS/ChangeLog | 6 | ||||
| -rw-r--r-- | apps/JAWS/PROTOTYPE/JAWS/IO.cpp | 14 | ||||
| -rw-r--r-- | apps/JAWS/server/IO.cpp | 14 |
3 files changed, 20 insertions, 14 deletions
diff --git a/apps/JAWS/ChangeLog b/apps/JAWS/ChangeLog index 44e91eb6db1..ab50ecd1198 100644 --- a/apps/JAWS/ChangeLog +++ b/apps/JAWS/ChangeLog @@ -1,3 +1,9 @@ +Thu Sep 17 18:53:05 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * server/IO.cpp: + * PROTOTYPE/JAWS/IO.cpp: + Revert back to iovec. + Wed Sep 16 22:53:06 1998 Carlos O'Ryan <coryan@cs.wustl.edu> * server/IO.cpp: diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO.cpp b/apps/JAWS/PROTOTYPE/JAWS/IO.cpp index 3afa963d34b..150b9457a6f 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/IO.cpp +++ b/apps/JAWS/PROTOTYPE/JAWS/IO.cpp @@ -161,24 +161,24 @@ JAWS_Synch_IO::transmit_file (JAWS_IO_Handler *ioh, #else // Attempting to use writev // Is this faster? - ACE_IO_Vector iov[3]; + iovec iov[3]; int iovcnt = 0; if (header_size > 0) { - iov[iovcnt].buffer ((char*)header); - iov[iovcnt].length (header_size); + iov[iovcnt].iov_base = (char*)header; + iov[iovcnt].iov_len = header_size; iovcnt++; } if (handle.size () > 0) { - iov[iovcnt].buffer (handle.address ()); - iov[iovcnt].length (handle.size ()); + iov[iovcnt].iov_base = handle.address (); + iov[iovcnt].iov_len = handle.size (); iovcnt++; } if (trailer_size > 0) { - iov[iovcnt].buffer ((char*)trailer); - iov[iovcnt].length (trailer_size); + iov[iovcnt].iov_base = (char*)trailer; + iov[iovcnt].iob_len = trailer_size; iovcnt++; } if (ACE_OS::writev (ioh->handle (), iov, iovcnt) < 0) diff --git a/apps/JAWS/server/IO.cpp b/apps/JAWS/server/IO.cpp index c7bf48314a6..90e743642a5 100644 --- a/apps/JAWS/server/IO.cpp +++ b/apps/JAWS/server/IO.cpp @@ -121,24 +121,24 @@ JAWS_Synch_IO::transmit_file (const char *filename, #else // Attempting to use writev // Is this faster? - ACE_IO_Vector iov[3]; + iovec iov[3]; int iovcnt = 0; if (header_size > 0) { - iov[iovcnt].buffer ((char*)header); - iov[iovcnt].length (header_size); + iov[iovcnt].iov_base = (char*)header; + iov[iovcnt].iov_len = header_size; iovcnt++; } if (handle.size () > 0) { - iov[iovcnt].buffer (handle.address ()); - iov[iovcnt].length (handle.size ()); + iov[iovcnt].iov_base = handle.address (); + iov[iovcnt].iov_len = handle.size (); iovcnt++; } if (trailer_size > 0) { - iov[iovcnt].buffer ((char*)trailer); - iov[iovcnt].length (trailer_size); + iov[iovcnt].iov_base = (char*)trailer; + iov[iovcnt].iov_len = trailer_size; iovcnt++; } if (ACE_OS::writev (this->handle_, iov, iovcnt) < 0) |