mirror of
https://github.com/MariaDB/server.git
synced 2025-08-27 13:04:36 +03:00
db16cae578
smaller patch for 5.0.
complete patch going to 5.1 due to more intrusiveness for 'list sessions' etc
ndb/include/mgmapi/mgmapi.h:
add internal get_fd to use in test
ndb/include/util/InputStream.hpp:
- add this weird startover member to SocketInputStream
- this helps work out if we've read a newline yet and should start inserting
into buffer from the start
ndb/src/common/util/InputStream.cpp:
remove evil, add more.
keep track internally we've retrieved a newline yet (m_startover)
ndb/src/common/util/Parser.cpp:
change way detecting of NoLine
remove some trailing whitespace that was uglying the place up a bit
ndb/src/common/util/socket_io.cpp:
Always retrieve data from the OS so that we instantly get EOF on disconnect
and don't end up spinning looking for a newline.
ndb/src/mgmapi/mgmapi.cpp:
add internal ndb_mgm_get_fd() for internal testing
handle 'node status' a bit better
ndb/test/ndbapi/testMgm.cpp:
Add test for MgmApiSession disconnection (mgmd at 100%)
not fully automated due to smaller patch for 5.0
will be complete in 5.1
50 lines
1.3 KiB
C++
50 lines
1.3 KiB
C++
/* Copyright (C) 2003 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#ifndef INPUT_STREAM_HPP
|
|
#define INPUT_STREAM_HPP
|
|
|
|
#include <ndb_global.h>
|
|
#include <NdbTCP.h>
|
|
|
|
/**
|
|
* Input stream
|
|
*/
|
|
class InputStream {
|
|
public:
|
|
virtual char* gets(char * buf, int bufLen) = 0;
|
|
};
|
|
|
|
class FileInputStream : public InputStream {
|
|
FILE * f;
|
|
public:
|
|
FileInputStream(FILE * file = stdin);
|
|
char* gets(char * buf, int bufLen);
|
|
};
|
|
|
|
extern FileInputStream Stdin;
|
|
|
|
class SocketInputStream : public InputStream {
|
|
NDB_SOCKET_TYPE m_socket;
|
|
unsigned m_timeout;
|
|
bool m_startover;
|
|
public:
|
|
SocketInputStream(NDB_SOCKET_TYPE socket, unsigned readTimeout = 1000);
|
|
char* gets(char * buf, int bufLen);
|
|
};
|
|
|
|
#endif
|