mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 23:04:20 +01:00
5f02d41c0d
# -------------------------------------------- # 04/04/13 joreland@mysql.com 1.1858.1.1 # Removal of NDBT_Table # -------------------------------------------- # 04/04/13 joreland@mysql.com 1.1858.1.2 # Removal of NDBT_Table # -------------------------------------------- # 04/04/13 joreland@mysql.com 1.1858.1.3 # Fix for crashing AT # -------------------------------------------- # 04/04/13 joreland@mysql.com 1.1858.1.4 # Bug fixes in testIndex # -------------------------------------------- # 04/04/13 joreland@mysql.com 1.1866.1.5 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mysql.com:/home/jonas/src/tmp # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.1.5 # Fix for takeover when accessing indexes. # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1866.1.6 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mysql.com:/home/jonas/src/tmp # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.2.1 # Fixed error handling of fire_trigger_ord + lqhkeyref w.r.t indexes # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.2.2 # Simple retry mechanism in UTIL # Helps testIndex -n BuildDuring _a lot_ # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.2.3 # Misc fixes to test prg. # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.2.4 # Allow more retires on application errors # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.2.5 # Pass no of rows fetched in SUB_SYNC_CONTINUE_REQ # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1869 # wl1714 # Improve parallellism # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1870 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mysql.com:/home/jonas/src/wl1714 # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1866.1.7 # Merge # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1871 # Merge mysql.com:/home/jonas/src/wl1714 # into mysql.com:/home/jonas/src/mysql-4.1-ndb # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1872 # Fix for testScan -n ScanReadError5030 # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1873 # fix testDict -n FragmentType* # -------------------------------------------- # 04/04/14 johan@stingray.(none) 1.1866.2.1 # small fixes # -------------------------------------------- # 04/04/14 johan@stingray.(none) 1.1874 # Merge jandersson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into stingray.(none):/space/bk/rep/mysql-4.1-ndb # -------------------------------------------- # 04/04/14 johan@stingray.(none) 1.1875 # handle rep node as an api node # -------------------------------------------- # 04/04/14 pekka@mysql.com 1.1873.1.1 # Fix for NDBT_Table removal # -------------------------------------------- # 04/04/15 joreland@mysql.com 1.1873.1.2 # Uninitialized var. # -------------------------------------------- # 04/04/15 johan@stingray.(none) 1.1876 # Merge jandersson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into stingray.(none):/space/bk/rep/mysql-4.1-ndb # -------------------------------------------- # 04/04/15 joreland@mysql.com 1.1873.1.3 # Write pid before changing user # (as runas user probably doesn't have permissions on pid-dir) # -------------------------------------------- # -------------------------------------------- # 04/04/15 ndb@mc03.ndb.mysql.com 1.1862.1.3 # Fix printout of varchars # -------------------------------------------- # 04/04/15 ndb@mc03.ndb.mysql.com 1.1877 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mc03.ndb.mysql.com:/space/ndb/tmp # -------------------------------------------- # 04/04/15 ndb@mc03.ndb.mysql.com 1.1862.1.4 # Hmm.. don't print attr as many times as length of array # -------------------------------------------- # 04/04/15 ndb@mc03.ndb.mysql.com 1.1878 # Merge mc03.ndb.mysql.com:/space/ndb/mysql-4.1-ndb # into mc03.ndb.mysql.com:/space/ndb/tmp # -------------------------------------------- # 04/04/15 joreland@mysql.com 1.1876.1.1 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mysql.com:/home/jonas/src/mysql-4.1-ndb # -------------------------------------------- # 04/04/15 joreland@mysql.com 1.1877.1.1 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mysql.com:/home/jonas/src/mysql-4.1-ndb # -------------------------------------------- # 04/04/15 ndb@mc03.ndb.mysql.com 1.1879 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mc03.ndb.mysql.com:/space/ndb/tmp # -------------------------------------------- # 04/04/17 joreland@mysql.com 1.1880 # LCP bug when restarting ops take's longer than DIH sending a new lcp ord # Solution: # Send LCP_FRAG_REP after restarting all ops # -------------------------------------------- # 04/04/18 joreland@mysql.com 1.1881 # Missspelled ERROR_INSERT # -------------------------------------------- # 04/04/18 joreland@mysql.com 1.1882 # Added possibility to log only distributed signals # -------------------------------------------- # 04/04/22 joreland@mysql.com 1.1883 # Removed dependancy to libstdc++ # * pure virtual functions "__cxa_pure_virtual" is defined in libstd++ -> # remove all pure virtual functions # -------------------------------------------- # 04/04/23 joreland@mysql.com 1.1884 # Various minor bug fixes for problems found while compiling # with icc # -------------------------------------------- # -------------------------------------------- # 04/04/25 joreland@mysql.com 1.1885 # Removed debug code (joreland:1.1875) # -------------------------------------------- # 04/04/26 ejonore@mc03.ndb.mysql.com 1.1862.1.5 # Lock pages in memory _after_ daemon-mode (exec/fork) # -------------------------------------------- # 04/04/27 ejonore@mc03.ndb.mysql.com 1.1862.1.6 # 1) Trap abort() # 2) StopStart/StopAborted events # 3) warning if memlock fails # 4) use g_logger more often (instead of ndbout) # # -------------------------------------------- # 04/04/27 joreland@mysql.com 1.1886 # bug fix for a bug in wl1714 + software upgrade # -------------------------------------------- # 04/04/27 joreland@mysql.com 1.1887 # Cset exclude: joreland@mysql.com|ChangeSet|20040422160720|05374 # -------------------------------------------- # 04/04/27 joreland@mysql.com 1.1888 # removed libstc++ second try... # -------------------------------------------- # 04/04/28 ejonore@mc03.ndb.mysql.com 1.1862.1.7 # 1) Don't lock FUTURE pages but only current # 2) Do this when SIZEALT has completed # -------------------------------------------- # 04/04/30 joreland@mysql.com 1.1889 # Merge jonas@orca:/home/ndb/releases/mysql-4.1-ndb-3.4.x # into mysql.com:/home/jonas/src/mysql-4.1-ndb # -------------------------------------------- # 04/05/03 ndb@mc03.ndb.mysql.com 1.1862.1.8 # Version update # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1862.3.1 # Changed restart behavior. # Use "angel" process which monitor "real" process # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1862.1.9 # Merge jonas@orca:/home/ndb/releases/mysql-4.1-ndb-3.4.x # into mysql.com:/home/jonas/src/mysql-4.1-ndb-3.4.x # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1890 # Merge B2 fixes # -------------------------------------------- # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1862.1.10 # Better handling of children terminations # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1862.1.11 # Fixes for angel-restarting # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1891 # Merge mysql.com:/home/jonas/src/mysql-4.1-ndb-3.4.x # into mysql.com:/home/jonas/src/mysql-4.1-ndb # -------------------------------------------- # ndb/config/Defs.LINUX.x86.GCC.mk: Merge ndb fixes ndb/examples/ndbapi_async_example/Makefile: Merge ndb fixes ndb/examples/ndbapi_async_example/ndbapi_async.cpp: Merge ndb fixes ndb/examples/ndbapi_scan_example/Makefile: Merge ndb fixes ndb/include/debugger/SignalLoggerManager.hpp: Merge ndb fixes ndb/include/kernel/signaldata/ScanFrag.hpp: Merge ndb fixes ndb/include/ndb_version.h: Merge ndb fixes ndb/include/ndbapi/NdbScanOperation.hpp: Merge ndb fixes ndb/include/util/SocketServer.hpp: Merge ndb fixes ndb/src/common/debugger/SignalLoggerManager.cpp: Merge ndb fixes ndb/src/common/logger/ConsoleLogHandler.cpp: Merge ndb fixes ndb/src/common/portlib/unix/NdbMem.c: Merge ndb fixes ndb/src/common/util/Makefile: Merge ndb fixes ndb/src/common/util/version.c: Merge ndb fixes ndb/src/cw/cpcd/Process.cpp: Merge ndb fixes ndb/src/kernel/blocks/ERROR_codes.txt: Merge ndb fixes ndb/src/kernel/blocks/backup/restore/Restore.cpp: Merge ndb fixes ndb/src/kernel/blocks/backup/restore/Restore.hpp: Merge ndb fixes ndb/src/kernel/blocks/backup/restore/main.cpp: Merge ndb fixes ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Merge ndb fixes ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Merge ndb fixes ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Merge ndb fixes ndb/src/kernel/blocks/dblqh/DblqhInit.cpp: Merge ndb fixes ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Merge ndb fixes ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Merge ndb fixes ndb/src/kernel/blocks/dbtc/DbtcInit.cpp: Merge ndb fixes ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Merge ndb fixes ndb/src/kernel/blocks/dbutil/DbUtil.cpp: Merge ndb fixes ndb/src/kernel/blocks/dbutil/DbUtil.hpp: Merge ndb fixes ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Merge ndb fixes ndb/src/kernel/blocks/ndbfs/Filename.cpp: Merge ndb fixes ndb/src/kernel/blocks/suma/Suma.cpp: Merge ndb fixes ndb/src/kernel/error/Error.hpp: Merge ndb fixes ndb/src/kernel/ndb-main/Main.cpp: Merge ndb fixes ndb/src/kernel/vm/Configuration.cpp: Merge ndb fixes ndb/src/kernel/vm/Configuration.hpp: Merge ndb fixes ndb/src/kernel/vm/DLFifoList.hpp: Merge ndb fixes ndb/src/kernel/vm/Emulator.cpp: Merge ndb fixes ndb/src/kernel/vm/SignalCounter.hpp: Merge ndb fixes ndb/src/kernel/vm/SimulatedBlock.cpp: Merge ndb fixes ndb/src/mgmsrv/MgmtSrvr.cpp: Merge ndb fixes ndb/src/mgmsrv/NodeLogLevel.cpp: Merge ndb fixes ndb/src/ndbapi/ClusterMgr.cpp: Merge ndb fixes ndb/src/ndbapi/Ndberror.cpp: Merge ndb fixes ndb/src/rep/rep_version.hpp: Merge ndb fixes ndb/test/ndbapi/testDict/testDict.cpp: Merge ndb fixes ndb/test/ndbapi/testIndex/testIndex.cpp: Merge ndb fixes ndb/test/ndbapi/testMgm/testMgm.cpp: Merge ndb fixes ndb/test/ndbapi/testScan/testScan.cpp: Merge ndb fixes ndb/test/src/HugoTransactions.cpp: Merge ndb fixes ndb/test/src/NDBT_Tables.cpp: Merge ndb fixes ndb/test/src/NDBT_Test.cpp: Merge ndb fixes ndb/test/src/UtilTransactions.cpp: Merge ndb fixes BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
131 lines
3.1 KiB
C++
131 lines
3.1 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 SOCKET_SERVER_HPP
|
|
#define SOCKET_SERVER_HPP
|
|
|
|
#include <NdbTCP.h>
|
|
#include <NdbMutex.h>
|
|
#include <NdbThread.h>
|
|
#include <Vector.hpp>
|
|
|
|
extern "C" void* sessionThread_C(void*);
|
|
extern "C" void* socketServerThread_C(void*);
|
|
|
|
/**
|
|
* Socket Server
|
|
*/
|
|
class SocketServer {
|
|
public:
|
|
/**
|
|
* A Session
|
|
*/
|
|
class Session {
|
|
public:
|
|
virtual ~Session() {}
|
|
virtual void runSession(){}
|
|
virtual void stopSession(){}
|
|
protected:
|
|
friend class SocketServer;
|
|
friend void* sessionThread_C(void*);
|
|
Session(NDB_SOCKET_TYPE sock): m_socket(sock){ m_stop = m_stopped = false;}
|
|
|
|
bool m_stop; // Has the session been ordered to stop?
|
|
bool m_stopped; // Has the session stopped?
|
|
|
|
NDB_SOCKET_TYPE m_socket;
|
|
};
|
|
|
|
/**
|
|
* A service i.e. a session factory
|
|
*/
|
|
class Service {
|
|
public:
|
|
virtual ~Service(){}
|
|
|
|
/**
|
|
* Returned Session will be ran in own thread
|
|
*
|
|
* To manage threads self, just return NULL
|
|
*/
|
|
virtual Session * newSession(NDB_SOCKET_TYPE theSock) = 0;
|
|
virtual void stopSessions(){}
|
|
};
|
|
|
|
/**
|
|
* Constructor / Destructor
|
|
*/
|
|
SocketServer(int maxSessions = 32);
|
|
~SocketServer();
|
|
|
|
/**
|
|
* Setup socket and bind it
|
|
* then close the socket
|
|
* Returns true if succeding in binding
|
|
*/
|
|
bool tryBind(unsigned short port, const char * intface = 0) const;
|
|
|
|
/**
|
|
* Setup socket
|
|
* bind & listen
|
|
* Returns false if no success
|
|
*/
|
|
bool setup(Service *, unsigned short port, const char * pinterface = 0);
|
|
|
|
/**
|
|
* start/stop the server
|
|
*/
|
|
void startServer();
|
|
void stopServer();
|
|
|
|
/**
|
|
* stop sessions
|
|
*
|
|
* Note: Implies stopServer
|
|
*/
|
|
void stopSessions(bool wait = false);
|
|
|
|
private:
|
|
struct SessionInstance {
|
|
Service * m_service;
|
|
Session * m_session;
|
|
NdbThread * m_thread;
|
|
};
|
|
struct ServiceInstance {
|
|
Service * m_service;
|
|
NDB_SOCKET_TYPE m_socket;
|
|
};
|
|
MutexVector<SessionInstance> m_sessions;
|
|
MutexVector<ServiceInstance> m_services;
|
|
unsigned m_maxSessions;
|
|
|
|
void doAccept();
|
|
void checkSessions();
|
|
void startSession(SessionInstance &);
|
|
|
|
/**
|
|
* Note, this thread is only used when running interactive
|
|
*
|
|
*/
|
|
bool m_stopThread;
|
|
struct NdbThread * m_thread;
|
|
NdbLockable m_threadLock;
|
|
void doRun();
|
|
friend void* socketServerThread_C(void*);
|
|
friend void* sessionThread_C(void*);
|
|
};
|
|
|
|
#endif
|