GitHub/Facepunch.Steamworks
2
0
Fork 0
mirror of https://github.com/Facepunch/Facepunch.Steamworks.git synced 2024-12-25 14:15:47 +03:00
Code Issues Projects Releases Wiki Activity

Pass results back, optionally

Browse Source
This commit is contained in:
Rohan Singh 2021-01-19 17:04:48 -05:00
parent 616571a3a9
commit 28effd140b
7 changed files with 81 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Facepunch.Steamworks.Test/NetworkingSocketsTest.TestConnectionInterface.cs
View File

@ -1,4 +1,5 @@
using System;
using System.Net;
using System.Text;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
@ -96,10 +97,12 @@ public override unsafe void OnMessage( IntPtr data, int size, long messageNum, l
Connection.SendMessage( "How do you like 20 messages in a row?" );
var connections = new[] { Connection };
var results = new Result[1];
for ( int i=0; i<20; i++ )
{
Console.WriteLine( $"[Connection][{messageNum}][{recvTime}][{channel}] Sending: BLAMMO {i}!" );
Broadcast( connections, connections.Length, $"BLAMMO {i}!" );
SendMessages( connections, connections.Length, $"BLAMMO {i}!", results: results );
Assert.AreEqual( Result.OK, results[0] );
}
Connection.Flush();

2
Facepunch.Steamworks.Test/NetworkingSocketsTest.TestSocketInterface.cs
View File

@ -97,7 +97,7 @@ internal async Task RunAsync()
Receive();
await Task.Delay( 100 );
if ( sw.Elapsed.TotalSeconds > 100 )
if ( sw.Elapsed.TotalSeconds > 30 )
{
Console.WriteLine( "Socket: This all took too long - throwing an exception" );
Assert.Fail( "Socket Took Too Long" );

4
Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs
View File

@ -162,10 +162,10 @@ internal Result SendMessageToConnection( Connection hConn, IntPtr pData, uint cb
#region FunctionMeta
[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_SendMessages", CallingConvention = Platform.CC)]
private static extern void _SendMessages( IntPtr self, int nMessages, NetMsg** pMessages, [In,Out] long[] pOutMessageNumberOrResult );
private static extern void _SendMessages( IntPtr self, int nMessages, NetMsg** pMessages, long* pOutMessageNumberOrResult );
#endregion
internal void SendMessages( int nMessages, NetMsg** pMessages, [In,Out] long[] pOutMessageNumberOrResult )
internal void SendMessages( int nMessages, NetMsg** pMessages, long* pOutMessageNumberOrResult )
{
_SendMessages( Self, nMessages, pMessages, pOutMessageNumberOrResult );
}

11
Facepunch.Steamworks/Networking/BroadcastBufferManager.cs
View File

@ -245,7 +245,8 @@ private static void FreeBuffer( IntPtr ptr, int size )
#endif
}
}
private const int Bucket512 = 512;
private const int Bucket1Kb = 1 * 1024;
private const int Bucket4Kb = 4 * 1024;
private const int Bucket16Kb = 16 * 1024;
@ -253,7 +254,8 @@ private static void FreeBuffer( IntPtr ptr, int size )
private const int Bucket256Kb = 256 * 1024;
private static int GetBucketSize( int size )
{
{
if ( size <= Bucket512 ) return Bucket512;
if ( size <= Bucket1Kb ) return Bucket1Kb;
if ( size <= Bucket4Kb ) return Bucket4Kb;
if ( size <= Bucket16Kb ) return Bucket16Kb;
@ -265,8 +267,9 @@ private static int GetBucketSize( int size )
private static int GetBucketLimit( int size )
{
if ( size <= Bucket1Kb ) return 256;
if ( size <= Bucket4Kb ) return 64;
if ( size <= Bucket512 ) return 1024;
if ( size <= Bucket1Kb ) return 512;
if ( size <= Bucket4Kb ) return 128;
if ( size <= Bucket16Kb ) return 32;
if ( size <= Bucket64Kb ) return 16;
if ( size <= Bucket256Kb ) return 8;

64
Facepunch.Steamworks/Networking/ConnectionManager.cs
View File

@ -151,18 +151,29 @@ public unsafe int Receive( int bufferSize = 32, bool receiveToEnd = true )
return totalProcessed;
}
public unsafe void Broadcast( Connection[] connections, int connectionCount, IntPtr ptr, int size, SendType sendType = SendType.Reliable )
/// <summary>
/// Sends a message to multiple connections.
/// </summary>
/// <param name="connections">The connections to send the message to.</param>
/// <param name="connectionCount">The number of connections to send the message to, to allow reusing the connections array.</param>
/// <param name="ptr">Pointer to the message data.</param>
/// <param name="size">Size of the message data.</param>
/// <param name="sendType">Flags to control delivery of the message.</param>
/// <param name="results">An optional array to hold the results of sending the messages for each connection.</param>
public unsafe void SendMessages( Connection[] connections, int connectionCount, IntPtr ptr, int size, SendType sendType = SendType.Reliable, Result[] results = null )
{
if ( connections == null )
throw new ArgumentNullException( nameof( connections ) );
if ( connectionCount < 0 || connectionCount > connections.Length )
throw new ArgumentException( nameof( connectionCount ) );
if ( connectionCount > 1024 )
throw new ArgumentException( "`connectionCount` must be between 0 and `connections.Length`", nameof( connectionCount ) );
if ( results != null && connectionCount > results.Length )
throw new ArgumentException( "`results` must have at least `connectionCount` entries", nameof( results ) );
if ( connectionCount > 1024 ) // restricting this because we stack allocate based on this value
throw new ArgumentOutOfRangeException( nameof( connectionCount ) );
if ( ptr == IntPtr.Zero )
throw new ArgumentNullException( nameof( ptr ) );
if ( size == 0 )
throw new ArgumentException( nameof( size ) );
throw new ArgumentException( "`size` cannot be zero", nameof( size ) );
if ( connectionCount == 0 )
return;
@ -175,6 +186,8 @@ public unsafe void Broadcast( Connection[] connections, int connectionCount, Int
Buffer.MemoryCopy( (void*)ptr, (void*)copyPtr, size, size );
var messages = stackalloc NetMsg*[connectionCount];
var messageNumberOrResults = stackalloc long[results != null ? connectionCount : 0];
for ( var i = 0; i < connectionCount; i++ )
{
messages[i] = SteamNetworkingUtils.AllocateMessage();
@ -185,18 +198,21 @@ public unsafe void Broadcast( Connection[] connections, int connectionCount, Int
messages[i]->FreeDataPtr = BroadcastBufferManager.FreeFunctionPointer;
}
SteamNetworkingSockets.Internal.SendMessages( connectionCount, messages, null );
}
SteamNetworkingSockets.Internal.SendMessages( connectionCount, messages, messageNumberOrResults );
/// <summary>
/// Ideally should be using an IntPtr version unless you're being really careful with the byte[] array and
/// you're not creating a new one every frame (like using .ToArray())
/// </summary>
public unsafe void Broadcast( Connection[] connections, int connectionCount, byte[] data, SendType sendType = SendType.Reliable )
{
fixed ( byte* ptr = data )
if (results == null)
return;
for ( var i = 0; i < connectionCount; i++ )
{
Broadcast( connections, connectionCount, (IntPtr)ptr, data.Length, sendType );
if ( messageNumberOrResults[i] < 0 )
{
results[i] = (Result)( -messageNumberOrResults[i] );
}
else
{
results[i] = Result.OK;
}
}
}
@ -204,21 +220,33 @@ public unsafe void Broadcast( Connection[] connections, int connectionCount, byt
/// Ideally should be using an IntPtr version unless you're being really careful with the byte[] array and
/// you're not creating a new one every frame (like using .ToArray())
/// </summary>
public unsafe void Broadcast( Connection[] connections, int connectionCount, byte[] data, int offset, int length, SendType sendType = SendType.Reliable )
public unsafe void SendMessages( Connection[] connections, int connectionCount, byte[] data, SendType sendType = SendType.Reliable, Result[] results = null )
{
fixed ( byte* ptr = data )
{
Broadcast( connections, connectionCount, (IntPtr)ptr + offset, length, sendType );
SendMessages( connections, connectionCount, (IntPtr)ptr, data.Length, sendType, results );
}
}
/// <summary>
/// Ideally should be using an IntPtr version unless you're being really careful with the byte[] array and
/// you're not creating a new one every frame (like using .ToArray())
/// </summary>
public unsafe void SendMessages( Connection[] connections, int connectionCount, byte[] data, int offset, int length, SendType sendType = SendType.Reliable, Result[] results = null )
{
fixed ( byte* ptr = data )
{
SendMessages( connections, connectionCount, (IntPtr)ptr + offset, length, sendType, results );
}
}
/// <summary>
/// This creates a ton of garbage - so don't do anything with this beyond testing!
/// </summary>
public void Broadcast( Connection[] connections, int connectionCount, string str, SendType sendType = SendType.Reliable )
public void SendMessages( Connection[] connections, int connectionCount, string str, SendType sendType = SendType.Reliable, Result[] results = null )
{
var bytes = System.Text.Encoding.UTF8.GetBytes( str );
Broadcast( connections, connectionCount, bytes, sendType );
SendMessages( connections, connectionCount, bytes, sendType, results );
}
internal unsafe void ReceiveMessage( ref NetMsg* msg )

23
Generator/Types/BaseType.cs
View File

@ -76,19 +76,33 @@ public static BaseType Parse( string type, string varname = null, string callres
public virtual bool ShouldSkipAsArgument => false;
public virtual string AsNativeArgument() => AsArgument();
public virtual string AsArgument() => IsVector ? $"[In,Out] {Ref}{TypeName.Trim( '*', ' ', '&' )}[] {VarName}" : $"{Ref}{TypeName.Trim( '*', ' ', '&' )} {VarName}";
public virtual string AsCallArgument() => $"{Ref}{VarName}";
public virtual string AsArgument()
{
if (IsVector)
{
return $"[In,Out] {Ref}{TypeName.Trim('*', ' ', '&')}[] {VarName}";
}
return TreatAsPointer
? $"{Ref}{TypeName}{new string('*', NativeType.Count(c => c == '*'))} {VarName}"
: $"{Ref}{TypeName.Trim('*', ' ', '&')} {VarName}";
}
public virtual string AsCallArgument() => $"{Ref}{VarName}";
public virtual string Return( string varname ) => $"return {varname};";
public virtual string ReturnAttribute => null;
public virtual string ReturnType => TypeName;
public virtual string Ref => !IsVector && NativeType.EndsWith( "*" ) || NativeType.EndsWith( "**" ) || NativeType.Contains( "&" ) ? "ref " : "";
public virtual string Ref => !TreatAsPointer && !IsVector && NativeType.EndsWith( "*" ) || NativeType.EndsWith( "**" ) || NativeType.Contains( "&" ) ? "ref " : "";
public virtual bool IsVector
{
get
{
{
if ( TreatAsPointer ) return false;
if ( Func == "ReadP2PPacket" ) return false;
if ( Func == "SendP2PPacket" ) return false;
if ( VarName == "pOutMessageNumber" ) return false;
@ -124,6 +138,7 @@ public virtual bool IsVector
}
}
public virtual bool TreatAsPointer => VarName == "pOutMessageNumberOrResult";
public virtual bool IsVoid => false;
}

4
Generator/Types/StructType.cs
View File

@ -23,9 +23,9 @@ internal class StructType : BaseType
public override string AsCallArgument() => IsPointer && TreatAsPointer ? VarName : base.AsCallArgument();
public bool IsPointer => NativeType.EndsWith( "*" );
public override bool TreatAsPointer => StructName == "NetMsg";
public bool TreatAsPointer => StructName == "NetMsg";
public bool IsPointer => NativeType.EndsWith( "*" );
public override string Return( string varname )
{