mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[PATCH] WL#3704 mgmapi timeouts: Rename inputstream timeout

Browse source 
Index: ndb-work/storage/ndb/include/util/InputStream.hpp
===================================================================


storage/ndb/include/util/InputStream.hpp:
  WL#3704 mgmapi timeouts: Rename inputstream timeout
storage/ndb/src/common/util/InputStream.cpp:
  WL#3704 mgmapi timeouts: Rename inputstream timeout
This commit is contained in:
unknown 2007-03-22 22:33:31 +11:00
parent ef41a27c9b
commit 45f698c551
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
storage/ndb/include/util/InputStream.hpp
View file

@ -48,10 +48,10 @@ extern FileInputStream Stdin;
class SocketInputStream : public InputStream { class SocketInputStream : public InputStream {
NDB_SOCKET_TYPE m_socket; NDB_SOCKET_TYPE m_socket;
unsigned m_timeout; unsigned m_timeout_ms;
bool m_startover; bool m_startover;
public: public:
SocketInputStream(NDB_SOCKET_TYPE socket, unsigned readTimeout = 1000); SocketInputStream(NDB_SOCKET_TYPE socket, unsigned read_timeout_ms = 1000);
virtual ~SocketInputStream() {} virtual ~SocketInputStream() {}
char* gets(char * buf, int bufLen); char* gets(char * buf, int bufLen);
}; };

6
storage/ndb/src/common/util/InputStream.cpp
View file

@ -34,10 +34,10 @@ FileInputStream::gets(char * buf, int bufLen){
} }
SocketInputStream::SocketInputStream(NDB_SOCKET_TYPE socket, SocketInputStream::SocketInputStream(NDB_SOCKET_TYPE socket,
unsigned readTimeout) unsigned read_timeout_ms)
: m_socket(socket) { : m_socket(socket) {
m_startover= true; m_startover= true;
m_timeout = readTimeout; m_timeout_ms = read_timeout_ms;
} }
char* char*
@ -52,7 +52,7 @@ SocketInputStream::gets(char * buf, int bufLen) {
else else
offset= strlen(buf); offset= strlen(buf);
int res = readln_socket(m_socket, m_timeout, buf+offset, bufLen-offset, m_mutex); int res = readln_socket(m_socket, m_timeout_ms, buf+offset, bufLen-offset, m_mutex);
if(res == 0) if(res == 0)
{ {