Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-09 20:12:21 +02:00
Code Activity

Merge pull request #1693 from m910q/FixLinuxSocketFDSet

Browse source 
Added support for Socket.Select() under Linux
This commit is contained in:
Brian Fiete 2022-08-26 15:06:38 +02:00 • committed by GitHub
commit 6a321b12e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 70 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

85
BeefLibs/corlib/src/Net/Socket.bf
View file

@ -14,18 +14,6 @@ namespace System.Net
public struct HSocket : uint public struct HSocket : uint
{ {
} }
#else
public struct HSocket : uint32
{
}
#endif
[CRepr]
public struct TimeVal
{
public int32 mSec;
public int32 mUSec;
}
[CRepr] [CRepr]
public struct FDSet public struct FDSet
@ -52,6 +40,54 @@ namespace System.Net
} }
} }
#else
public struct HSocket : uint32
{
}
[CRepr]
public struct FDSet
{
const uint BITS_PER_MASK = sizeof(uint) * 8;
const uint MASK_COUNT = 4096 / sizeof(uint);
const uint MAX_ALLOWED_FD = MASK_COUNT * BITS_PER_MASK;
uint[MASK_COUNT] mSocketBitMasks;
uint32 afterLastBit;
public bool Add(HSocket s) mut
{
let fd = (uint32)s;
if (fd > MAX_ALLOWED_FD)
return false;
if (fd >= afterLastBit)
afterLastBit = fd + 1;
mSocketBitMasks[fd / BITS_PER_MASK] |= 1U << (fd & (BITS_PER_MASK - 1));
return true;
}
public bool IsSet(HSocket s)
{
let fd = (uint32)s;
if (fd > MAX_ALLOWED_FD)
return false;
return (mSocketBitMasks[fd / BITS_PER_MASK] & (1U << (fd & (BITS_PER_MASK - 1)))) != 0;
}
}
#endif
[CRepr]
public struct TimeVal
{
public int32 mSec;
public int32 mUSec;
}
#if BF_PLATFORM_WINDOWS #if BF_PLATFORM_WINDOWS
[CRepr] [CRepr]
struct WSAData struct WSAData
@ -223,7 +259,7 @@ namespace System.Net
#endif #endif
[CLink, CallingConvention(.Stdcall)] [CLink, CallingConvention(.Stdcall)]
static extern int32 select(int nfds, FDSet* readFDS, FDSet* writeFDS, FDSet* exceptFDS, TimeVal* timeVal); static extern int32 select(int32 nfds, FDSet* readFDS, FDSet* writeFDS, FDSet* exceptFDS, TimeVal* timeVal);
[CLink, CallingConvention(.Stdcall)] [CLink, CallingConvention(.Stdcall)]
static extern int32 recv(HSocket s, void* ptr, int32 len, int32 flags); static extern int32 recv(HSocket s, void* ptr, int32 len, int32 flags);
@ -387,7 +423,8 @@ namespace System.Net
TimeVal timeVal; TimeVal timeVal;
timeVal.mSec = (.)(waitTimeMS / 1000); timeVal.mSec = (.)(waitTimeMS / 1000);
timeVal.mUSec = (.)((waitTimeMS % 1000) * 1000); timeVal.mUSec = (.)((waitTimeMS % 1000) * 1000);
return select(0, readFDS, writeFDS, exceptFDS, &timeVal);
return Select(readFDS, writeFDS, exceptFDS, &timeVal);
} }
public static int32 Select(FDSet* readFDS, FDSet* writeFDS, FDSet* exceptFDS, float waitTimeMS) public static int32 Select(FDSet* readFDS, FDSet* writeFDS, FDSet* exceptFDS, float waitTimeMS)
@ -396,7 +433,24 @@ namespace System.Net
TimeVal timeVal; TimeVal timeVal;
timeVal.mSec = (.)(waitTimeUS / (1000*1000)); timeVal.mSec = (.)(waitTimeUS / (1000*1000));
timeVal.mUSec = (.)(waitTimeUS % (1000*1000)); timeVal.mUSec = (.)(waitTimeUS % (1000*1000));
return select(0, readFDS, writeFDS, exceptFDS, &timeVal);
return Select(readFDS, writeFDS, exceptFDS, &timeVal);
}
private static int32 Select(FDSet* readFDS, FDSet* writeFDS, FDSet* exceptFDS, TimeVal* timeVal)
{
#if BF_PLATFORM_WINDOWS
const int32 nfds = 0; // Ignored
#else
int32 nfds = 0;
if (readFDS != null)
nfds = (.)readFDS.[Friend]afterLastBit;
if (writeFDS != null)
nfds = Math.Max(nfds, (.)writeFDS.[Friend]afterLastBit);
if (exceptFDS != null)
nfds = Math.Max(nfds, (.)exceptFDS.[Friend]afterLastBit);
#endif
return select(nfds, readFDS, writeFDS, exceptFDS, timeVal);
} }
public int32 DbgRecv(void* ptr, int32 size) public int32 DbgRecv(void* ptr, int32 size)
@ -467,4 +521,3 @@ namespace System.Net
} }
} }
} }