jdk-sandbox: comparison hotspot/src/share/vm/utilities/ostream.cpp

equal deleted inserted replaced

-:64fb1fd7186d
+:d0bebc7eefc2
 size_t len;
 const char* str = do_vsnprintf(_buffer, _buflen, format, argptr, true, len);
 write(str, len);
 }
-bufferedStream::bufferedStream(size_t initial_size) : outputStream() {
+bufferedStream::bufferedStream(size_t initial_size, size_t bufmax) : outputStream() {
 buffer_length = initial_size;
 buffer        = NEW_C_HEAP_ARRAY(char, buffer_length);
 buffer_pos    = 0;
 buffer_fixed  = false;
-}
+buffer_max    = bufmax;
+}
-bufferedStream::bufferedStream(char* fixed_buffer, size_t fixed_buffer_size) : outputStream() {
+bufferedStream::bufferedStream(char* fixed_buffer, size_t fixed_buffer_size, size_t bufmax) : outputStream() {
 buffer_length = fixed_buffer_size;
 buffer        = fixed_buffer;
 buffer_pos    = 0;
 buffer_fixed  = true;
+buffer_max    = bufmax;
 }
 void bufferedStream::write(const char* s, size_t len) {
+if(buffer_pos + len > buffer_max) {
+flush();
+}
 size_t end = buffer_pos + len;
 if (end >= buffer_length) {
 if (buffer_fixed) {
 // if buffer cannot resize, silently truncate
 len = buffer_length - buffer_pos - 1;
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #endif
 // Network access
-networkStream::networkStream() {
+networkStream::networkStream() : bufferedStream(1024*10, 1024*10) {
 _socket = -1;
 hpi::initialize_socket_library();
 return hpi::recv(_socket, buf, (int)len, 0);
 }
 void networkStream::flush() {
 if (size() != 0) {
-hpi::send(_socket, (char *)base(), (int)size(), 0);
+int result = hpi::raw_send(_socket, (char *)base(), (int)size(), 0);
+assert(result != -1, "connection error");
+assert(result == (int)size(), "didn't send enough data");
 }
 reset();
 }
 networkStream::~networkStream() {

changeset 768	d0bebc7eefc2
parent 349	94856a2bae83
child 781	e1baa9c8f16f
child 1383	3a216aa862b7