janwas
c0ed950657
this snowballed into a massive search+destroy of the hodgepodge of mostly equivalent types we had in use (int, uint, unsigned, unsigned int, i32, u32, ulong, uintN). it is more efficient to use 64-bit types in 64-bit mode, so the preferred default is size_t (for anything remotely resembling a size or index). tile coordinates are ssize_t to allow more efficient conversion to/from floating point. flags are int because we almost never need more than 15 distinct bits, bit test/set is not slower and int is fastest to type. finally, some data that is pretty much directly passed to OpenGL is now typed accordingly. after several hours, the code now requires fewer casts and less guesswork. other changes: - unit and player IDs now have an "invalid id" constant in the respective class to avoid casting and -1 - fix some endian/64-bit bugs in the map (un)packing. added a convenience function to write/read a size_t. - ia32: change CPUID interface to allow passing in ecx (required for cache topology detection, which I need at work). remove some unneeded functions from asm, replace with intrinsics where possible. This was SVN commit r5942.
97 lines
1.8 KiB
C++
97 lines
1.8 KiB
C++
#ifndef INCLUDED_NETWORK_NETWORKINTERNAL
|
|
#define INCLUDED_NETWORK_NETWORKINTERNAL
|
|
|
|
#include <map>
|
|
|
|
#if !OS_WIN
|
|
|
|
#define Network_GetErrorString(_error, _buf, _buflen) strerror_r(_error, _buf, _buflen)
|
|
|
|
#define Network_LastError errno
|
|
|
|
#define closesocket(_fd) close(_fd)
|
|
|
|
#else // i.e. #if OS_WIN
|
|
|
|
#define Network_GetErrorString(_error, _buf, _buflen) \
|
|
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, _error+WSABASEERR, 0, _buf, _buflen, NULL)
|
|
#define Network_LastError (WSAGetLastError() - WSABASEERR)
|
|
// These are defined so that WSAGLE - WSABASEERR = E*
|
|
// i.e. the same error name can be used in winsock and posix
|
|
#define WSABASEERR 10000
|
|
|
|
#define MSG_SOCKET_READY WM_USER
|
|
|
|
#endif // #if OS_WIN
|
|
|
|
typedef int socket_t;
|
|
|
|
class CSocketInternal
|
|
{
|
|
public:
|
|
socket_t m_fd;
|
|
CSocketAddress m_RemoteAddr;
|
|
|
|
socket_t m_AcceptFd;
|
|
CSocketAddress m_AcceptAddr;
|
|
|
|
// Bitwise OR of all operations to listen for.
|
|
// See READ and WRITE
|
|
int m_Ops;
|
|
|
|
char *m_pConnectHost;
|
|
int m_ConnectPort;
|
|
|
|
u64 m_SentBytes;
|
|
u64 m_RecvBytes;
|
|
|
|
inline CSocketInternal():
|
|
m_fd(-1),
|
|
m_AcceptFd(-1),
|
|
m_Ops(0),
|
|
m_pConnectHost(NULL),
|
|
m_ConnectPort(-1),
|
|
m_SentBytes(0),
|
|
m_RecvBytes(0)
|
|
{
|
|
}
|
|
};
|
|
|
|
struct CSocketSetInternal
|
|
{
|
|
// Any access to the global variables should be protected using m_Mutex
|
|
pthread_mutex_t m_Mutex;
|
|
pthread_t m_Thread;
|
|
|
|
size_t m_NumSockets;
|
|
|
|
std::map <socket_t, CSocketBase * > m_HandleMap;
|
|
#if OS_WIN
|
|
HWND m_hWnd;
|
|
#else
|
|
// [0] is for use by RunWaitLoop, [1] for SendWaitLoopAbort and SendWaitLoopUpdate
|
|
int m_Pipe[2];
|
|
#endif
|
|
|
|
u64 m_GlobalSentBytes;
|
|
u64 m_GlobalRecvBytes;
|
|
|
|
public:
|
|
inline CSocketSetInternal()
|
|
{
|
|
#if OS_WIN
|
|
m_hWnd=NULL;
|
|
#else
|
|
m_Pipe[0]=-1;
|
|
m_Pipe[1]=-1;
|
|
#endif
|
|
pthread_mutex_init(&m_Mutex, NULL);
|
|
m_Thread=0;
|
|
m_NumSockets=0;
|
|
m_GlobalSentBytes=0;
|
|
m_GlobalRecvBytes=0;
|
|
}
|
|
};
|
|
|
|
#endif
|