[virtualcommons-svn] commit/irrigation: alllee: fixing log call
Status: Beta
Brought to you by:
alllee
Menu
▾
▴
[virtualcommons-svn] commit/irrigation: alllee: fixing log call
|
From: Bitbucket <com...@bi...> - 2012-03-28 06:23:51
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/4ea2f146b01c/ changeset: 4ea2f146b01c user: alllee date: 2012-03-28 08:23:21 summary: fixing log call affected #: 1 file diff -r f8790891fb256820aec54fd546c4790bef9bfac2 -r 4ea2f146b01c7d00a451884fdcdeabb43627836f src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java --- a/src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java +++ b/src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java @@ -52,486 +52,540 @@ * @author <a href='mailto:All...@as...'>Allen Lee</a> * @version $Revision$ */ -public class IrrigationServer extends AbstractExperiment<ServerConfiguration, RoundConfiguration> { +public class IrrigationServer extends + AbstractExperiment<ServerConfiguration, RoundConfiguration> { - private final Map<Identifier, ClientData> clients = new LinkedHashMap<Identifier, ClientData>(); + private final Map<Identifier, ClientData> clients = new LinkedHashMap<Identifier, ClientData>(); - private final static int SERVER_SLEEP_INTERVAL = 100; + private final static int SERVER_SLEEP_INTERVAL = 100; - private final Object roundSignal = new Object(); + private final Object roundSignal = new Object(); - private Duration currentRoundDuration; + private Duration currentRoundDuration; - private final ServerDataModel serverDataModel; + private final ServerDataModel serverDataModel; - private int submittedClients; + private int submittedClients; - private IrrigationPersister persister; + private IrrigationPersister persister; - private IrrigationServerStateMachine stateMachine = new IrrigationServerStateMachine(); + private IrrigationServerStateMachine stateMachine = new IrrigationServerStateMachine(); - public IrrigationServer() { - this(new ServerConfiguration()); - } + public IrrigationServer() { + this(new ServerConfiguration()); + } - // FIXME: add the ability to reconfigure an already instantiated server - public IrrigationServer(ServerConfiguration configuration) { - super(configuration); - serverDataModel = new ServerDataModel(); - serverDataModel.setEventChannel(getEventChannel()); - serverDataModel.setRoundConfiguration(configuration.getCurrentParameters()); - persister = new IrrigationPersister(getEventChannel(), configuration); - initializeFacilitatorHandlers(); - initializeClientHandlers(); - } + // FIXME: add the ability to reconfigure an already instantiated server + public IrrigationServer(ServerConfiguration configuration) { + super(configuration); + serverDataModel = new ServerDataModel(); + serverDataModel.setEventChannel(getEventChannel()); + serverDataModel.setRoundConfiguration(configuration + .getCurrentParameters()); + persister = new IrrigationPersister(getEventChannel(), configuration); + initializeFacilitatorHandlers(); + initializeClientHandlers(); + } - @SuppressWarnings("rawtypes") - private void initializeFacilitatorHandlers() { - addEventProcessor(new EventTypeProcessor<FacilitatorRegistrationRequest>(FacilitatorRegistrationRequest.class) { - @Override - public void handle(FacilitatorRegistrationRequest event) { - getLogger().info("facilitator registered: " + event.getId()); - // remap the facilitator ID and remove from the clients list. - setFacilitatorId(event.getId()); - synchronized (clients) { - clients.remove(getFacilitatorId()); - serverDataModel.removeClient(getFacilitatorId()); - } - } - }); - addEventProcessor(new EventTypeProcessor<BeginExperimentRequest>(BeginExperimentRequest.class) { - @Override - public void handle(BeginExperimentRequest event) { - // sends override and immediately starts the round. - synchronized (roundSignal) { - roundSignal.notifyAll(); - } - } - }); - addEventProcessor(new EventTypeProcessor<BeginRoundRequest>(BeginRoundRequest.class) { - @Override - public void handle(BeginRoundRequest event) { - if (! event.getId().equals(getFacilitatorId())) { - sendFacilitatorMessage( - String.format("facilitator is [%s] but received begin round request from non-facilitator [%s]", - getFacilitatorId(), event.getId())); - return; - } - // ignore the request if not every group has submit their tokens. - if (isTokenInvestmentComplete()) { - sendFacilitatorMessage("Starting actual round."); - synchronized (roundSignal) { - roundSignal.notifyAll(); - } - } - else { - sendFacilitatorMessage( - String.format("Cannot start round, %d of %d clients have submitted token investments", - submittedClients, clients.size())); - } - } - }); - addEventProcessor(new EventTypeProcessor<EndRoundRequest>(EndRoundRequest.class) { - @Override - public void handleInExperimentThread(EndRoundRequest request) { - currentRoundDuration.stop(); - } + @SuppressWarnings("rawtypes") + private void initializeFacilitatorHandlers() { + addEventProcessor(new EventTypeProcessor<FacilitatorRegistrationRequest>( + FacilitatorRegistrationRequest.class) { + @Override + public void handle(FacilitatorRegistrationRequest event) { + getLogger().info("facilitator registered: " + event.getId()); + // remap the facilitator ID and remove from the clients list. + setFacilitatorId(event.getId()); + synchronized (clients) { + clients.remove(getFacilitatorId()); + serverDataModel.removeClient(getFacilitatorId()); + } + } + }); + addEventProcessor(new EventTypeProcessor<BeginExperimentRequest>( + BeginExperimentRequest.class) { + @Override + public void handle(BeginExperimentRequest event) { + // sends override and immediately starts the round. + synchronized (roundSignal) { + roundSignal.notifyAll(); + } + } + }); + addEventProcessor(new EventTypeProcessor<BeginRoundRequest>( + BeginRoundRequest.class) { + @Override + public void handle(BeginRoundRequest event) { + if (!event.getId().equals(getFacilitatorId())) { + sendFacilitatorMessage(String + .format("facilitator is [%s] but received begin round request from non-facilitator [%s]", + getFacilitatorId(), event.getId())); + return; + } + // ignore the request if not every group has submit their + // tokens. + if (isTokenInvestmentComplete()) { + sendFacilitatorMessage("Starting actual round."); + synchronized (roundSignal) { + roundSignal.notifyAll(); + } + } else { + sendFacilitatorMessage(String + .format("Cannot start round, %d of %d clients have submitted token investments", + submittedClients, clients.size())); + } + } + }); + addEventProcessor(new EventTypeProcessor<EndRoundRequest>( + EndRoundRequest.class) { + @Override + public void handleInExperimentThread(EndRoundRequest request) { + currentRoundDuration.stop(); + } - }); - addEventProcessor(new EventTypeProcessor<BeginChatRoundRequest>(BeginChatRoundRequest.class) { - @Override - public void handle(BeginChatRoundRequest request) { - // XXX: the participants have already been added to the data model at this point - // so we shuffle them around right before the first practice round's chat. - if (getRoundConfiguration().isFirstRound()) { - shuffleParticipants(); - } - else { - persister.clearChatData(); - } - // pass it on to all the clients - synchronized (clients) { - for (Identifier id: clients.keySet()) { - transmit(new BeginChatRoundRequest(id, serverDataModel.getGroupDataModel(id))); - } - } - } - }); - addEventProcessor(new EventTypeProcessor<ShowRequest>(ShowRequest.class, true) { - @Override - public void handle(ShowRequest request) { - /* - if (stateMachine.state == IrrigationServerState.ROUND_IN_PROGRESS) { - sendFacilitatorMessage("Ignoring request: " + request + " - round is currently running"); - } - */ - if (request.getId().equals(getFacilitatorId())) { - synchronized (clients) { - for (Identifier id: clients.keySet()) { - transmit(request.clone(id)); - } - } - } - else { - sendFacilitatorMessage("Received invalid show request " + request + " from " + getFacilitatorId()); - } - } - }); - } + }); + addEventProcessor(new EventTypeProcessor<BeginChatRoundRequest>( + BeginChatRoundRequest.class) { + @Override + public void handle(BeginChatRoundRequest request) { + // XXX: the participants have already been added to the data + // model at this point + // so we shuffle them around right before the first practice + // round's chat. + if (getRoundConfiguration().isFirstRound()) { + shuffleParticipants(); + } else { + persister.clearChatData(); + } + // pass it on to all the clients + synchronized (clients) { + for (Identifier id : clients.keySet()) { + transmit(new BeginChatRoundRequest(id, + serverDataModel.getGroupDataModel(id))); + } + } + } + }); + addEventProcessor(new EventTypeProcessor<ShowRequest>( + ShowRequest.class, true) { + @Override + public void handle(ShowRequest request) { + /* + * if (stateMachine.state == + * IrrigationServerState.ROUND_IN_PROGRESS) { + * sendFacilitatorMessage("Ignoring request: " + request + + * " - round is currently running"); } + */ + if (request.getId().equals(getFacilitatorId())) { + synchronized (clients) { + for (Identifier id : clients.keySet()) { + transmit(request.clone(id)); + } + } + } else { + sendFacilitatorMessage("Received invalid show request " + + request + " from " + getFacilitatorId()); + } + } + }); + } - /** - * Registers client handling EventTypeProcessors. - * Each EventTypeProcessor encapsulates the handling of a specific kind of message event. - */ - private void initializeClientHandlers() { - addEventProcessor(new EventTypeProcessor<SocketIdentifierUpdateRequest>(SocketIdentifierUpdateRequest.class) { - @Override - public void handle(SocketIdentifierUpdateRequest request) { - SocketIdentifier socketId = request.getSocketIdentifier(); - ClientData clientData = clients.get(socketId); - if (clientData == null) { - sendFacilitatorMessage("No client data available for socket: " + socketId); - return; - } - SocketIdentifier clientSocketId = (SocketIdentifier) clientData.getId(); - clientSocketId.setStationNumber(request.getStationNumber()); - } - }); - addEventProcessor(new EventTypeProcessor<ConnectionEvent>(ConnectionEvent.class) { - @Override - public void handle(ConnectionEvent event) { - sendFacilitatorMessage("incoming connection: " + event); - // handle incoming connections - Identifier identifier = event.getId(); - ClientData clientData = new ClientData(identifier); - synchronized (clients) { - clients.put(identifier, clientData); - serverDataModel.addClient(clientData); - } - transmit(new RegistrationEvent(clientData, getRoundConfiguration())); - } - }); - addEventProcessor(new EventTypeProcessor<DisconnectionRequest>(DisconnectionRequest.class) { - @Override - public void handle(DisconnectionRequest request) { - sendFacilitatorMessage("irrigation server handling disconnection request: " + request); - Identifier disconnectedClientId = request.getId(); - if (disconnectedClientId.equals(getFacilitatorId())) { - getLogger().warning("Disconnecting facilitator."); - setFacilitatorId(null); - return; - } - synchronized (clients) { - clients.remove(disconnectedClientId); - serverDataModel.removeClient(disconnectedClientId); - } - } - }); - addEventProcessor(new EventTypeProcessor<ChatRequest>(ChatRequest.class) { - @Override - public void handle(ChatRequest request) { - Identifier source = request.getSource(); - Identifier target = request.getTarget(); - ClientData sendingClient = clients.get(source); - ArrayList<ClientData> allTargets = new ArrayList<ClientData>(); - if (Identifier.ALL.equals(target)) { - // relay to all clients in this client's group. - boolean restrictedVisibility = getRoundConfiguration().isRestrictedVisibility(); - for (ClientData clientData: clients.get(source).getGroupDataModel().getClientDataMap().values()) { - Identifier targetId = clientData.getId(); - if (targetId.equals(source) || (restrictedVisibility && ! sendingClient.isImmediateNeighbor(clientData))) { - // don't send the message if the target is the source or we're in a restricted visibility - // condition and the client isn't an immediate neighbor. - continue; - } - allTargets.add(clientData); - ChatEvent chatEvent = new ChatEvent(targetId, request.getMessage(), source, true); - transmit(chatEvent); - } - } - else { - allTargets.add(clients.get(target)); - ChatEvent chatEvent = new ChatEvent(target, request.getMessage(), source); - transmit(chatEvent); - } - sendFacilitatorMessage(String.format("%s->%s: %s", sendingClient, allTargets, request.toString())); - persister.store(request); - } - }); - addEventProcessor(new EventTypeProcessor<InvestedTokensEvent>(InvestedTokensEvent.class) { - @Override - public void handle(InvestedTokensEvent event) { - if (isTokenInvestmentComplete()) { - sendFacilitatorMessage("Trying to invest more tokens but token investment is already complete:" + event); - return; - } - clients.get(event.getId()).setInvestedTokens(event.getInvestedTokens()); - submittedClients++; - if (isTokenInvestmentComplete()) { - // everyone's submitted their tokens so we can calculate the available bandwidth and - // notify each client - initializeInfrastructureEfficiency(); - sendFacilitatorMessage("Token investment is complete, ready to start the round."); - } - } - }); - addEventProcessor(new EventTypeProcessor<QuizResponseEvent>(QuizResponseEvent.class) { - private volatile int numberOfCompletedQuizzes = 0; - @Override - public void handle(QuizResponseEvent quizResponseEvent) { - clients.get(quizResponseEvent.getId()).addCorrectQuizAnswers(quizResponseEvent.getNumberOfCorrectQuizAnswers()); - numberOfCompletedQuizzes++; - sendFacilitatorMessage(String.format("%d/%d quiz response: %s", numberOfCompletedQuizzes, clients.size(), quizResponseEvent)); - if (numberOfCompletedQuizzes >= clients.size()) { - sendFacilitatorMessage("All quizzes completed: " + numberOfCompletedQuizzes); - numberOfCompletedQuizzes = 0; - } - persister.store(quizResponseEvent); - } - }); - addEventProcessor(new EventTypeProcessor<OpenGateEvent>(OpenGateEvent.class) { - public void handle(OpenGateEvent event) { - clients.get(event.getId()).openGate(); - } - }); - addEventProcessor(new EventTypeProcessor<CloseGateEvent>(CloseGateEvent.class) { - public void handle(CloseGateEvent event) { - clients.get(event.getId()).closeGate(); - } - }); - } + /** + * Registers client handling EventTypeProcessors. Each EventTypeProcessor + * encapsulates the handling of a specific kind of message event. + */ + private void initializeClientHandlers() { + addEventProcessor(new EventTypeProcessor<SocketIdentifierUpdateRequest>( + SocketIdentifierUpdateRequest.class) { + @Override + public void handle(SocketIdentifierUpdateRequest request) { + SocketIdentifier socketId = request.getSocketIdentifier(); + ClientData clientData = clients.get(socketId); + if (clientData == null) { + sendFacilitatorMessage("No client data available for socket: " + + socketId); + return; + } + SocketIdentifier clientSocketId = (SocketIdentifier) clientData + .getId(); + clientSocketId.setStationNumber(request.getStationNumber()); + } + }); + addEventProcessor(new EventTypeProcessor<ConnectionEvent>( + ConnectionEvent.class) { + @Override + public void handle(ConnectionEvent event) { + sendFacilitatorMessage("incoming connection: " + event); + // handle incoming connections + Identifier identifier = event.getId(); + ClientData clientData = new ClientData(identifier); + synchronized (clients) { + clients.put(identifier, clientData); + serverDataModel.addClient(clientData); + } + transmit(new RegistrationEvent(clientData, + getRoundConfiguration())); + } + }); + addEventProcessor(new EventTypeProcessor<DisconnectionRequest>( + DisconnectionRequest.class) { + @Override + public void handle(DisconnectionRequest request) { + sendFacilitatorMessage("irrigation server handling disconnection request: " + + request); + Identifier disconnectedClientId = request.getId(); + if (disconnectedClientId.equals(getFacilitatorId())) { + getLogger().warning("Disconnecting facilitator."); + setFacilitatorId(null); + return; + } + synchronized (clients) { + clients.remove(disconnectedClientId); + serverDataModel.removeClient(disconnectedClientId); + } + } + }); + addEventProcessor(new EventTypeProcessor<ChatRequest>(ChatRequest.class) { + @Override + public void handle(ChatRequest request) { + Identifier source = request.getSource(); + Identifier target = request.getTarget(); + ClientData sendingClient = clients.get(source); + ArrayList<ClientData> allTargets = new ArrayList<ClientData>(); + if (Identifier.ALL.equals(target)) { + // relay to all clients in this client's group. + boolean restrictedVisibility = getRoundConfiguration() + .isRestrictedVisibility(); + for (ClientData clientData : clients.get(source) + .getGroupDataModel().getClientDataMap().values()) { + Identifier targetId = clientData.getId(); + if (targetId.equals(source) + || (restrictedVisibility && !sendingClient + .isImmediateNeighbor(clientData))) { + // don't send the message if the target is the + // source or we're in a restricted visibility + // condition and the client isn't an immediate + // neighbor. + continue; + } + allTargets.add(clientData); + ChatEvent chatEvent = new ChatEvent(targetId, + request.getMessage(), source, true); + transmit(chatEvent); + } + } else { + allTargets.add(clients.get(target)); + ChatEvent chatEvent = new ChatEvent(target, + request.getMessage(), source); + transmit(chatEvent); + } + sendFacilitatorMessage(String.format("%s->%s: %s", + sendingClient, allTargets, request.toString())); + persister.store(request); + } + }); + addEventProcessor(new EventTypeProcessor<InvestedTokensEvent>( + InvestedTokensEvent.class) { + @Override + public void handle(InvestedTokensEvent event) { + if (isTokenInvestmentComplete()) { + sendFacilitatorMessage("Trying to invest more tokens but token investment is already complete:" + + event); + return; + } + clients.get(event.getId()).setInvestedTokens( + event.getInvestedTokens()); + submittedClients++; + if (isTokenInvestmentComplete()) { + // everyone's submitted their tokens so we can calculate the + // available bandwidth and + // notify each client + initializeInfrastructureEfficiency(); + sendFacilitatorMessage("Token investment is complete, ready to start the round."); + } + } + }); + addEventProcessor(new EventTypeProcessor<QuizResponseEvent>( + QuizResponseEvent.class) { + private volatile int numberOfCompletedQuizzes = 0; - private boolean isTokenInvestmentComplete() { - return submittedClients >= clients.size(); - } + @Override + public void handle(QuizResponseEvent quizResponseEvent) { + clients.get(quizResponseEvent.getId()).addCorrectQuizAnswers( + quizResponseEvent.getNumberOfCorrectQuizAnswers()); + numberOfCompletedQuizzes++; + sendFacilitatorMessage(String.format("%d/%d quiz response: %s", + numberOfCompletedQuizzes, clients.size(), + quizResponseEvent)); + if (numberOfCompletedQuizzes >= clients.size()) { + sendFacilitatorMessage("All quizzes completed: " + + numberOfCompletedQuizzes); + numberOfCompletedQuizzes = 0; + } + persister.store(quizResponseEvent); + } + }); + addEventProcessor(new EventTypeProcessor<OpenGateEvent>( + OpenGateEvent.class) { + public void handle(OpenGateEvent event) { + clients.get(event.getId()).openGate(); + } + }); + addEventProcessor(new EventTypeProcessor<CloseGateEvent>( + CloseGateEvent.class) { + public void handle(CloseGateEvent event) { + clients.get(event.getId()).closeGate(); + } + }); + } - /** - * Invoked after every client has submit their tokens - * - */ - public void initializeInfrastructureEfficiency() { - // clients are added to the ServerDataModel as they register and then reallocated if necessary in - // post round cleanup - ///////////////////////////////////////////////////////////////////////////////// - for(GroupDataModel group : serverDataModel.getAllGroupDataModels()){ - group.initializeInfrastructure(); - // iterate through all groups and send back their contribution status - for (Identifier id : group.getClientDataMap().keySet()) { - InfrastructureUpdateEvent infrastructureUpdateEvent = new InfrastructureUpdateEvent(id, group); - transmit(infrastructureUpdateEvent); - } - } - } + private boolean isTokenInvestmentComplete() { + return submittedClients >= clients.size(); + } - private RoundConfiguration getRoundConfiguration() { - return getConfiguration().getCurrentParameters(); - } + /** + * Invoked after every client has submit their tokens + * + */ + public void initializeInfrastructureEfficiency() { + // clients are added to the ServerDataModel as they register and then + // reallocated if necessary in + // post round cleanup + // /////////////////////////////////////////////////////////////////////////////// + for (GroupDataModel group : serverDataModel.getAllGroupDataModels()) { + group.initializeInfrastructure(); + // iterate through all groups and send back their contribution + // status + for (Identifier id : group.getClientDataMap().keySet()) { + InfrastructureUpdateEvent infrastructureUpdateEvent = new InfrastructureUpdateEvent( + id, group); + transmit(infrastructureUpdateEvent); + } + } + } + private RoundConfiguration getRoundConfiguration() { + return getConfiguration().getCurrentParameters(); + } - /** - * Processes the given GroupDataModel and re-allocates water to each participant in the group - * based on each participants gate open/closed status. - * - * @param group - */ - private void process(GroupDataModel group) { - // reset group's available flow and re-allocate water to each participant in this group - group.resetCurrentlyAvailableFlowCapacity(); - int timeLeft = (int) (currentRoundDuration.getTimeLeft() / 1000); - // allocate flow to each participant - this works because GroupDataModel uses a LinkedHashMap that preserves - // iteration order (initial order of participants added to the group), otherwise we'd have to sort by priority - // string - for (ClientData clientData : group.getClientDataMap().values()) { - // for undisrupted flow extensions, disabled for the time being. -// if (clientData.getAvailableFlowCapacity() <= 0 && getConfiguration().isUndisruptedFlowRequired()){ -// clientData.init(group.getCurrentlyAvailableFlowCapacity()); -// } - group.allocateWater(clientData); - } - for (Identifier id: group.getAllClientIdentifiers()) { - ClientUpdateEvent clientUpdateEvent = new ClientUpdateEvent(id, group, timeLeft); - transmit(clientUpdateEvent); - } - } + /** + * Processes the given GroupDataModel and re-allocates water to each + * participant in the group based on each participants gate open/closed + * status. + * + * @param group + */ + private void process(GroupDataModel group) { + // reset group's available flow and re-allocate water to each + // participant in this group + group.resetCurrentlyAvailableFlowCapacity(); + int timeLeft = (int) (currentRoundDuration.getTimeLeft() / 1000); + // allocate flow to each participant - this works because GroupDataModel + // uses a LinkedHashMap that preserves + // iteration order (initial order of participants added to the group), + // otherwise we'd have to sort by priority + // string + for (ClientData clientData : group.getClientDataMap().values()) { + // for undisrupted flow extensions, disabled for the time being. + // if (clientData.getAvailableFlowCapacity() <= 0 && + // getConfiguration().isUndisruptedFlowRequired()){ + // clientData.init(group.getCurrentlyAvailableFlowCapacity()); + // } + group.allocateWater(clientData); + } + for (Identifier id : group.getAllClientIdentifiers()) { + ClientUpdateEvent clientUpdateEvent = new ClientUpdateEvent(id, + group, timeLeft); + transmit(clientUpdateEvent); + } + } - public static void main(String[] args) { - IrrigationServer server = new IrrigationServer(new ServerConfiguration()); - server.start(); - server.repl(); - } + public static void main(String[] args) { + IrrigationServer server = new IrrigationServer( + new ServerConfiguration()); + server.start(); + server.repl(); + } - private void shuffleParticipants() { - serverDataModel.clear(); - List<ClientData> clientDataList = new ArrayList<ClientData>(clients.values()); - // randomize the client data list - Collections.shuffle(clientDataList); - // re-add each the clients to the server data model - for (ClientData data: clientDataList) { - serverDataModel.addClient(data); - } - } - + private void shuffleParticipants() { + serverDataModel.clear(); + List<ClientData> clientDataList = new ArrayList<ClientData>( + clients.values()); + // randomize the client data list + Collections.shuffle(clientDataList); + // re-add each the clients to the server data model + for (ClientData data : clientDataList) { + serverDataModel.addClient(data); + } + } - enum IrrigationServerState { WAITING, ROUND_IN_PROGRESS }; + enum IrrigationServerState { + WAITING, ROUND_IN_PROGRESS + }; - private class IrrigationServerStateMachine implements StateMachine { + private class IrrigationServerStateMachine implements StateMachine { - private IrrigationServerState state; - -// private long lastTime; - - private Duration secondTick = Duration.create(1000L); + private IrrigationServerState state; - public void initialize() { - // FIXME: may want to change this as we add more states. - state = IrrigationServerState.WAITING; - persister.initialize(getRoundConfiguration()); - } + // private long lastTime; - private void initializeRound() { - // send RoundStartedEvents to all connected clients - for (Map.Entry<Identifier, ClientData> entry : clients.entrySet()) { - Identifier id = entry.getKey(); - ClientData data = entry.getValue(); - transmit(new RoundStartedEvent(id, data.getGroupDataModel())); - } - // start timers - currentRoundDuration = getRoundConfiguration().getRoundDuration(); - currentRoundDuration.start(); - state = IrrigationServerState.ROUND_IN_PROGRESS; - secondTick.start(); - persister.store(new RoundStartedMarkerEvent()); -// lastTime = System.currentTimeMillis(); - } + private Duration secondTick = Duration.create(1000L); - private void processRound() { -// if ((System.currentTimeMillis() - lastTime) / 1000 > 1) { - if (secondTick.hasExpired()) { - for (GroupDataModel group: serverDataModel.getAllGroupDataModels()) { - // reset available bandwidth for this group to calculate new allocations for the group - // perform bandwidth calculations - try{ - process(group); - } - catch (RuntimeException exception) { - sendFacilitatorMessage("Couldn't process group: " + exception.getMessage(), exception); - } - } -// lastTime = System.currentTimeMillis(); - secondTick.restart(); - } - } + public void initialize() { + // FIXME: may want to change this as we add more states. + state = IrrigationServerState.WAITING; + persister.initialize(getRoundConfiguration()); + } - private void stopRound() { - sendEndRoundEvents(); - persistRound(); - cleanupRound(); - advanceToNextRound(); - state = IrrigationServerState.WAITING; - } + private void initializeRound() { + // send RoundStartedEvents to all connected clients + for (Map.Entry<Identifier, ClientData> entry : clients.entrySet()) { + Identifier id = entry.getKey(); + ClientData data = entry.getValue(); + transmit(new RoundStartedEvent(id, data.getGroupDataModel())); + } + // start timers + currentRoundDuration = getRoundConfiguration().getRoundDuration(); + currentRoundDuration.start(); + state = IrrigationServerState.ROUND_IN_PROGRESS; + secondTick.start(); + persister.store(new RoundStartedMarkerEvent()); + // lastTime = System.currentTimeMillis(); + } - private void sendEndRoundEvents() { - // need to send instructions - //Send the end round event to the facilitator - //Send the end round event to all the clients - synchronized (clients) { - // add collected tokens to total if this isn't a practice round. - if (! getRoundConfiguration().isPracticeRound()) { - // first add tokens - for (ClientData data : clients.values()) { - data.addTokensEarnedThisRoundToTotal(); - } - } - for (ClientData data : clients.values()) { - transmit(new EndRoundEvent(data.getId(), - data.getGroupDataModel(), - getConfiguration().isLastRound())); - } - } - sendFacilitatorMessage("Round ended, ready to begin chat again"); - transmit(new FacilitatorEndRoundEvent(getFacilitatorId(), serverDataModel)); + private void processRound() { + // if ((System.currentTimeMillis() - lastTime) / 1000 > 1) { + if (secondTick.hasExpired()) { + for (GroupDataModel group : serverDataModel + .getAllGroupDataModels()) { + // reset available bandwidth for this group to calculate new + // allocations for the group + // perform bandwidth calculations + try { + process(group); + } catch (RuntimeException exception) { + sendFacilitatorMessage("Couldn't process group: " + + exception.getMessage(), exception); + } + } + // lastTime = System.currentTimeMillis(); + secondTick.restart(); + } + } - } + private void stopRound() { + sendEndRoundEvents(); + persistRound(); + cleanupRound(); + advanceToNextRound(); + state = IrrigationServerState.WAITING; + } - private void persistRound() { - logger.debug("Saving round data"); - persister.persist(serverDataModel); - } + private void sendEndRoundEvents() { + // need to send instructions + // Send the end round event to the facilitator + // Send the end round event to all the clients + synchronized (clients) { + // add collected tokens to total if this isn't a practice round. + if (!getRoundConfiguration().isPracticeRound()) { + // first add tokens + for (ClientData data : clients.values()) { + data.addTokensEarnedThisRoundToTotal(); + } + } + for (ClientData data : clients.values()) { + transmit(new EndRoundEvent(data.getId(), + data.getGroupDataModel(), + getConfiguration().isLastRound())); + } + } + sendFacilitatorMessage("Round ended, ready to begin chat again"); + transmit(new FacilitatorEndRoundEvent(getFacilitatorId(), + serverDataModel)); - private void cleanupRound() { - // reset client data values - synchronized (clients) { - for (ClientData clientData: clients.values()) { - clientData.resetEndRound(); - } - } - submittedClients = 0; - persister.clear(); - } - + } - private void advanceToNextRound() { - if (getConfiguration().isLastRound()) { - state = IrrigationServerState.WAITING; - return; - } - RoundConfiguration nextRoundConfiguration = getConfiguration().nextRound(); - serverDataModel.setRoundConfiguration(nextRoundConfiguration); - // set up the next round - synchronized (clients) { - if (nextRoundConfiguration.shouldRandomizeGroup()) { - shuffleParticipants(); + private void persistRound() { + getLogger().info("Saving round data"); + persister.persist(serverDataModel); + } - } - // send registration events to all participants. - for (ClientData data: clients.values()) { - transmit(new RegistrationEvent(data, nextRoundConfiguration)); - } - } - // send new round configuration to the facilitator - transmit(new RegistrationEvent(getFacilitatorId(), nextRoundConfiguration)); - persister.initialize(nextRoundConfiguration); - } + private void cleanupRound() { + // reset client data values + synchronized (clients) { + for (ClientData clientData : clients.values()) { + clientData.resetEndRound(); + } + } + submittedClients = 0; + persister.clear(); + } - public void execute(Dispatcher dispatcher) { - switch (state) { - case ROUND_IN_PROGRESS: - // process incoming information - synchronized (serverDataModel) { - if (currentRoundDuration.hasExpired()) { - // end round - stopRound(); - } - else { - processRound(); - } - } - Utils.sleep(SERVER_SLEEP_INTERVAL); - break; - case WAITING: - getLogger().info("Waiting for facilitator signal to start next round."); - Utils.waitOn(roundSignal); - initializeRound(); - break; - default: - throw new RuntimeException("Should never get here."); - } - } - } + private void advanceToNextRound() { + if (getConfiguration().isLastRound()) { + state = IrrigationServerState.WAITING; + return; + } + RoundConfiguration nextRoundConfiguration = getConfiguration() + .nextRound(); + serverDataModel.setRoundConfiguration(nextRoundConfiguration); + // set up the next round + synchronized (clients) { + if (nextRoundConfiguration.shouldRandomizeGroup()) { + shuffleParticipants(); - @Override - protected StateMachine getStateMachine() { - return stateMachine; - } - @Override - public void processReplInput(String input, BufferedReader reader) { - if ("clients".equals(input)) { - System.err.println("clients: " + clients); - } - } + } + // send registration events to all participants. + for (ClientData data : clients.values()) { + transmit(new RegistrationEvent(data, nextRoundConfiguration)); + } + } + // send new round configuration to the facilitator + transmit(new RegistrationEvent(getFacilitatorId(), + nextRoundConfiguration)); + persister.initialize(nextRoundConfiguration); + } - @Override - public IPersister<ServerConfiguration, RoundConfiguration> getPersister() { - return persister; - } + public void execute(Dispatcher dispatcher) { + switch (state) { + case ROUND_IN_PROGRESS: + // process incoming information + synchronized (serverDataModel) { + if (currentRoundDuration.hasExpired()) { + // end round + stopRound(); + } else { + processRound(); + } + } + Utils.sleep(SERVER_SLEEP_INTERVAL); + break; + case WAITING: + getLogger().info( + "Waiting for facilitator signal to start next round."); + Utils.waitOn(roundSignal); + initializeRound(); + break; + default: + throw new RuntimeException("Should never get here."); + } + } + } + + @Override + protected StateMachine getStateMachine() { + return stateMachine; + } + + @Override + public void processReplInput(String input, BufferedReader reader) { + if ("clients".equals(input)) { + System.err.println("clients: " + clients); + } + } + + @Override + public IPersister<ServerConfiguration, RoundConfiguration> getPersister() { + return persister; + } } Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
