database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Remove windows ifdefs

Browse Source
This commit is contained in:
Leonid Fedorov
2023-03-02 15:59:42 +00:00
parent 123c345b40
commit 56f2346083
328 changed files with 9 additions and 19602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
tools/qfe/socketio.cpp
View File

@ -1,19 +1,8 @@
#include <unistd.h>
#ifdef _MSC_VER
#define WIN32_LEAN_AND_MEAN
#define NOMINMAX
#include <windows.h>
#include <winsock2.h>
#include <ws2tcpip.h>
#include <iphlpapi.h>
#include <icmpapi.h>
#include <stdio.h>
#else
#include <poll.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#endif
#include <cerrno>
#include <sstream>
using namespace std;
@ -21,9 +10,7 @@ using namespace std;
#include <boost/scoped_array.hpp>
using namespace boost;
#ifndef _MSC_VER
#include "mcsconfig.h"
#endif
#include "exceptclasses.h"
@ -33,7 +20,6 @@ namespace qfe
{
namespace socketio
{
#ifndef _MSC_VER
void readn(int fd, void* buf, const size_t wanted)
{
size_t needed = wanted;
@ -112,78 +98,6 @@ size_t writen(int fd, const void* data, const size_t nbytes)
return nbytes;
}
#else
const size_t MAX_RECV_BYTES = 64 * 1024;
void reads(SOCKET fd, void* buf, const size_t wanted)
{
size_t needed = wanted;
size_t sofar = 0;
char* p = reinterpret_cast<char*>(buf);
ssize_t rrc = -1;
pollfd fds[1];
int en = 0;
fds[0].fd = fd;
fds[0].events = POLLIN;
while (wanted > sofar)
{
fds[0].revents = 0;
poll(fds, 1, -1);
errno = 0;
// Windows recv() can only read so much at a time...
int thisrecv = static_cast<int>(std::min(needed, MAX_RECV_BYTES));
rrc = ::recv(fd, (p + sofar), thisrecv, 0);
en = errno;
if (rrc < 0)
{
if (en == EAGAIN || en == EINTR)
continue;
ostringstream oss;
oss << "qfe: reads: read() returned " << rrc << " (" << strerror(en) << ")";
idbassert_s(0, oss.str());
}
needed -= rrc;
sofar += rrc;
}
}
size_t writes(SOCKET fd, const void* data, const size_t nbytes)
{
size_t nleft;
ssize_t nwritten;
const char* bufp = static_cast<const char*>(data);
nleft = nbytes;
while (nleft > 0)
{
int thissend = static_cast<int>(std::min(nleft, MAX_RECV_BYTES));
nwritten = ::send(fd, bufp, thissend, 0);
int en = errno;
if (nwritten == SOCKET_ERROR)
{
int wsaerrno = WSAGetLastError();
if (en == EINTR)
nwritten = 0;
else
{
ostringstream oss;
oss << "qfe: writes: send() returned " << nwritten << " (WSA: " << wsaerrno << ")";
idbassert_s(0, oss.str());
}
}
nleft -= nwritten;
bufp += nwritten;
}
return nbytes;
}
#endif
uint32_t readNumber32(SockType fd)
{