Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Post-fork update #1

Merged
merged 4 commits into from
Dec 15, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ open System
open System.Reflection
open System.Runtime.InteropServices

[<assembly: AssemblyTitleAttribute("Wire")>]
[<assembly: AssemblyProductAttribute("Wire")>]
[<assembly: AssemblyTitleAttribute("Hyperion")>]
[<assembly: AssemblyProductAttribute("Hyperion")>]
[<assembly: AssemblyDescriptionAttribute("Binary serializer for POCO objects")>]
[<assembly: AssemblyCopyrightAttribute("Copyright � 2013-2016 AsynkronIT")>]
[<assembly: AssemblyCompanyAttribute("AsynkronIT")>]
[<assembly: AssemblyCopyrightAttribute("Copyright � 2016 Akka.NET Team")>]
[<assembly: AssemblyCompanyAttribute("Akka.NET Team")>]
[<assembly: ComVisibleAttribute(false)>]
[<assembly: CLSCompliantAttribute(true)>]
[<assembly: AssemblyVersionAttribute("0.9.0.0")>]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>2d321671-6320-4dd2-b174-2773192d2a5a</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>Wire.FSharpTestTypes</RootNamespace>
<AssemblyName>Wire.FSharpTestTypes</AssemblyName>
<RootNamespace>Hyperion.FSharpTestTypes</RootNamespace>
<AssemblyName>Hyperion.FSharpTestTypes</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Name>Wire.FSharpTestTypes</Name>
<Name>Hyperion.FSharpTestTypes</Name>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -22,7 +22,7 @@
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<DocumentationFile>bin\Debug\Wire.FSharpTestTypes.XML</DocumentationFile>
<DocumentationFile>bin\Debug\Hyperion.FSharpTestTypes.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -31,7 +31,7 @@
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<DocumentationFile>bin\Release\Wire.FSharpTestTypes.XML</DocumentationFile>
<DocumentationFile>bin\Release\Hyperion.FSharpTestTypes.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup>
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Wire.FSharpTestTypes
namespace Hyperion.FSharpTestTypes

open Akka.Actor

Expand Down Expand Up @@ -47,7 +47,6 @@ module TestQuotations =
| 0 | 1 -> 1
| _ -> fib(n-1) + fib(n-2)
async { return fib x } @>



module TestMap =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// for more guidance on F# programming.

#load "Library1.fs"
open Wire.FSharpTestTypes
open Hyperion.FSharpTestTypes

// Define your library scripting code here

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<ProjectGuid>{35352664-E867-48EC-A0B1-39013CA42FE0}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Wire.PerfTest</RootNamespace>
<AssemblyName>Wire.PerfTest</AssemblyName>
<RootNamespace>Hyperion.PerfTest</RootNamespace>
<AssemblyName>Hyperion.PerfTest</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
Expand Down Expand Up @@ -245,9 +245,9 @@
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Wire\Wire.csproj">
<ProjectReference Include="..\Hyperion\Hyperion.csproj">
<Project>{7af8d2b6-9f1f-4a1c-8673-48e533108385}</Project>
<Name>Wire</Name>
<Name>Hyperion</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
using System;
#region copyright
// -----------------------------------------------------------------------
// <copyright file="CustomBinaryFormatter.cs" company="Akka.NET Team">
// Copyright (C) 2015-2016 AsynkronIT <https://github.com/AsynkronIT>
// Copyright (C) 2016-2016 Akka.NET Team <https://github.com/akkadotnet>
// </copyright>
// -----------------------------------------------------------------------
#endregion

using System;
using System.Collections.Generic;
using System.IO;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;

namespace Wire.PerfTest.ManualSerializer
namespace Hyperion.PerfTest.ManualSerializer
{
public interface ICustomBinarySerializable
{
Expand Down
15 changes: 12 additions & 3 deletions Wire.PerfTest/Program.cs → Hyperion.PerfTest/Program.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
using System;
#region copyright
// -----------------------------------------------------------------------
// <copyright file="Program.cs" company="Akka.NET Team">
// Copyright (C) 2015-2016 AsynkronIT <https://github.com/AsynkronIT>
// Copyright (C) 2016-2016 Akka.NET Team <https://github.com/akkadotnet>
// </copyright>
// -----------------------------------------------------------------------
#endregion

using System;
using System.Threading;
using Wire.PerfTest.Tests;
using Hyperion.PerfTest.Tests;

namespace Wire.PerfTest
namespace Hyperion.PerfTest
{
internal class Program
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ using Bond.IO.Unsafe;
using Bond.Protocols;
using Newtonsoft.Json;
using ProtoBuf;
using Wire.SerializerFactories;
using Wire.ValueSerializers;
using Hyperion.SerializerFactories;
using Hyperion.ValueSerializers;

namespace Wire.PerfTest
namespace Hyperion.PerfTest
{
internal class Program
{
Expand Down Expand Up @@ -176,7 +176,7 @@ namespace Wire.PerfTest
var s = new MemoryStream();
serializer.Serialize(Poco, s);
var bytes = s.ToArray();
RunTest("Wire - preregister types", () =>
RunTest("Hyperion - preregister types", () =>
{
var stream = new MemoryStream();
serializer.Serialize(Poco, stream);
Expand Down Expand Up @@ -228,7 +228,7 @@ namespace Wire.PerfTest
var s = new MemoryStream();
serializer.Serialize(Poco, s);
var bytes = s.ToArray();
RunTest("Wire - preregister types (manual serializer)", () =>
RunTest("Hyperion - preregister types (manual serializer)", () =>
{
var stream = new MemoryStream();
serializer.Serialize(Poco, stream);
Expand All @@ -245,7 +245,7 @@ namespace Wire.PerfTest
var s = new MemoryStream();
serializer.Serialize(Poco, s);
var bytes = s.ToArray();
RunTest("Wire - no version data", () =>
RunTest("Hyperion - no version data", () =>
{
var stream = new MemoryStream();
serializer.Serialize(Poco, stream);
Expand All @@ -262,7 +262,7 @@ namespace Wire.PerfTest
var s = new MemoryStream();
serializer.Serialize(Poco, s);
var bytes = s.ToArray();
RunTest("Wire - preserve object refs", () =>
RunTest("Hyperion - preserve object refs", () =>
{
var stream = new MemoryStream();
serializer.Serialize(Poco, stream);
Expand All @@ -279,7 +279,7 @@ namespace Wire.PerfTest
var s = new MemoryStream();
serializer.Serialize(Poco, s);
var bytes = s.ToArray();
RunTest("Wire - version tolerant", () =>
RunTest("Hyperion - version tolerant", () =>
{
var stream = new MemoryStream();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
using System.Reflection;
#region copyright
// -----------------------------------------------------------------------
// <copyright file="AssemblyInfo.cs" company="Akka.NET Team">
// Copyright (C) 2015-2016 AsynkronIT <https://github.com/AsynkronIT>
// Copyright (C) 2016-2016 Akka.NET Team <https://github.com/akkadotnet>
// </copyright>
// -----------------------------------------------------------------------
#endregion

using System.Reflection;
using System.Runtime.InteropServices;
using Wire.PerfTest;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.

[assembly: AssemblyTitle("Wire.PerfTest")]
[assembly: AssemblyTitle("Hyperion.PerfTest")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Wire.PerfTest")]
[assembly: AssemblyProduct("Hyperion.PerfTest")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Expand Down
27 changes: 27 additions & 0 deletions Hyperion.PerfTest/Tests/GuidArrayTest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#region copyright
// -----------------------------------------------------------------------
// <copyright file="GuidArrayTest.cs" company="Akka.NET Team">
// Copyright (C) 2015-2016 AsynkronIT <https://github.com/AsynkronIT>
// Copyright (C) 2016-2016 Akka.NET Team <https://github.com/akkadotnet>
// </copyright>
// -----------------------------------------------------------------------
#endregion

using System;
using System.Collections.Generic;

namespace Hyperion.PerfTest.Tests
{
class GuidArrayTest : TestBase<Guid[]>
{
protected override Guid[] GetValue()
{
var l = new List<Guid>();
for (int i = 0; i < 100; i++)
{
l.Add(Guid.NewGuid());
}
return l.ToArray();
}
}
}
21 changes: 21 additions & 0 deletions Hyperion.PerfTest/Tests/GuidTest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#region copyright
// -----------------------------------------------------------------------
// <copyright file="GuidTest.cs" company="Akka.NET Team">
// Copyright (C) 2015-2016 AsynkronIT <https://github.com/AsynkronIT>
// Copyright (C) 2016-2016 Akka.NET Team <https://github.com/akkadotnet>
// </copyright>
// -----------------------------------------------------------------------
#endregion

using System;

namespace Hyperion.PerfTest.Tests
{
class GuidTest : TestBase<Guid>
{
protected override Guid GetValue()
{
return Guid.NewGuid();
}
}
}
21 changes: 21 additions & 0 deletions Hyperion.PerfTest/Tests/LargeStructTest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#region copyright
// -----------------------------------------------------------------------
// <copyright file="LargeStructTest.cs" company="Akka.NET Team">
// Copyright (C) 2015-2016 AsynkronIT <https://github.com/AsynkronIT>
// Copyright (C) 2016-2016 Akka.NET Team <https://github.com/akkadotnet>
// </copyright>
// -----------------------------------------------------------------------
#endregion

using Hyperion.PerfTest.Types;

namespace Hyperion.PerfTest.Tests
{
internal class LargeStructTest : TestBase<LargeStruct>
{
protected override LargeStruct GetValue()
{
return LargeStruct.Create();
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
using System;
#region copyright
// -----------------------------------------------------------------------
// <copyright file="TestBase.cs" company="Akka.NET Team">
// Copyright (C) 2015-2016 AsynkronIT <https://github.com/AsynkronIT>
// Copyright (C) 2016-2016 Akka.NET Team <https://github.com/akkadotnet>
// </copyright>
// -----------------------------------------------------------------------
#endregion

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
Expand All @@ -11,7 +20,7 @@
using ServiceStack.Text;
using ZeroFormatter;

namespace Wire.PerfTest.Tests
namespace Hyperion.PerfTest.Tests
{
internal class TestResult
{
Expand Down Expand Up @@ -363,7 +372,7 @@ private void SerializeKnownTypesReuseSession()
serializer.Serialize(Value, s, ss);
var bytes = s.ToArray();

RunTest("Wire - KnownTypes + Reuse Sessions", () =>
RunTest("Hyperion - KnownTypes + Reuse Sessions", () =>
{
var stream = new MemoryStream();
serializer.Serialize(Value, stream, ss);
Expand All @@ -382,7 +391,7 @@ private void SerializeKnownTypes()
serializer.Serialize(Value, s);
var bytes = s.ToArray();

RunTest("Wire - KnownTypes", () =>
RunTest("Hyperion - KnownTypes", () =>
{
var stream = new MemoryStream();
serializer.Serialize(Value, stream);
Expand All @@ -399,7 +408,7 @@ private void SerializeDefault()
var s = new MemoryStream();
serializer.Serialize(Value, s);
var bytes = s.ToArray();
RunTest("Wire - Default", () =>
RunTest("Hyperion - Default", () =>
{
var stream = new MemoryStream();
serializer.Serialize(Value, stream);
Expand All @@ -416,7 +425,7 @@ private void SerializeVersionPreserveObjects()
var s = new MemoryStream();
serializer.Serialize(Value, s);
var bytes = s.ToArray();
RunTest("Wire - Object Identity", () =>
RunTest("Hyperion - Object Identity", () =>
{
var stream = new MemoryStream();
serializer.Serialize(Value, stream);
Expand All @@ -434,7 +443,7 @@ private void SerializeVersionTolerant()
serializer.Serialize(Value, s);
var bytes = s.ToArray();
s.Position = 0;
RunTest("Wire - Version Tolerant", () =>
RunTest("Hyperion - Version Tolerant", () =>
{
var stream = new MemoryStream();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
using System;
#region copyright
// -----------------------------------------------------------------------
// <copyright file="TypicalMessageArrayTest.cs" company="Akka.NET Team">
// Copyright (C) 2015-2016 AsynkronIT <https://github.com/AsynkronIT>
// Copyright (C) 2016-2016 Akka.NET Team <https://github.com/akkadotnet>
// </copyright>
// -----------------------------------------------------------------------
#endregion

using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Wire.PerfTest.Types;
using Hyperion.PerfTest.Types;

namespace Wire.PerfTest.Tests
namespace Hyperion.PerfTest.Tests
{
class TypicalMessageArrayTest : TestBase<TypicalMessage[]>
{
Expand Down
Loading