Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch '105-fix-perf-tests'
Fix #105: use PUSH/PULL for throughput tests (mirrors libzmq)
  • Loading branch information
jgoz committed Nov 15, 2012
2 parents 01afc7f + 3e4cc0a commit 76404a9
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 5 deletions.
7 changes: 6 additions & 1 deletion src/ZeroMQ.Perf.LatLocal/ZeroMQ.Perf.LatLocal.csproj
Expand Up @@ -22,7 +22,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\perf\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
Expand All @@ -37,9 +37,14 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<OutputPath>..\..\perf\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>..\..\perf\</OutputPath>
<Optimize>true</Optimize>
<DefineConstants>TRACE</DefineConstants>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down
7 changes: 6 additions & 1 deletion src/ZeroMQ.Perf.LatRemote/ZeroMQ.Perf.LatRemote.csproj
Expand Up @@ -22,7 +22,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\perf\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
Expand All @@ -37,9 +37,14 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<OutputPath>..\..\perf\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>..\..\perf\</OutputPath>
<Optimize>true</Optimize>
<DefineConstants>TRACE</DefineConstants>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down
3 changes: 1 addition & 2 deletions src/ZeroMQ.Perf.ThrLocal/Program.cs
Expand Up @@ -29,9 +29,8 @@ internal static int Main(string[] args)

// Initialize 0MQ infrastructure
using (ZmqContext ctx = ZmqContext.Create())
using (ZmqSocket skt = ctx.CreateSocket(SocketType.SUB))
using (ZmqSocket skt = ctx.CreateSocket(SocketType.PULL))
{
skt.SubscribeAll();
skt.Bind(address);

// Wait for the first message.
Expand Down
5 changes: 5 additions & 0 deletions src/ZeroMQ.Perf.ThrLocal/ZeroMQ.Perf.ThrLocal.csproj
Expand Up @@ -37,9 +37,14 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<OutputPath>..\..\perf\</OutputPath>
<PlatformTarget>x64</PlatformTarget>
<DefineConstants>DEBUG;TRACE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>..\..\perf\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion src/ZeroMQ.Perf.ThrRemote/Program.cs
Expand Up @@ -27,7 +27,7 @@ internal static int Main(string[] args)

// Initialize 0MQ infrastructure
using (ZmqContext ctx = ZmqContext.Create())
using (ZmqSocket skt = ctx.CreateSocket(SocketType.PUB))
using (ZmqSocket skt = ctx.CreateSocket(SocketType.PUSH))
{
skt.Connect(address);

Expand Down
5 changes: 5 additions & 0 deletions src/ZeroMQ.Perf.ThrRemote/ZeroMQ.Perf.ThrRemote.csproj
Expand Up @@ -37,9 +37,14 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<OutputPath>..\..\perf\</OutputPath>
<PlatformTarget>x64</PlatformTarget>
<DefineConstants>TRACE;DEBUG</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>..\..\perf\</OutputPath>
<PlatformTarget>x64</PlatformTarget>
<Optimize>true</Optimize>
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down

0 comments on commit 76404a9

Please sign in to comment.