Skip to content
Sign up
This repository

public / NewId Octocat-spinner-32 forked from phatboyg/NewId

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Renamed NetworkIdProvider to WorkerIdProvider

  • Loading branch information...
commit 6605e2edd79dbbedb033c79d09cf08ccb602de14 1 parent f6130fa
Chris Patterson authored

Showing 8 changed files with 36 additions and 28 deletions. Show Diff Stats Hide Diff Stats

  1. 2  src/NewId.Tests/LongTerm_Specs.cs
  2. 4  src/NewId.Tests/NetworkAddress_Specs.cs
  3. 7  src/NewId/NetworkIdProvider.cs
  4. 12  src/NewId/NewId.cs
  5. 4  src/NewId/NewId.csproj
  6. 11  src/NewId/NewIdGenerator.cs
  7. 17  src/NewId/Providers/{DefaultNetworkIdProvider.cs → NetworkAddressWorkerIdProvider.cs}
  8. 7  src/NewId/WorkerIdProvider.cs
2  src/NewId.Tests/LongTerm_Specs.cs
View 
@@ -10,7 +10,7 @@ public class Generating_ids_over_time
10 10 
         [Test]
11 11 
         public void Should_keep_them_ordered_for_sql_server()
12 12 
         {
13   
-            var generator = new NewIdGenerator(new DefaultNetworkIdProvider(), new TimeLapseTickProvider());
  13 
+            var generator = new NewIdGenerator(new TimeLapseTickProvider(), new NetworkAddressWorkerIdProvider());
14 14 
             generator.Next();
15 15
16 16 
             int limit = 1024;
4  src/NewId.Tests/NetworkAddress_Specs.cs
View 
@@ -9,9 +9,9 @@ public class When_getting_a_network_address_for_the_id_generator
9 9 
         [Test]
10 10 
         public void Should_pull_the_network_adapter_mac_address()
11 11 
         {
12   
-            var networkIdProvider = new DefaultNetworkIdProvider();
  12 
+            var networkIdProvider = new NetworkAddressWorkerIdProvider();
13 13
14   
-            byte[] networkId = networkIdProvider.NetworkId;
  14 
+            byte[] networkId = networkIdProvider.GetWorkerId(0);
15 15
16 16 
             Assert.IsNotNull(networkId);
17 17 
             Assert.AreEqual(6, networkId.Length);
7  src/NewId/NetworkIdProvider.cs
View
... ... 
@@ -1,7 +0,0 @@
1   
-namespace NewId
2   
-{
3   
-    public interface NetworkIdProvider
4   
-    {
5   
-        byte[] NetworkId { get; }
6   
-    }
7   
-}
12  src/NewId/NewId.cs
View 
@@ -17,7 +17,7 @@ public struct NewId :
17 17 
     {
18 18 
         static NewId _empty;
19 19 
         static NewIdGenerator _generator;
20   
-        static NetworkIdProvider _networkIdProvider;
  20 
+        static WorkerIdProvider _workerIdProvider;
21 21 
         static TickProvider _tickProvider;
22 22
23 23 
         readonly Int32 _a;

@@ -66,12 +66,12 @@ public static NewId Empty
66 66
67 67 
         static NewIdGenerator Generator
68 68 
         {
69   
-            get { return _generator ?? (_generator = new NewIdGenerator(NetworkIdProvider, TickProvider)); }
  69 
+            get { return _generator ?? (_generator = new NewIdGenerator(TickProvider, WorkerIdProvider)); }
70 70 
         }
71 71
72   
-        static NetworkIdProvider NetworkIdProvider
  72 
+        static WorkerIdProvider WorkerIdProvider
73 73 
         {
74   
-            get { return _networkIdProvider ?? (_networkIdProvider = new DefaultNetworkIdProvider()); }
  74 
+            get { return _workerIdProvider ?? (_workerIdProvider = new NetworkAddressWorkerIdProvider()); }
75 75 
         }
76 76
77 77 
         static TickProvider TickProvider

@@ -257,9 +257,9 @@ public static void SetGenerator(NewIdGenerator generator)
257 257 
             _generator = generator;
258 258 
         }
259 259
260   
-        public static void SetNetworkIdProvider(NetworkIdProvider provider)
  260 
+        public static void SetWorkerIdProvider(WorkerIdProvider provider)
261 261 
         {
262   
-            _networkIdProvider = provider;
  262 
+            _workerIdProvider = provider;
263 263 
         }
264 264
265 265 
         public static void SetTickProvider(TickProvider provider)
4  src/NewId/NewId.csproj
View 
@@ -35,13 +35,13 @@
35 35 
     <Reference Include="System.Core" />
36 36 
   </ItemGroup>
37 37 
   <ItemGroup>
38   
-    <Compile Include="NetworkIdProvider.cs" />
  38 
+    <Compile Include="WorkerIdProvider.cs" />
39 39 
     <Compile Include="TickProvider.cs" />
40 40 
     <Compile Include="NewId.cs" />
41 41 
     <Compile Include="NewIdGenerator.cs" />
42 42 
     <Compile Include="Properties\AssemblyInfo.cs" />
43 43 
     <Compile Include="Providers\DateTimeTickProvider.cs" />
44   
-    <Compile Include="Providers\DefaultNetworkIdProvider.cs" />
  44 
+    <Compile Include="Providers\NetworkAddressWorkerIdProvider.cs" />
45 45 
   </ItemGroup>
46 46 
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
47 47 
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
11  src/NewId/NewIdGenerator.cs
View 
@@ -6,6 +6,7 @@ public class NewIdGenerator
6 6
7 7 
         readonly object _sync = new object();
8 8 
         readonly TickProvider _tickProvider;
  9 
+        readonly int _workerIndex;
9 10 
         int _a;
10 11 
         int _b;
11 12 
         int _c;

@@ -15,15 +16,21 @@ public class NewIdGenerator
15 16 
         ushort _sequence;
16 17
17 18
18   
-        public NewIdGenerator(NetworkIdProvider networkIdProvider, TickProvider tickProvider)
  19 
+        public NewIdGenerator(TickProvider tickProvider, WorkerIdProvider workerIdProvider, int workerIndex)
19 20 
         {
20   
-            _networkId = networkIdProvider.NetworkId;
  21 
+            _workerIndex = workerIndex;
  22 
+            _networkId = workerIdProvider.GetWorkerId(_workerIndex);
21 23 
             _tickProvider = tickProvider;
22 24
23 25 
             _c = _networkId[0] << 24 | _networkId[1] << 16 | _networkId[2] << 8 | _networkId[3];
24 26 
             _d = _networkId[4] << 24 | _networkId[5] << 16;
25 27 
         }
26 28
  29 
+        public NewIdGenerator(TickProvider tickProvider, WorkerIdProvider workerIdProvider)
  30 
+            : this(tickProvider, workerIdProvider, 0)
  31 
+        {
  32 
+        }
  33 
+
27 34 
         public NewId Next()
28 35 
         {
29 36 
             ushort sequence;
17  src/NewId/Providers/DefaultNetworkIdProvider.cs → ...NewId/Providers/NetworkAddressWorkerIdProvider.cs
View 
@@ -5,17 +5,15 @@ namespace NewId.Providers
5 5 
     using System.Linq;
6 6 
     using System.Net.NetworkInformation;
7 7
8   
-    public class DefaultNetworkIdProvider :
9   
-        NetworkIdProvider
  8 
+    public class NetworkAddressWorkerIdProvider :
  9 
+        WorkerIdProvider
10 10 
     {
11   
-        byte[] _address;
12   
-
13   
-        public byte[] NetworkId
  11 
+        public byte[] GetWorkerId(int index)
14 12 
         {
15   
-            get { return _address ?? (_address = GetNetworkAddress()); }
  13 
+            return GetNetworkAddress(index);
16 14 
         }
17 15
18   
-        static byte[] GetNetworkAddress()
  16 
+        static byte[] GetNetworkAddress(int index)
19 17 
         {
20 18 
             NetworkInterface[] interfaces = NetworkInterface.GetAllNetworkInterfaces();
21 19 
 

@@ -26,7 +24,10 @@ static byte[] GetNetworkAddress()
26 24 
             IEnumerable<NetworkInterface> wireless =
27 25 
                 interfaces.Where(x => x.NetworkInterfaceType == NetworkInterfaceType.Wireless80211);
28 26
29   
-            NetworkInterface network = ethernet.Concat(gigabit).Concat(wireless).FirstOrDefault();
  27 
+            NetworkInterface network = ethernet.Concat(gigabit).Concat(wireless)
  28 
+                .Skip(index)
  29 
+                .FirstOrDefault();
  30 
+
30 31 
             if (network == null)
31 32 
             {
32 33 
                 throw new InvalidOperationException("Unable to find usable network adapter for unique address");
7  src/NewId/WorkerIdProvider.cs
View
... ... 
@@ -0,0 +1,7 @@
  1 
+namespace NewId
  2 
+{
  3 
+    public interface WorkerIdProvider
  4 
+    {
  5 
+        byte[] GetWorkerId(int index);
  6 
+    }
  7 
+}

0 notes on commit 6605e2e

Please sign in to comment.
Something went wrong with that request. Please try again.