ziver/zutil
1
0
Fork 0
Code Issues Pull requests Activity Actions

NioNetwork working now, but something wrong with close()

Browse source
This commit is contained in:
Ziver Koc 2016-12-08 17:57:56 +01:00
parent 13082f0db0
commit de4e4e54c9
30 changed files with 574 additions and 783 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/zutil/converter/Converter.java
View file

@ -161,8 +161,7 @@ public class Converter {
* @return the associated object.
*/
public static Object toObject(byte[] bytes) throws Exception{
Object object = null;
Object object;
ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(bytes));
object = ois.readObject();
ois.close();
@ -171,20 +170,15 @@ public class Converter {
}
/**
* Converts an array of bytes back to its constituent object. The
* input array is assumed to have been created from the original object.
* Reads the first Java Serialized object from a stream.
*
* @param bytes the byte array to convert.
* @return the associated object.
* @param input the stream to read from
* @return an parsed object.
*/
public static Object toObject(DynamicByteArrayStream bytes) throws Exception{
Object object = null;
ObjectInputStream ois = new ObjectInputStream(bytes);
object = ois.readObject();
ois.close();
return object;
public static Object toObject(InputStream input) throws Exception{
ObjectInputStream ois = new ObjectInputStream(input);
// Don't close the stream as it will close the underlying stream.
return ois.readObject();
}

2
src/zutil/log/net/NetLogExceptionMessage.java Normal file → Executable file
View file

@ -28,7 +28,7 @@ import zutil.net.nio.message.Message;
import java.util.logging.LogRecord;
public class NetLogExceptionMessage extends Message {
public class NetLogExceptionMessage implements Message {
private static final long serialVersionUID = 1L;
private int count;

3
src/zutil/log/net/NetLogMessage.java Normal file → Executable file
View file

@ -30,7 +30,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.logging.LogRecord;
public class NetLogMessage extends Message {
public class NetLogMessage implements Message {
private static final long serialVersionUID = 1L;
private static final SimpleDateFormat dataFormat =
new SimpleDateFormat("yyyy--MM-dd HH:mm:ss");
@ -42,6 +42,7 @@ public class NetLogMessage extends Message {
private String methodName;
private String log;
public NetLogMessage(String level, long timestamp, String log){
this.level = level;
this.timestamp = timestamp;

2
src/zutil/log/net/NetLogStatusMessage.java Normal file → Executable file
View file

@ -26,7 +26,7 @@ package zutil.log.net;
import zutil.net.nio.message.Message;
public class NetLogStatusMessage extends Message{
public class NetLogStatusMessage implements Message{
private static final long serialVersionUID = 1L;
public long totalMemory;

18
src/zutil/net/nio/NioClient.java
View file

@ -25,12 +25,11 @@
package zutil.net.nio;
import zutil.net.nio.message.Message;
import zutil.net.nio.message.RequestResponseMessage;
import zutil.net.nio.response.ResponseEvent;
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.nio.channels.Selector;
import java.nio.channels.spi.SelectorProvider;
@ -55,7 +54,7 @@ public class NioClient extends NioNetwork{
}
/**
* Sends a Message to the default server
* Sends a Message to the connected server
*
* @param data the data to be sent
*/
@ -64,12 +63,15 @@ public class NioClient extends NioNetwork{
}
/**
* This method is for the Client to send a message to the server
* Sends a Message to the connected server
*
* @param handler the response handler
* @param data the data to send
* @param data the data to be sent
*/
public void send(ResponseEvent handler, RequestResponseMessage data) throws IOException {
send(remoteAddress, handler, data);
public void send(byte[] data) throws IOException {
send(remoteAddress, data);
}
public SocketAddress getRemoteAddress(){
return remoteAddress;
}
}

88
src/zutil/net/nio/NioNetwork.java
View file

@ -26,12 +26,8 @@ package zutil.net.nio;
import zutil.converter.Converter;
import zutil.log.LogUtil;
import zutil.net.nio.message.RequestResponseMessage;
import zutil.net.nio.message.SystemMessage;
import zutil.net.nio.response.ResponseEvent;
import zutil.net.nio.server.ChangeRequest;
import zutil.net.nio.server.ClientData;
import zutil.net.nio.worker.SystemWorker;
import zutil.net.nio.worker.Worker;
import java.io.IOException;
@ -57,7 +53,6 @@ public abstract class NioNetwork implements Runnable {
// The buffer into which we'll read data when it's available
private ByteBuffer readBuffer = ByteBuffer.allocate(8192);
protected Worker worker;
protected SystemWorker systemWorker;
// This map contains all the clients that are connected
protected Map<InetSocketAddress, ClientData> clients = new HashMap<InetSocketAddress, ClientData>();
@ -85,7 +80,6 @@ public abstract class NioNetwork implements Runnable {
this.localAddress = localAddress;
// init selector
this.selector = initSelector();
this.systemWorker = new SystemWorker(this);
// init traffic thread
new Thread(this).start();
}
@ -128,13 +122,6 @@ public abstract class NioNetwork implements Runnable {
send(address, Converter.toBytes(data));
}
public void send(SocketAddress address, ResponseEvent handler, RequestResponseMessage data) throws IOException {
// Register the response handler
systemWorker.addResponseHandler(handler, data);
send(address, Converter.toBytes(data));
}
/**
* Queues a message to be sent
*
@ -168,8 +155,8 @@ public abstract class NioNetwork implements Runnable {
public void run() {
logger.fine("NioNetwork Started.");
while (true) {
logger.info("NioNetwork Started.");
while (selector.isOpen()) {
try {
// Handle any pending changes
synchronized (pendingChanges) {
@ -196,36 +183,36 @@ public abstract class NioNetwork implements Runnable {
logger.finest("selector is awake");
// Iterate over the set of keys for which events are available
if (selector.isOpen()) {
Iterator<SelectionKey> selectedKeys = selector.selectedKeys().iterator();
while (selectedKeys.hasNext()) {
SelectionKey key = selectedKeys.next();
selectedKeys.remove();
logger.finest("KeyOP: "+key.interestOps()+" isAcceptable: "+SelectionKey.OP_ACCEPT+" isConnectible: "+SelectionKey.OP_CONNECT+" isWritable: "+SelectionKey.OP_WRITE+" isReadable: "+SelectionKey.OP_READ);
logger.finest("KeyOP: " + key.interestOps() + " isAcceptable: " + SelectionKey.OP_ACCEPT + " isConnectible: " + SelectionKey.OP_CONNECT + " isWritable: " + SelectionKey.OP_WRITE + " isReadable: " + SelectionKey.OP_READ);
if (key.isValid()) {
// Check what event is available and deal with it
if (key.isAcceptable()) {
logger.finest("Accepting Connection!!");
accept(key);
}
else if (key.isConnectable()) {
} else if (key.isConnectable()) {
logger.finest("Establishing Connection!!");
establishConnection(key);
}
else if (key.isWritable()) {
} else if (key.isWritable()) {
logger.finest("Writing");
write(key);
}
else if (key.isReadable()) {
} else if (key.isReadable()) {
logger.finest("Reading");
read(key);
}
}
}
}
} catch (Exception e) {
e.printStackTrace();
}
}
logger.info("Shutting down NioNetwork");
}
/**
@ -309,7 +296,7 @@ public abstract class NioNetwork implements Runnable {
*/
private void read(SelectionKey key) throws IOException {
SocketChannel socketChannel = (SocketChannel) key.channel();
InetSocketAddress remoteAdr = (InetSocketAddress) socketChannel.socket().getRemoteSocketAddress();
SocketAddress remoteAdr = socketChannel.socket().getRemoteSocketAddress();
// Clear out our read buffer so it's ready for new data
readBuffer.clear();
@ -341,43 +328,25 @@ public abstract class NioNetwork implements Runnable {
}
// Make a correctly sized copy of the data before handing it to the client
byte[] rspByteData = new byte[numRead];
System.arraycopy(readBuffer.array(), 0, rspByteData, 0, numRead);
//byte[] rspByteData = new byte[numRead];
//System.arraycopy(readBuffer.array(), 0, rspByteData, 0, numRead);
try{
Object rspData = Converter.toObject(rspByteData);
handleReceivedMessage(socketChannel, rspData);
Object rspData = Converter.toObject(readBuffer.array());
// Hand the data off to our worker thread
if (worker != null) {
logger.finer("Handling incoming message...");
worker.processData(this, socketChannel.getRemoteAddress(), rspData);
} else {
logger.fine("No worker set, message unhandled!");
}
}catch(Exception e){
e.printStackTrace();
}
}
private void handleReceivedMessage(SocketChannel socketChannel, Object rspData){
logger.finer("Handling incoming message...");
try {
if (rspData instanceof SystemMessage) {
if (systemWorker != null) {
logger.finest("Handling system message");
systemWorker.processData(this, socketChannel.getRemoteAddress(), rspData);
} else {
logger.finer("Unhandled system message!");
}
} else {
// Hand the data off to our worker thread
if (worker != null) {
logger.finest("Handling generic worker message");
worker.processData(this, socketChannel.getRemoteAddress(), rspData);
} else {
logger.fine("Unhandled message!");
}
}
}catch (IOException e){
e.printStackTrace();
}
}
private ClientData registerSocketChannel(SocketChannel socket){
InetSocketAddress remoteAdr = (InetSocketAddress) socket.socket().getRemoteSocketAddress();
@ -395,7 +364,7 @@ public abstract class NioNetwork implements Runnable {
/**
* Close a ongoing connection
* Close a specific ongoing connection
*/
protected void closeConnection(InetSocketAddress address) throws IOException{
closeConnection(getSocketChannel(address));
@ -406,14 +375,17 @@ public abstract class NioNetwork implements Runnable {
socketChannel.keyFor(selector).cancel();
}
/*public void close() throws IOException{
/**
* Close all connections
*/
public void close() throws IOException{
if(serverChannel != null){
serverChannel.close();
serverChannel.keyFor(selector).cancel();
}
clients.clear();
pendingChanges.clear();
pendingWriteData.clear();
selector.close();
}*/
}
}

6
src/zutil/net/nio/message/EchoMessage.java
View file

@ -25,18 +25,18 @@
package zutil.net.nio.message;
/**
* The reciver will echo out this message to the sender
* The receiver will echo out this message to the sender
*
* @author Ziver
*/
public abstract class EchoMessage extends Message implements SystemMessage{
public abstract class EchoMessage implements Message{
private static final long serialVersionUID = 1L;
private boolean echo = false;
/**
* @return true if this message is an echo of an original message
* @return true if this message is an echo/copy of an original message
*/
public boolean echo() {
return echo;

38
src/zutil/net/nio/message/KeepAliveMessage.java
View file

@ -1,38 +0,0 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2015 Ziver Koc
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package zutil.net.nio.message;
/**
* Tells the destination that the
* source is still online
*
* @author Ziver
*
*/
public class KeepAliveMessage extends Message implements SystemMessage{
private static final long serialVersionUID = 1L;
}

4
src/zutil/net/nio/message/Message.java Normal file → Executable file
View file

@ -26,8 +26,6 @@ package zutil.net.nio.message;
import java.io.Serializable;
public class Message implements Serializable{
private static final long serialVersionUID = 1L;
public interface Message extends Serializable{
}

36
src/zutil/net/nio/message/SystemMessage.java
View file

@ -1,36 +0,0 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2015 Ziver Koc
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package zutil.net.nio.message;
/**
* A message that implements this will be
* handeld internaly by the network engine
*
* @author Ziver
*
*/
public interface SystemMessage {
}

5
src/zutil/net/nio/response/PrintRsp.java → src/zutil/net/nio/response/PrintResponseHandler.java Normal file → Executable file
View file

@ -24,13 +24,12 @@
package zutil.net.nio.response;
import zutil.io.MultiPrintStream;
public class PrintRsp extends ResponseEvent{
public class PrintResponseHandler extends ResponseHandler {
@Override
protected void responseEvent(Object rsp) {
MultiPrintStream.out.println(rsp);
System.out.println(rsp);
}
}

2
src/zutil/net/nio/message/RequestResponseMessage.java → src/zutil/net/nio/response/RequestResponseMessage.java
View file

@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
package zutil.net.nio.message;
package zutil.net.nio.response;
/**
* This interface defines a request response flow where a request

67
src/zutil/net/nio/response/ResponseEvent.java
View file

@ -1,67 +0,0 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2015 Ziver Koc
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package zutil.net.nio.response;
public abstract class ResponseEvent {
private Object rsp = null;
public synchronized boolean handleResponse(Object rsp) {
this.rsp = rsp;
notify();
return true;
}
/**
* Blocks the Thread until there is a response
*/
public synchronized void waitForResponse() {
while(!gotResponse()) {
try {
this.wait();
} catch (InterruptedException e) {}
}
responseEvent(rsp);
}
/**
* Handles the response
*/
public void handleResponse(){
if(gotResponse()){
responseEvent(rsp);
}
}
/**
* @return If there is an response
*/
public boolean gotResponse(){
return (rsp != null);
}
protected abstract void responseEvent(Object rsp);
}

47
src/zutil/net/nio/response/ResponseHandler.java Normal file → Executable file
View file

@ -24,42 +24,35 @@
package zutil.net.nio.response;
import java.util.LinkedList;
import java.util.List;
// TODO: this class has a strange structure, should be refactored
public abstract class ResponseHandler {
private Object rsp = null;
public abstract class ResponseHandler implements Runnable{
private List<ResponseEvent> queue = new LinkedList<ResponseEvent>();
public ResponseHandler(){
}
public synchronized void addResponseEvent(ResponseEvent re){
queue.add(re);
public synchronized void handleResponse(Object rsp) {
this.rsp = rsp;
responseEvent(rsp);
notify();
}
public synchronized void removeResponseEvent(ResponseEvent re){
queue.remove(re);
}
public void run() {
while(true) {
/**
* Blocks the calling thread until there is a response
*/
public void waitForResponse() {
while(!gotResponse()) {
try {
synchronized (this) {
this.wait();
}
} catch (InterruptedException e) {}
update();
}
}
public synchronized void update(){
while(!queue.isEmpty()){
queue.get(0).handleResponse();
if(queue.get(0).gotResponse()){
queue.remove(0);
}
}
/**
* @return true if a response has been received
*/
public boolean gotResponse(){
return (rsp != null);
}
protected abstract void responseEvent(Object rsp);
}

16
src/zutil/net/nio/message/StringResponseMessage.java → src/zutil/net/nio/response/StringResponseMessage.java
View file

@ -22,22 +22,26 @@
* THE SOFTWARE.
*/
package zutil.net.nio.message;
package zutil.net.nio.response;
import zutil.net.nio.message.EchoMessage;
public class StringResponseMessage extends EchoMessage implements RequestResponseMessage {
private static final long serialVersionUID = 1L;
private long responseId;
private String msg;
public StringResponseMessage(String msg){
this.msg = msg;
responseId = (long)(Math.random()*Long.MAX_VALUE);
}
public String getString(){
return msg;
public long getResponseId() {
return responseId;
}
public void setString(String msg){
@ -45,10 +49,6 @@ public class StringResponseMessage extends EchoMessage implements RequestRespons
}
public String toString(){
return getString();
}
public long getResponseId() {
return responseId;
return msg;
}
}

44
src/zutil/net/nio/worker/EchoWorker.java
View file

@ -1,44 +0,0 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2015 Ziver Koc
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package zutil.net.nio.worker;
import java.io.IOException;
public class EchoWorker extends ThreadedEventWorker {
@Override
public void messageEvent(WorkerEventData dataEvent) {
try {
// Return to sender
dataEvent.network.send(dataEvent.remoteAddress, dataEvent.data);
} catch (IOException e) {
e.printStackTrace();
}
}
}

40
src/zutil/net/nio/worker/SystemWorker.java → src/zutil/net/nio/worker/StandardWorker.java
View file

@ -24,33 +24,36 @@
package zutil.net.nio.worker;
import zutil.converter.Converter;
import zutil.log.LogUtil;
import zutil.net.nio.NioNetwork;
import zutil.net.nio.message.Message;
import zutil.net.nio.message.EchoMessage;
import zutil.net.nio.message.RequestResponseMessage;
import zutil.net.nio.response.ResponseEvent;
import zutil.net.nio.response.RequestResponseMessage;
import zutil.net.nio.response.ResponseHandler;
import java.io.IOException;
import java.net.SocketAddress;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Logger;
public class SystemWorker extends ThreadedEventWorker {
public class StandardWorker extends ThreadedEventWorker {
private static Logger logger = LogUtil.getLogger();
private NioNetwork nio;
// Maps a responseId to a RspHandler
private Map<Long, ResponseEvent> rspEvents = new HashMap<>();
private Map<Long, ResponseHandler> rspEvents = new HashMap<>();
// Different services listening on specific messages
private Map<Class<?>, ThreadedEventWorker> services = new HashMap<>();
/**
* Creates a new SystemWorker
* Creates a new StandardWorker
*/
public SystemWorker(NioNetwork nio){
public StandardWorker(NioNetwork nio){
this.nio = nio;
}
@ -59,10 +62,10 @@ public class SystemWorker extends ThreadedEventWorker {
@Override
public void messageEvent(WorkerEventData event) {
try {
logger.finer("System Message: "+event.data.getClass().getName());
if(event.data instanceof Message){
if(event.data instanceof EchoMessage && ((EchoMessage)event.data).echo()){
// Echos back the received message
logger.finer("Message: "+event.data.getClass().getName());
if(event.data instanceof EchoMessage && !((EchoMessage)event.data).echo()){
// Echo back the received message
((EchoMessage)event.data).received();
logger.finer("Echoing Message: "+event.data);
nio.send(event.remoteAddress, event.data);
@ -71,7 +74,7 @@ public class SystemWorker extends ThreadedEventWorker {
rspEvents.get(((RequestResponseMessage)event.data).getResponseId()) != null){
long responseId = ((RequestResponseMessage)event.data).getResponseId();
// Look up the handler for this channel
ResponseEvent handler = rspEvents.get(responseId);
ResponseHandler handler = rspEvents.get(responseId);
// And pass the response to it
handler.handleResponse(event.data);
rspEvents.remove(responseId);
@ -83,7 +86,6 @@ public class SystemWorker extends ThreadedEventWorker {
services.get(event.data.getClass()).messageEvent(event);
}
}
}
} catch (Exception e) {
e.printStackTrace();
}
@ -109,10 +111,16 @@ public class SystemWorker extends ThreadedEventWorker {
}
/**
* Connects a ResponseHandler to a specific message object
* Send a message with a defined response handler
*
* @param address the target host for the message
* @param message the message object
* @param handler the handler that should be called when a response is received
*/
public void addResponseHandler(ResponseEvent handler, RequestResponseMessage data){
rspEvents.put(data.getResponseId(), handler);
}
public void send(SocketAddress address, RequestResponseMessage message, ResponseHandler handler) throws IOException {
// Register the response handler
rspEvents.put(message.getResponseId(), handler);
nio.send(address, Converter.toBytes(message));
}
}

5
src/zutil/net/nio/worker/Worker.java
View file

@ -32,7 +32,8 @@ import java.util.List;
public abstract class Worker {
private LinkedList<WorkerEventData> queue = new LinkedList<WorkerEventData>();
private LinkedList<WorkerEventData> queue = new LinkedList<>();
public void processData(NioNetwork server, SocketAddress remote, Object data) {
synchronized(queue) {
@ -50,7 +51,7 @@ public abstract class Worker {
}
/**
* Polls a event from the list or waits until there is a event
* Polls a event from the list or blocks until there is a event available
*
* @return the next event
*/

1
src/zutil/net/nio/worker/WorkerEventData.java
View file

@ -35,6 +35,7 @@ public class WorkerEventData {
public SocketAddress remoteAddress;
public Object data;
public WorkerEventData(NioNetwork server, SocketAddress remoteAddress, Object data) {
this.network = server;
this.remoteAddress = remoteAddress;

6
src/zutil/net/nio/message/ChatMessage.java → src/zutil/net/nio/worker/chat/ChatMessage.java Normal file → Executable file
View file

@ -22,9 +22,11 @@
* THE SOFTWARE.
*/
package zutil.net.nio.message;
package zutil.net.nio.worker.chat;
public class ChatMessage extends Message{
import zutil.net.nio.message.Message;
public class ChatMessage implements Message {
private static final long serialVersionUID = 1L;
public static enum ChatMessageType {REGISTER, UNREGISTER, MESSAGE};

4
src/zutil/net/nio/worker/chat/ChatService.java
View file

@ -25,14 +25,10 @@
package zutil.net.nio.worker.chat;
import zutil.log.LogUtil;
import zutil.net.nio.NioNetwork;
import zutil.net.nio.message.ChatMessage;
import zutil.net.nio.message.Message;
import zutil.net.nio.worker.ThreadedEventWorker;
import zutil.net.nio.worker.WorkerEventData;
import java.net.SocketAddress;
import java.nio.channels.SocketChannel;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.logging.Logger;

1
src/zutil/net/nio/worker/grid/GridClient.java
View file

@ -26,7 +26,6 @@ package zutil.net.nio.worker.grid;
import zutil.io.MultiPrintStream;
import zutil.net.nio.NioClient;
import zutil.net.nio.message.GridMessage;
import zutil.net.nio.worker.ThreadedEventWorker;
import zutil.net.nio.worker.WorkerEventData;

23
src/zutil/net/nio/message/GridMessage.java → src/zutil/net/nio/worker/grid/GridMessage.java Normal file → Executable file
View file

@ -22,9 +22,11 @@
* THE SOFTWARE.
*/
package zutil.net.nio.message;
package zutil.net.nio.worker.grid;
public class GridMessage<T> extends Message{
import zutil.net.nio.message.Message;
public class GridMessage<T> implements Message {
private static final long serialVersionUID = 1L;
// Client type messages
@ -49,14 +51,13 @@ public class GridMessage<T> extends Message{
private int type;
private int jobID;
private int jobId;
private T data;
/**
* Creates a new GridMessage
*
* @param type is the type of message
* @param jobID is the id of the job
*/
public GridMessage(int type){
this(type, 0, null);
@ -66,22 +67,22 @@ public class GridMessage<T> extends Message{
* Creates a new GridMessage
*
* @param type is the type of message
* @param jobID is the id of the job
* @param jobId is the id of the job
*/
public GridMessage(int type, int jobID){
this(type, jobID, null);
public GridMessage(int type, int jobId){
this(type, jobId, null);
}
/**
* Creates a new GridMessage
*
* @param type is the type of message
* @param jobID is the id of the job
* @param jobId is the id of the job
* @param data is the data to send with this message
*/
public GridMessage(int type, int jobID, T data){
public GridMessage(int type, int jobId, T data){
this.type = type;
this.jobID = jobID;
this.jobId = jobId;
this.data = data;
}
@ -96,7 +97,7 @@ public class GridMessage<T> extends Message{
* @return the job id for this message
*/
public int getJobQueueID(){
return jobID;
return jobId;
}
/**

1
src/zutil/net/nio/worker/grid/GridServerWorker.java
View file

@ -24,7 +24,6 @@
package zutil.net.nio.worker.grid;
import zutil.net.nio.message.GridMessage;
import zutil.net.nio.worker.ThreadedEventWorker;
import zutil.net.nio.worker.WorkerEventData;

2
src/zutil/net/nio/message/GraphicsSyncMessage.java → src/zutil/net/nio/worker/sync/GraphicsSyncMessage.java Normal file → Executable file
View file

@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
package zutil.net.nio.message;
package zutil.net.nio.worker.sync;
public class GraphicsSyncMessage extends SyncMessage{

2
src/zutil/net/nio/worker/sync/ObjectSync.java
View file

@ -24,8 +24,6 @@
package zutil.net.nio.worker.sync;
import zutil.net.nio.message.SyncMessage;
public abstract class ObjectSync {
public String id;

13
src/zutil/net/nio/message/SyncMessage.java → src/zutil/net/nio/worker/sync/SyncMessage.java
View file

@ -22,11 +22,18 @@
* THE SOFTWARE.
*/
package zutil.net.nio.message;
package zutil.net.nio.worker.sync;
public class SyncMessage extends Message implements SystemMessage{
import zutil.net.nio.message.Message;
public class SyncMessage implements Message {
private static final long serialVersionUID = 1L;
public static enum MessageType { REQUEST_ID, NEW, REMOVE, SYNC };
public enum MessageType {
REQUEST_ID,
NEW,
REMOVE,
SYNC
}
// type of message
public MessageType type;

4
src/zutil/net/nio/worker/sync/SyncService.java
View file

@ -25,13 +25,9 @@
package zutil.net.nio.worker.sync;
import zutil.log.LogUtil;
import zutil.net.nio.NioNetwork;
import zutil.net.nio.message.Message;
import zutil.net.nio.message.SyncMessage;
import zutil.net.nio.worker.ThreadedEventWorker;
import zutil.net.nio.worker.WorkerEventData;
import java.nio.channels.SocketChannel;
import java.util.HashMap;
import java.util.logging.Logger;

17
test/zutil/net/nio/NetworkClientTest.java
View file

@ -26,8 +26,9 @@ package zutil.net.nio;
import zutil.log.CompactLogFormatter;
import zutil.log.LogUtil;
import zutil.net.nio.message.StringResponseMessage;
import zutil.net.nio.response.PrintRsp;
import zutil.net.nio.response.StringResponseMessage;
import zutil.net.nio.response.PrintResponseHandler;
import zutil.net.nio.worker.StandardWorker;
import java.io.IOException;
import java.net.InetAddress;
@ -39,21 +40,27 @@ import java.util.logging.Level;
public class NetworkClientTest {
public static void main(String[] args) throws NoSuchAlgorithmException, InterruptedException {
try {
LogUtil.setGlobalLevel(Level.ALL);
//LogUtil.setGlobalLevel(Level.ALL);
LogUtil.setGlobalFormatter(new CompactLogFormatter());
int count = 0;
long time = System.currentTimeMillis()+1000*60;
NioClient client = new NioClient(InetAddress.getByName("localhost"), 6056);
StandardWorker worker = new StandardWorker(client);
client.setDefaultWorker(worker);
Thread.sleep(1000);
while(time > System.currentTimeMillis()){
PrintRsp handler = new PrintRsp();
client.send(handler, new StringResponseMessage("StringResponseMessage: "+count));
PrintResponseHandler handler = new PrintResponseHandler();
worker.send(client.getRemoteAddress(),
new StringResponseMessage("StringResponseMessage: "+count),
handler);
handler.waitForResponse();
//Thread.sleep(100);
//System.out.println("sending..");
count++;
}
client.close();
System.out.println("Message Count 1m: "+count);
System.out.println("Message Count 1s: "+count/60);

4
test/zutil/net/nio/NetworkServerTest.java
View file

@ -26,6 +26,7 @@ package zutil.net.nio;
import zutil.log.CompactLogFormatter;
import zutil.log.LogUtil;
import zutil.net.nio.worker.StandardWorker;
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
@ -36,10 +37,11 @@ import java.util.logging.Level;
public class NetworkServerTest {
public static void main(String[] args) throws NoSuchAlgorithmException, InterruptedException {
try {
LogUtil.setGlobalLevel(Level.ALL);
//LogUtil.setGlobalLevel(Level.ALL);
LogUtil.setGlobalFormatter(new CompactLogFormatter());
NioServer server = new NioServer(6056);
server.setDefaultWorker(new StandardWorker(server));
while(true){
Thread.sleep(1000);