Never send more than IOV_MAX (1024) iovecs in pwritev.

[cubemap] / stream.cpp

diff --git a/stream.cpp b/stream.cpp
index 425477c0bedd424ff1a507220c0fb1fed952665b..e8d65db1a8cfda924226ad1838d087ad01a176a9 100644 (file)
--- a/stream.cpp
+++ b/stream.cpp
@@ -1,5 +1,6 @@
 #include <assert.h>
 #include <errno.h>
+#include <limits.h>
 #include <netinet/in.h>
 #include <stdlib.h>
 #include <string.h>
@@ -129,7 +130,8 @@ void Stream::put_client_to_sleep(Client *client)
 vector<iovec> collect_iovecs(const vector<iovec> &data, size_t bytes_wanted)
 {
        vector<iovec> ret;
-       for (size_t i = 0; i < data.size() && bytes_wanted > 0; ++i) {
+       size_t max_iovecs = std::min<size_t>(data.size(), IOV_MAX);
+       for (size_t i = 0; i < max_iovecs && bytes_wanted > 0; ++i) {
                if (data[i].iov_len <= bytes_wanted) {
                        // Consume the entire iovec.
                        ret.push_back(data[i]);
@@ -185,7 +187,7 @@ void Stream::add_data_raw(const vector<iovec> &orig_data)
                } while (ret == -1 && errno == EINTR);
 
                if (ret == -1) {
-                       log_perror("pwrite");
+                       log_perror("pwritev");
                        // Dazed and confused, but trying to continue...
                        return;
                }
@@ -222,7 +224,7 @@ void Stream::add_data_deferred(const char *data, size_t bytes)
 
                queued_data.push_back(iov);
        } else {
-               assert(encoding == Stream::STREAM_ENCODING_RAW);
+               assert(false);
        }
 }