Author: nbelaevski Date: 2010-10-26 21:02:34 -0400 (Tue, 26 Oct 2010) New Revision: 19677 Added: branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/push/impl/SessionQueue.java Modified: branches/RF-7817/push-redesign-app/src/main/webapp/chat.xhtml branches/RF-7817/push-redesign/src/main/java/org/richfaces/renderkit/PushRendererBase.java branches/RF-7817/push-redesign/src/main/resources/META-INF/resources/org.richfaces/push.js Log: https://jira.jboss.org/browse/RF-7817 Added: branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/push/impl/SessionQueue.java =================================================================== --- branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/push/impl/SessionQueue.java (rev 0) +++ branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/push/impl/SessionQueue.java 2010-10-27 01:02:34 UTC (rev 19677) @@ -0,0 +1,126 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.application.push.impl; + +import java.util.Comparator; +import java.util.PriorityQueue; +import java.util.Queue; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.ReentrantLock; + +import org.richfaces.application.push.Session; + +/** + * Based on DelayQueue by Doug Lea: http://gee.cs.oswego.edu/ + * @author Nick Belaevski + * + */ +//TODO - optimize algorithm +final class SessionQueue { + + private static final Comparator<? super Session> SESSIONS_COMPARATOR = new Comparator<Session>() { + + public int compare(Session o1, Session o2) { + Long delay1 = Long.valueOf(o1.getLastAccessedTime() + o1.getMaxInactiveInterval()); + Long delay2 = Long.valueOf(o2.getLastAccessedTime() + o2.getMaxInactiveInterval()); + + return delay1.compareTo(delay2); + } + + }; + + private final Queue<Session> queue = new PriorityQueue<Session>(1, SESSIONS_COMPARATOR); + + private final ReentrantLock lock = new ReentrantLock(); + + private final Condition available = lock.newCondition(); + + private long getDelay(Session session, TimeUnit unit) { + return unit.convert(session.getLastAccessedTime() + session.getMaxInactiveInterval() - System.currentTimeMillis(), + TimeUnit.MILLISECONDS); + } + + public Session take() throws InterruptedException { + final ReentrantLock lock = this.lock; + lock.lockInterruptibly(); + try { + while (true) { + Session first = queue.peek(); + if (first == null) { + available.await(); + } else { + long delay = getDelay(first, TimeUnit.NANOSECONDS); + if (delay > 0) { + available.awaitNanos(delay); + } else { + Session x = queue.poll(); + assert x != null; + if (queue.size() != 0) { + available.signalAll(); // wake up other takers + } + return x; + } + } + } + } finally { + lock.unlock(); + } + + } + + public void remove(Session session) { + final ReentrantLock lock = this.lock; + lock.lock(); + try { + queue.remove(session); + } finally { + lock.unlock(); + } + } + + public void requeue(Session session) { + final ReentrantLock lock = this.lock; + lock.lock(); + try { + queue.remove(session); + + Session first = queue.peek(); + queue.offer(session); + if (first == null || SESSIONS_COMPARATOR.compare(session, first) < 0) { + available.signalAll(); + } + } finally { + lock.unlock(); + } + } + + public void clear() { + final ReentrantLock lock = this.lock; + lock.lock(); + try { + queue.clear(); + } finally { + lock.unlock(); + } + } +} Modified: branches/RF-7817/push-redesign/src/main/java/org/richfaces/renderkit/PushRendererBase.java =================================================================== --- branches/RF-7817/push-redesign/src/main/java/org/richfaces/renderkit/PushRendererBase.java 2010-10-27 00:57:52 UTC (rev 19676) +++ branches/RF-7817/push-redesign/src/main/java/org/richfaces/renderkit/PushRendererBase.java 2010-10-27 01:02:34 UTC (rev 19677) @@ -67,7 +67,7 @@ options.put("address", push.getAddress()); options.put("dataHandler", push.getOndataavailable()); - options.put("errorHandler", push.getOndataavailable()); + options.put("errorHandler", push.getOnerror()); return ScriptUtils.toScript(options); } Modified: branches/RF-7817/push-redesign/src/main/resources/META-INF/resources/org.richfaces/push.js =================================================================== --- branches/RF-7817/push-redesign/src/main/resources/META-INF/resources/org.richfaces/push.js 2010-10-27 00:57:52 UTC (rev 19676) +++ branches/RF-7817/push-redesign/src/main/resources/META-INF/resources/org.richfaces/push.js 2010-10-27 01:02:34 UTC (rev 19677) @@ -71,7 +71,7 @@ for (var failedTopicKey in subscriptionData.failures) { richfaces.Event.fire( document, - getErrorEventNamespace(message.topic), + getErrorEventNamespace(failedTopicKey), subscriptionData.failures[failedTopicKey] ); } @@ -183,7 +183,7 @@ if (options.dataHandler) { //TODO check compatibility with f:ajax - this.__bindDataHandler(options.errorHandler); + this.__bindDataHandler(options.dataHandler); } if (options.errorHandler) { Modified: branches/RF-7817/push-redesign-app/src/main/webapp/chat.xhtml =================================================================== --- branches/RF-7817/push-redesign-app/src/main/webapp/chat.xhtml 2010-10-27 00:57:52 UTC (rev 19676) +++ branches/RF-7817/push-redesign-app/src/main/webapp/chat.xhtml 2010-10-27 01:02:34 UTC (rev 19677) @@ -53,7 +53,7 @@ </h:selectBooleanCheckbox> <h:panelGroup layout="block" rendered="#{channel.rendered}"> - <p:push address="#{channelName}@chat" onerror="alert(event.data)" ondataavailable="jQuery('&lt;div /&gt;').prependTo('.#{channelName}Output').text(data)" /> + <p:push address="#{channelName}@chat" onerror="alert(data)" ondataavailable="jQuery('&lt;div /&gt;').prependTo('.#{channelName}Output').text(data)" /> <h:inputText styleClass="messageInput" value="#{chatBean.message}" size="40" />