diff options
author | Martin Sustrik <sustrik@250bpm.com> | 2011-02-22 16:23:36 +0100 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2011-02-22 16:23:36 +0100 |
commit | 43e8868875e1d5287979e5b9060a9b16be45cc79 (patch) | |
tree | d6df0587b107de28641b429048dff002e3c2387f /src/swap.cpp | |
parent | 98ccff1a24a056aef15372b131eee1c1bf8f62ca (diff) |
Added explicit error message in case of memory exhaustion
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src/swap.cpp')
-rw-r--r-- | src/swap.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/swap.cpp b/src/swap.cpp index b1add37..1ec3827 100644 --- a/src/swap.cpp +++ b/src/swap.cpp @@ -53,10 +53,10 @@ zmq::swap_t::swap_t (int64_t filesize_) : zmq_assert (block_size > 0); buf1 = new (std::nothrow) char [block_size]; - zmq_assert (buf1); + alloc_assert (buf1); buf2 = new (std::nothrow) char [block_size]; - zmq_assert (buf2); + alloc_assert (buf2); read_buf = write_buf = buf1; } @@ -278,7 +278,8 @@ void zmq::swap_t::fill_buf (char *buf, int64_t pos) #ifdef ZMQ_HAVE_WINDOWS int rc = _read (fd, &buf [octets_stored], octets_total - octets_stored); #else - ssize_t rc = read (fd, &buf [octets_stored], octets_total - octets_stored); + ssize_t rc = read (fd, &buf [octets_stored], + octets_total - octets_stored); #endif errno_assert (rc > 0); octets_stored += rc; @@ -302,9 +303,11 @@ void zmq::swap_t::save_write_buf () while (octets_stored < octets_total) { #ifdef ZMQ_HAVE_WINDOWS - int rc = _write (fd, &write_buf [octets_stored], octets_total - octets_stored); + int rc = _write (fd, &write_buf [octets_stored], + octets_total - octets_stored); #else - ssize_t rc = write (fd, &write_buf [octets_stored], octets_total - octets_stored); + ssize_t rc = write (fd, &write_buf [octets_stored], + octets_total - octets_stored); #endif errno_assert (rc > 0); octets_stored += rc; |