mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

code cleanup, commenting, refactoring, and renaming.

Browse Source 
fixed a bug where threads would not close down correctly on Unix systems
This commit is contained in:
Joakim Kilby
2015-06-24 17:52:21 +02:00
parent 13eb012a04
commit ff49a7cdd2
2 changed files with 185 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/openspace/network/parallelconnection.h
View File

@@ -119,14 +119,8 @@ namespace openspace{
std::string name();
void setSocket(_SOCKET socket);
_SOCKET clientSocket();
void setHost(bool host);
bool isHost();
bool isRunning();
void requestHostship();
@@ -175,27 +169,25 @@ namespace openspace{
return hashVal;
};
void writeHeader(std::vector<char> &buffer);
void writeHeader(std::vector<char> &buffer, uint32_t messageType);
void closeSocket();
bool initNetworkAPI();
void connection(addrinfo *info);
void tryConnect(addrinfo *info);
void authenticate();
void sendAuthentication();
void communicate();
void listenCommunication();
void delegateDecoding(int type);
void decodeAuthenticationMessage();
void delegateDecoding(uint32_t type);
void decodeInitializationMessage();
void decodeDataMessage();
void decodeStreamDataMessage();
void decodeScript();
void decodeScriptMessage();
void decodeHostInfoMessage();
@@ -207,7 +199,6 @@ namespace openspace{
int receiveData(_SOCKET & socket, std::vector<char> &buffer, int length, int flags);
int _headerSize;
uint32_t _passCode;
std::string _port;
std::string _address;
@@ -215,8 +206,9 @@ namespace openspace{
_SOCKET _clientSocket;
std::thread *_connectionThread;
std::thread *_broadcastThread;
std::atomic<bool> _isRunning;
std::atomic<bool> _isHost;
std::atomic<bool> _isConnected;
std::atomic<bool> _isListening;
};
} // namespace network