RemoteEditor/REPSessionManager: rep/SessionManager.java comparison

comparison rep/SessionManager.java @ 365:c432755c3555

distributed session debug continue... SELECT/SELECT_ACK loop

author	kono
date	Mon, 20 Oct 2008 17:00:42 +0900
parents	c965ef2b5fd6
children	e391433fa9f1

comparison

equal deleted inserted replaced

-:c965ef2b5fd6
+:c432755c3555
 	SessionXMLEncoder encoder = new SessionXMLEncoder();
 	// SocketChannel for our parent. At most one parent is allowed.
 	private Forwarder sm_join_channel;
 	// Routing table for session and session manager.
 	private RoutingTable routingTable = new RoutingTable();
+	private SessionManagerEvent execAfterConnect = null;;
 	public static void main(String[] args) throws InterruptedException, IOException {
 		int port = DEFAULT_PORT;
 		int port_s = DEFAULT_PORT;
 	void updateGUI() {
 		//リストのコピーをGUIに渡す
 		LinkedList<Session> sList = new LinkedList<Session>(sessionList.values());
-		LinkedList<Editor> eList = new LinkedList<Editor>(editorList.values());
+		LinkedList<Editor> eList;
+		if (false) {
+			// local editor only
+			eList = new LinkedList<Editor>();
+			for(Editor e:editorList.values()) {
+				if (getSMID(e.eid)==smList.sessionManagerID()) {
+					eList.add(e);
+				}
+			}
+		} else {
+			eList = new LinkedList<Editor>(editorList.values());
+		}
 		//GUIに反映
 		Runnable doRun = new DoGUIUpdate(sList, eList, gui);
 		gui.invokeLater(doRun);
 	}
 		InetSocketAddress addr = new InetSocketAddress(host, port);
 		try {
 			REPSocketChannel<REPCommand> sessionchannel = REPSocketChannel.<REPCommand>create(new REPCommandPacker());
 			sessionchannel.connect(addr);
 			while(!sessionchannel.finishConnect());
-			Forwarder sm = new Forwarder(this);
+			Forwarder sm = new FirstConnector(this);
 			registerChannel(sessionchannel, sm);
 			sm_join(sm);
 		}catch (IOException e) {
 		}
 	}
 	 *    manager.
 	 */
 	public void selectSession(SelectButtonEvent event) throws IOException {
 		int sid = event.getSID();
 		Session session = sessionList.get(sid);
+		if (session==null) throw new IOException();
 		Editor editor = (Editor)event.getEditor();
-		if(editor == null){
-			logger.writeLog("Error SessionManager.selectSession():　editor = " + editor);
-			return;
-		}
 		if (editor.hasSession()) return;
+		// assert(getSMID(editor.eid)==smList.sessionManagerID());
+		// assert(editor.channel!=null);
+		editor.setSID(sid); // mark as selected
 		selectSession(sid, session, editor.getEID(), editor);
 	}
 	/*
 	 * Select Session Protocol handler
 	 *    called from GUI or incoming SMCMD_SELECT command.
 	 */
 	private void selectSession(int sid, Session session, int eid, Forwarder editor) {
-		if(session.hasOwner()){
+		if(session.hasOwner() && editor.channel!=null){
 			// we have selected session.
 			REPCommand sendCommand = new REPCommand();
 			if (editor.isDirect()&&editor.getEID()==eid) {
 				// Found directly connected joined editor. Send join_ack().
 				session.addForwarder(editor);
 				sendUpdate(session.getSID());
 				sendCommand.setCMD(REP.SMCMD_JOIN_ACK);
+				return;
 			} else {
 				// We have a session, but joined editor is on the other sm.
 				// SELECT_ACK is sent to the session ring to
 				// find out the joined editor.
 				sendCommand.setCMD(REP.SMCMD_SELECT_ACK);
 			sendCommand.setEID(editor.getEID());
 			sendCommand.setSID(sid);
 			sendCommand.string = session.getName();
 			editor.send(sendCommand);
 		}else {
-			// session searching continue...
+			Forwarder next;
-			Forwarder next = routingTable.toSession(sid);
+			if (editor.channel==null) {
+				next = routingTable.toSessionManager(getSMID(eid));
-			// create dummy editor for this session
+			} else {
-			Forwarder f = new Editor(this, false, makeID(editorList.newEid()));
+				// session searching continue...
-			f.setChannel(editor.channel); // incoming channel
+				next = routingTable.toSession(sid);
-			f.setNext(next);
+				// create dummy editor for this session
-			f.setHost(myHost);
+				Forwarder f = new Editor(this, false, makeID(editorList.newEid()));
-			f.setSID(sid);
+				f.setChannel(editor.channel); // incoming channel
-			session.setFirstForwarder(f);
+				f.setNext(next);
+				f.setHost(myHost);
+				f.setSID(sid);
+				session.setFirstForwarder(f);
+			}
 			// pass the select command to the next path.
 			REPCommand command = new REPCommand();
 			command.setCMD(REP.SMCMD_SELECT);
 			command.setSID(sid);
 			command.setEID(eid);
 		case SMCMD_SELECT:
 		{
 			Session session = sessionList.get(command.sid);
 			if (session==null) {
-				sessionList.put(command.sid,
+				session = new Session(command.sid, command.string,null);
-						new Session(command.sid, command.string,null));
+				sessionList.put(command.sid,session);
 			}
 			selectSession(command.sid, session, command.eid, forwarder);
 		}
 			break;
 		case SMCMD_SELECT_ACK:
 	public Session getSession(int sid) {
 		return sessionList.get(sid);
 	}
+	public void execAfterConnect(SessionManagerEvent sessionManagerEvent) {
+		execAfterConnect  = sessionManagerEvent;
+	}
+	public void afterConnect() {
+		if (execAfterConnect!=null) execAfterConnect.exec(this);
+		execAfterConnect = null;
+	}
+	public void setParent(Forwarder fw) {
+		smList.setParent(fw);
+	}
 }

Mercurial > hg > RemoteEditor > REPSessionManager

comparison rep/SessionManager.java @ 365:c432755c3555