Alawn/Chronicle-Map
1
0
Fork 0
mirror of https://github.com/OpenHFT/Chronicle-Map.git synced 2021-09-13 01:26:12 +00:00
Code Releases Activity

HCOLL-134 ( release draft cut of the code so that I can test it across my network )

Browse Source
This commit is contained in:
Rob Austin
2014-10-07 17:36:12 +01:00
parent 2e59da845d
commit a959dd4d6e
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
+15 -16
View File
@@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicReference;
import static java.nio.ByteBuffer.allocateDirect;
import static java.nio.ByteBuffer.wrap;
import static java.util.concurrent.TimeUnit.SECONDS;
import static net.openhft.chronicle.map.ConcurrentExpiryMap.getDefaultAddress;
import static net.openhft.chronicle.map.NodeDiscoveryBroadcaster.BOOTSTRAP_BYTES;
import static net.openhft.chronicle.map.NodeDiscoveryBroadcaster.LOG;
import static net.openhft.chronicle.map.Replicators.tcp;
@@ -35,21 +36,21 @@ public class NodeDiscovery {
private final AddressAndPort ourAddressAndPort;
private final UdpReplicationConfig udpConfig;
public NodeDiscovery(final AddressAndPort ourAddressAndPort) throws UnknownHostException {
this(8123, ourAddressAndPort, Inet4Address.getByName("255.255.255.255"));
}
public NodeDiscovery(int udpBroadcastPort, final AddressAndPort ourAddressAndPort, InetAddress address) throws UnknownHostException {
this.ourAddressAndPort = ourAddressAndPort;
this.udpConfig = simple(address, udpBroadcastPort);
}
public NodeDiscovery() throws SocketException, UnknownHostException {
this(new AddressAndPort(net.openhft.chronicle.map.ConcurrentExpiryMap.getDefaultAddress(),
(short) 8123));
this((short) 8124, (short) 8123, getDefaultAddress(), Inet4Address.getByName("255.255.255.255"));
}
public ChronicleMap<Integer, CharSequence> discoverMap() throws IOException, InterruptedException {
public NodeDiscovery(short udpBroadcastPort,
short tcpPort,
@NotNull InetAddress tcpAddress,
@NotNull InetAddress udpBroadcastAddress) throws UnknownHostException {
this.ourAddressAndPort = new AddressAndPort(tcpAddress.getAddress(), tcpPort);
this.udpConfig = simple(udpBroadcastAddress, udpBroadcastPort);
}
public ChronicleMap<Integer, CharSequence> discoverMap() throws
IOException, InterruptedException {
final AtomicInteger ourProposedIdentifier = new AtomicInteger();
final AtomicBoolean useAnotherIdentifier = new AtomicBoolean();
@@ -332,8 +333,6 @@ class NodeDiscoveryBroadcaster extends UdpChannelReplicator {
builder.append(bitSet.get(i) ? '1' : '0');
}
return builder.toString();
// LOG.debug(type + "=" + "bitset =" + builder);
}
/**
@@ -1085,7 +1084,7 @@ class ConcurrentExpiryMap<K extends BytesMarshallable, V extends BytesMarshallab
}
public static byte[] getDefaultAddress() throws SocketException {
public static InetAddress getDefaultAddress() throws SocketException {
NetworkInterface networkInterface = ConcurrentExpiryMap.defaultNetworkInterface();
Enumeration<InetAddress> inetAddresses = networkInterface.getInetAddresses();
InetAddress inetAddress = inetAddresses.nextElement();
@@ -1093,6 +1092,6 @@ class ConcurrentExpiryMap<K extends BytesMarshallable, V extends BytesMarshallab
if (inetAddress == null)
throw new IllegalStateException();
return inetAddress.getAddress();
return inetAddress;
}
}