diff options
Diffstat (limited to 'java/JACE')
137 files changed, 0 insertions, 19034 deletions
diff --git a/java/JACE/ASX/IOCntlCmds.java b/java/JACE/ASX/IOCntlCmds.java deleted file mode 100644 index 3cc7c76256d..00000000000 --- a/java/JACE/ASX/IOCntlCmds.java +++ /dev/null @@ -1,38 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.ASX - * - * = FILENAME - * TaskFlags.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.ASX; - -/** - * Constants used for IOCTL messages. - * - *@see JACE.ASX.IOCntlMsg - */ -public abstract class IOCntlCmds -{ - /** Set the low water mark. */ - public static final int SET_LWM = 1; - - /** Get the low water mark. */ - public static final int GET_LWM = 2; - - /** Set the high water mark. */ - public static final int SET_HWM = 3; - - /** Get the high water mark. */ - public static final int GET_HWM = 4; - - /** Link modules */ - public static final int MOD_LINK = 5; - - /** Unlink modules */ - public static final int MOD_UNLINK = 6; -} diff --git a/java/JACE/ASX/IOCntlMsg.java b/java/JACE/ASX/IOCntlMsg.java deleted file mode 100644 index 4eea18b36f6..00000000000 --- a/java/JACE/ASX/IOCntlMsg.java +++ /dev/null @@ -1,124 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.ASX - * - * = FILENAME - * IOCntlMsg.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.ASX; - -import JACE.OS.*; - -/** - * Data format for IOCTL messages. - */ -public class IOCntlMsg -{ - - // = Initialization method. - - /* - * Initialize the control message. - *@param c IOCntlCmd for the control message. Note that this should - * be of type IOCntlCmds - */ - public IOCntlMsg (int c) - { - this.cmd_ = c; - } - - // = Get/set methods - - /* - * Get the command. - *@return the command. - */ - public int cmd () - { - return this.cmd_; - } - - /* - * Set the command. - *@param c the command. - */ - public void cmd (int c) - { - this.cmd_ = c; - } - - /* - * Get the count. - *@return the count. - */ - public int count () - { - return this.count_; - } - - /* - * Set the count. - *@param c the count. - */ - public void count (int c) - { - this.count_ = c; - } - - /* - * Get the error. - *@return the error. - */ - public int error () - { - return this.error_; - } - - /* - * Set the error. - *@param e the error. - */ - public void error (int e) - { - this.error_ = e; - } - - /* - * Get the return value. - *@return the return value. - */ - public int rval () - { - return this.rval_; - } - - /* - * Set the return value. - *@param r the return value. - */ - public void rval (int r) - { - this.rval_ = r; - } - - public String toString () - { - return (new Integer (this.cmd_)).toString (); - } - - private int cmd_; - // Command. - - private int count_; - // Count. - - private int error_; - // Error. - - private int rval_; - // Return value -} diff --git a/java/JACE/ASX/MessageBlock.java b/java/JACE/ASX/MessageBlock.java deleted file mode 100644 index 4035e34a7bd..00000000000 --- a/java/JACE/ASX/MessageBlock.java +++ /dev/null @@ -1,447 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.ASX - * - * = FILENAME - * MessageBlock.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.ASX; - -import JACE.OS.*; - -/** - * Object used to store messages in the ASX framework.<P> - * - * <tt>MessageBlock</tt> is modeled after the message data structures - * used in System V STREAMS. A <tt>MessageBlock</tt> is composed of - * one or more <tt>MessageBlock</tt>s that are linked together by - * <em>PREV</em> and <em>NEXT</em> pointers. In addition, a - * <tt>MessageBlock</tt> may also be linked to a chain of other - * <tt>MessageBlock</tt>s. This structure enables efficient manipulation - * of arbitrarily-large messages <em>without</em> incurring memory - * copying overhead. - * - *@see MessageQueue - */ -public class MessageBlock -{ - /** - * Create an empty Message Block - */ - public MessageBlock () - { - this (0); - } - - /** - * Create an empty Message Block. - * Note that this assumes that type of MessageBlock is MB_DATA. - *@param size size of the Message Block to create. - */ - public MessageBlock (int size) - { - // Note the explicit cast toString() is needed. For some strange - // reason, it fails otherwise if size == 0. - this ((new StringBuffer (size)).toString ()); - } - - /** - * Create a Message Block. Note that this assumes that type of - * MessageBlock is MB_DATA. - *@param data initial data to create a Message Block with. - */ - public MessageBlock (String data) - { - this (MessageType.MB_DATA, - null, - data); - } - - /** - * Create a Message Block. - *@param type type of the Message Block (must be one of those - * specified in class Message Type) - *@param cont next block of data - *@param data initial data to create Message Block with - */ - public MessageBlock (int type, - MessageBlock cont, - String data) - { - this.flags_ = 0; - this.priority_ = 0; - this.next_ = null; - this.prev_ = null; - - this.init (type, cont, data); - } - - /** - * Create a Message Block. Note that this assumes that type of - * MessageBlock is MB_OBJECT. - *@param obj initial object to create a Message Block with. - */ - public MessageBlock (Object obj) - { - this (MessageType.MB_OBJECT, - null, - obj); - } - - /** - * Create a Message Block. - *@param type type of the Message Block (must be one of those - * specified in class Message Type) - *@param cont next block of data - *@param obj initial object to create Message Block with - */ - public MessageBlock (int type, - MessageBlock cont, - Object obj) - { - this.init (type, cont, obj); - } - - /* Initialize the Message Block - *@param data data to initialize Message Block with - */ - public void init (String data) - { - this.base_ = new StringBuffer (data); - } - - /** - * Initialize a Message Block. - *@param type type of the Message Block (must be one of those - * specified in class Message Type) - *@param cont next block of data - *@param data data to initialize Message Block with - */ - public void init (int msgType, - MessageBlock msgCont, - String data) - { - if (data.length () == 0) - this.base_ = new StringBuffer (0); - else - this.base_ = new StringBuffer (data); - this.type_ = msgType; - this.cont_ = msgCont; - } - - /** - * Initialize a Message Block. Note that this assumes that type of - * MessageBlock is MB_OBJECT. - *@param obj initial object to initialize a Message Block with. - */ - public void init (Object obj) - { - this.init (MessageType.MB_OBJECT, null, obj); - } - - /** - * Initialize a Message Block. - *@param type type of the Message Block (must be one of those - * specified in class Message Type) - *@param cont next block of data - *@param obj object to initialize Message Block with - */ - public void init (int msgType, - MessageBlock msgCont, - Object obj) - { - this.obj_ = obj; - this.type_ = msgType; - this.cont_ = msgCont; - this.flags_ = 0; - this.priority_ = 0; - this.next_ = null; - this.prev_ = null; - } - - /** - * Set message flags. Note that the flags will be set on top of - * already set flags. - *@param moreFlags flags to set for the Message Block. - */ - public long setFlags (long moreFlags) - { - // Later we might mask more_flags so that user can't change - // internal ones: more_flags &= ~(USER_FLAGS -1). - this.flags_ = ACE.SET_BITS (this.flags_, moreFlags); - return this.flags_; - } - - /** - * Unset message flags. - *@param lessFlags flags to unset for the Message Block. - */ - public long clrFlags (long lessFlags) - { - // Later we might mask more_flags so that user can't change - // internal ones: less_flags &= ~(USER_FLAGS -1). - this.flags_ = ACE.CLR_BITS (this.flags_, lessFlags); - return this.flags_; - } - - /** - * Get the message flags. - *@return Message flags - */ - public long flags () - { - return this.flags_; - } - - /** - * Get the type of the message. - *@return message type - */ - public int msgType () - { - return this.type_; - } - - /** - * Set the type of the message. - *@param t type of the message - */ - public void msgType (int t) - { - this.type_ = t; - } - - /** - * Get the class of the message. Note there are two classes, - * <normal> messages and <high-priority> messages. - *@return message class - */ - public int msgClass () - { - return this.msgType () >= MessageType.MB_PRIORITY - ? MessageType.MB_PRIORITY : MessageType.MB_NORMAL; - } - - /** - * Find out if the message is a data message. - *@return true if message is a data message, false otherwise - */ - public boolean isDataMsg () - { - int mt = this.msgType (); - return mt == MessageType.MB_DATA - || mt == MessageType.MB_PROTO - || mt == MessageType.MB_PCPROTO; - } - - /** - * Find out if the message is an object message. - *@return true if message is an object message, false otherwise - */ - public boolean isObjMsg () - { - int mt = this.msgType (); - return mt == MessageType.MB_OBJECT - || mt == MessageType.MB_PROTO - || mt == MessageType.MB_PCPROTO; - } - - /** - * Get the priority of the message. - *@return message priority - */ - public long msgPriority () - { - return this.priority_; - } - - /** - * Set the priority of the message. - *@param pri priority of the message - */ - public void msgPriority (long pri) - { - this.priority_ = pri; - } - - /** - * Get message data. This assumes that msgType is MB_DATA. - *@return message data - */ - public String base () - { - // Create a String object to return - char temp[] = new char [this.base_.length ()]; - this.base_.getChars (0, this.base_.length (), temp, 0); - return new String (temp); - } - - /** - * Set the message data. This assumes that msgType is MB_DATA. - *@param data message data - *@param msgFlags message flags - */ - public void base (String data, - long msgFlags) - { - this.base_ = new StringBuffer (data); - this.flags_ = msgFlags; - } - - /** - * Get message object. This assumes that msgType is MB_OBJECT. - *@return message object - */ - public Object obj () - { - return this.obj_; - } - - /** - * Set the message object. This assumes that msgType is MB_OBJECT. - *@param object message object - *@param msgFlags message flags - */ - public void obj (Object obj, - long msgFlags) - { - this.obj_ = obj; - this.flags_ = msgFlags; - } - - // = The following four methods only make sense if the Message_Block - // is of type MB_DATA and not MB_OBJECT. - - /** - * Get length of the message. This method only makes sense if the - * MessageBlock is of type MB_DATA and not MB_OBJECT. - *@return length of the message. - */ - public int length () - { - return this.base_.length (); - } - - /** - * Set the length of the message. This method only makes sense if the - * MessageBlock is of type MB_DATA and not MB_OBJECT. - *@param n message length - */ - public void length (int n) - { - this.base_.setLength (n); - } - - /** - * Get size of the allocated buffer for the message. This method - * only makes sense if the MessageBlock is of type MB_DATA and not - * MB_OBJECT. - *@return size of the message buffer - */ - public int size () - { - return this.base_.capacity (); - } - - /** - * Set the total size of the buffer. This method will grow the - * buffer if need be. Also, this method only makes sense if the - * MessageBlock is of type MB_DATA and not MB_OBJECT. - *@param n size of message buffer - */ - public void size (int n) - { - this.base_.ensureCapacity (n); - } - - - /** - * Get the continuation field. The coninuation field is used to - * chain together composite messages. - *@return the continuation field - */ - public MessageBlock cont () - { - return this.cont_; - } - - /** - * Set the continuation field. The coninuation field is used to - * chain together composite messages. - *@param msgCont continuation field - */ - void cont (MessageBlock msgCont) - { - this.cont_ = msgCont; - } - - /** - * Get link to next message. The next message points to the - * <MessageBlock> directly ahead in the MessageQueue. - *@return next message block - */ - MessageBlock next () - { - return this.next_; - } - - /** - * Set link to next message. The next message points to the - * <MessageBlock> directly ahead in the MessageQueue. - *@param msgBlock next message block - */ - void next (MessageBlock msgBlock) - { - this.next_ = msgBlock; - } - - /** - * Get link to previous message. The previous message points to the - * <MessageBlock> directly before in the MessageQueue. - *@return previous message block - */ - MessageBlock prev () - { - return this.prev_; - } - - /** - * Set link to previous message. The previous message points to the - * <MessageBlock> directly before in the MessageQueue. - *@param msgBlock previous message block - */ - void prev (MessageBlock msgBlock) - { - this.prev_ = msgBlock; - } - - private int type_; - // Type of message. - - private long flags_; - // Misc flags. - - private long priority_; - // Priority of message. - - private StringBuffer base_; - // String data of message block (initialized to null). - - private Object obj_; - // Object data of message block (initialized to null). - - private MessageBlock cont_; - // Next message block in the chain. - - private MessageBlock next_; - // Next message in the list. - - private MessageBlock prev_; - // Previous message in the list. - -} - diff --git a/java/JACE/ASX/MessageQueue.java b/java/JACE/ASX/MessageQueue.java deleted file mode 100644 index df25870dd52..00000000000 --- a/java/JACE/ASX/MessageQueue.java +++ /dev/null @@ -1,633 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.ASX - * - * = FILENAME - * MessageQueue.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.ASX; - -import java.util.Date; -import JACE.OS.*; -import JACE.Reactor.*; - -class NotFullCondition extends TimedWait -{ - public NotFullCondition (MessageQueue mq) - { - super (mq); - this.mq_ = mq; - } - - public boolean condition () { - // Delegate to the appropriate conditional - // check on the MessageQueue. - return !this.mq_.isFull (); - } - private MessageQueue mq_; -} - -class NotEmptyCondition extends TimedWait -{ - public NotEmptyCondition (MessageQueue mq) - { - super (mq); - this.mq_ = mq; - } - - public boolean condition () { - // Delegate to the appropriate conditional - // check on the MessageQueue. - return !this.mq_.isEmpty (); - } - private MessageQueue mq_; -} - - -/** - * A thread-safe message queueing facility, modeled after the - * queueing facilities in System V StreamS. <P> - * - * <tt>MessageQueue</tt> is the central queueing facility for messages - * in the ASX framework. All operations are thread-safe, as it is intended - * to be used for inter-thread communication (<em>e.g.</em>, a producer and - * consumer thread joined by a <tt>MessageQueue</tt>). The queue - * consists of <tt>MessageBlock</tt>s. - *</blockquote> - * - *@see MessageBlock - *@see TimeValue - */ -public class MessageQueue -{ - /** - * Default constructor - */ - public MessageQueue () - { - this (DEFAULT_HWM, DEFAULT_LWM); - } - - /** - * Create a Message Queue with high and low water marks. - *@param hwm High water mark (max number of bytes allowed in the - * queue) - *@param lwm Low water mark (min number of bytes in the queue) - */ - public MessageQueue (int hwm, int lwm) - { - if (this.open (hwm, lwm) == -1) - ACE.ERROR ("open"); - } - - /** - * Initialize a Message Queue with high and low water marks. - *@param hwm High water mark (max number of bytes allowed in the - * queue) - *@param lwm Low water mark (min number of bytes in the queue) - */ - public synchronized int open (int hwm, int lwm) - { - this.highWaterMark_ = hwm; - this.lowWaterMark_ = lwm; - this.deactivated_ = false; - this.currentBytes_ = 0; - this.currentCount_ = 0; - this.tail_ = null; - this.head_ = null; - return 0; - } - - // ************ Note! *********** - // = For enqueue, enqueueHead, enqueueTail, and dequeueHead if - // timeout is specified, the caller will wait until the *absolute time* - // tv. Calls will return, however, when queue is closed, - // deactivated, or if it is past the time tv - - /** - * Enqueue a <MessageBlock> into the <MessageQueue> in accordance - * with its <msgPriority> (0 is lowest priority). Note that the - * call will block (unless the queue has been deactivated). - * - *@exception java.lang.InterruptedException Interrupted while accessing queue - *@param newItem item to enqueue onto the Message Queue - *@return -1 on failure, else the number of items still on the queue. - */ - public synchronized int enqueue (MessageBlock newItem) throws InterruptedException - { - return this.enqueue (newItem, null); - } - - /** - * Enqueue a <MessageBlock> into the <MessageQueue> in accordance - * with its <msgPriority> (0 is lowest priority). Note that the - * call will return if the queue has been deactivated or it is - * later than the specified absolute time value. - *@param newItem item to enqueue onto the Message Queue - *@param tv absolute TimeValue to timeout after - *@return -1 on failure, else the number of items still on the - * queue. - *@exception java.lang.InterruptedException Interrupted while accessing queue - */ - public synchronized int enqueue (MessageBlock newItem, - TimeValue tv) throws InterruptedException - { - int result = -1; - if (this.deactivated_) - return -1; - try - { - if (tv == null) // Need to do a blocking wait - notFullCondition_.timedWait (); - else // Need to do a timed wait - notFullCondition_.timedWait (tv); - } - catch (TimeoutException e) - { - return -1; - } - - // Check again if queue is still active - if (this.deactivated_) - return -1; - else - result = this.enqueueInternal (newItem); - - // Tell any blocked threads that the queue has a new item! - this.notEmptyCondition_.broadcast (); - return result; - } - - /** - * Enqueue a <MessageBlock> at the end of the <MessageQueue>. Note - * that the call will block (unless the queue has been deactivated). - *@param newItem item to enqueue onto the Message Queue - *@return -1 on failure, else the number of items still on the queue. - *@exception java.lang.InterruptedException Interrupted while accessing queue - */ - public synchronized int enqueueTail (MessageBlock newItem) throws InterruptedException - { - return this.enqueueTail (newItem, null); - } - - /** - * Enqueue a <MessageBlock> at the end of the <MessageQueue>. Note - * that the call will return when it's later than the given TimeValue or - * if the queue has been deactivated. - *@param newItem item to enqueue onto the Message Queue - *@param tv absolute TimeValue to wait until before returning (unless - * the operation compeltes before this time) - *@return -1 on failure, else the number of items still on the queue. - *@exception java.lang.InterruptedException Interrupted while accessing queue - */ - public synchronized int enqueueTail (MessageBlock newItem, - TimeValue tv) throws InterruptedException - { - int result = -1; - if (this.deactivated_) - return -1; - try - { - if (tv == null) // Need to do a blocking wait - notFullCondition_.timedWait (); - else // Need to do a timed wait - notFullCondition_.timedWait (tv); - } - catch (TimeoutException e) - { - return -1; - } - - // Check again if queue is still active - if (this.deactivated_) - return -1; - else - result = this.enqueueTailInternal (newItem); - - // Tell any blocked threads that the queue has a new item! - this.notEmptyCondition_.broadcast (); - return result; - } - - /** - * Enqueue a <MessageBlock> at the head of the <MessageQueue>. Note - * that the call will block (unless the queue has been deactivated). - *@param newItem item to enqueue onto the Message Queue - *@return -1 on failure, else the number of items still on the queue. - *@exception java.lang.InterruptedException Interrupted while accessing queue - */ - public synchronized int enqueueHead (MessageBlock newItem) throws InterruptedException - { - return this.enqueueHead (newItem, null); - } - - /** - * Enqueue a <MessageBlock> at the head of the <MessageQueue>. Note - * that the call will return when it's later than the given TimeValue or - * if the queue has been deactivated. - *@param newItem item to enqueue onto the Message Queue - *@param tv absolute TimeValue to wait until before returning (unless - * the operation completes before that time) - *@return -1 on failure, else the number of items still on the queue. - *@exception java.lang.InterruptedException Interrupted while accessing queue - */ - public synchronized int enqueueHead (MessageBlock newItem, - TimeValue tv) throws InterruptedException - { - int result = -1; - if (this.deactivated_) - return -1; - try - { - if (tv == null) // Need to do a blocking wait - notFullCondition_.timedWait (); - else // Need to do a timed wait - notFullCondition_.timedWait (tv); - } - catch (TimeoutException e) - { - return -1; - } - - // Check again if queue is still active - if (this.deactivated_) - return -1; - else - result = this.enqueueHeadInternal (newItem); - - // Tell any blocked threads that the queue has a new item! - this.notEmptyCondition_.broadcast (); - return result; - } - - /** - * Dequeue and return the <MessageBlock> at the head of the - * <MessageQueue>. Note that the call will block (unless the queue - * has been deactivated). - *@return null on failure, else the <MessageBlock> at the head of queue. - *@exception java.lang.InterruptedException Interrupted while accessing queue - */ - public synchronized MessageBlock dequeueHead () throws InterruptedException - { - return this.dequeueHead (null); - } - - /** - * Dequeue and return the <MessageBlock> at the head of the - * <MessageQueue>. Note that the call when return if the queue has - * been deactivated or when the current time is later than the given - * time value. - *@param tv absolute time timeout (blocks indefinitely if null) - *@return null on failure, else the <MessageBlock> at the head of queue. - *@exception InterruptedException Interrupted while accessing queue - */ - public synchronized MessageBlock dequeueHead (TimeValue tv) - throws InterruptedException - { - MessageBlock result = null; - if (this.deactivated_) - return null; - try - { - if (tv == null) // Need to do a blocking wait - notEmptyCondition_.timedWait (); - else // Need to do a timed wait - notEmptyCondition_.timedWait (tv); - } - catch (TimeoutException e) - { - return null; - } - - // Check again if queue is still active - if (this.deactivated_) - return null; - else - result = this.dequeueHeadInternal (); - - // Tell any blocked threads that the queue has room for an item! - this.notFullCondition_.broadcast (); - return result; - } - - /** - * Check if queue is full. - *@return true if queue is full, else false. - */ - public synchronized boolean isFull () - { - return this.isFullInternal (); - } - - /** - * Check if queue is empty. - *@return true if queue is empty, else false. - */ - public synchronized boolean isEmpty () - { - return this.isEmptyInternal (); - } - - /** - * Get total number of bytes on the queue. - *@return total number number of bytes on the queue - */ - public int messageBytes () - { - return this.currentBytes_; - } - - /** - * Get total number of messages on the queue. - *@return total number number of messages on the queue - */ - public int messageCount () - { - return this.currentCount_; - } - - // = Flow control routines - - /** - * Get high watermark. - *@return high watermark - */ - public int highWaterMark () - { - return this.highWaterMark_; - } - - /** - * Set high watermark. - *@param hwm high watermark - */ - public void highWaterMark (int hwm) - { - this.highWaterMark_ = hwm; - } - - /** - * Get low watermark. - *@return low watermark - */ - public int lowWaterMark () - { - return this.lowWaterMark_; - } - - /** - * Set low watermark. - *@param lwm low watermark - */ - public void lowWaterMark (int lwm) - { - this.lowWaterMark_ = lwm; - } - - // = Activation control methods. - - /** - * Deactivate the queue and wakeup all threads waiting on the queue - * so they can continue. No messages are removed from the queue, - * however. Any other operations called until the queue is - * activated again will immediately return -1. - *@return WAS_INACTIVE if queue was inactive before the call and - * WAS_ACTIVE if queue was active before the call. - */ - public synchronized int deactivate () - { - return this.deactivateInternal (); - } - - - /** - * Reactivate the queue so that threads can enqueue and dequeue - * messages again. - *@return WAS_INACTIVE if queue was inactive before the call and - * WAS_ACTIVE if queue was active before the call. - */ - public synchronized int activate () - { - return this.activateInternal (); - } - - protected boolean isEmptyInternal () - { - // Not sure about this one!!!! - return this.currentBytes_ <= this.lowWaterMark_ && this.currentCount_ <= 0; - } - - protected boolean isFullInternal () - { - return this.currentBytes_ > this.highWaterMark_; - } - - protected int deactivateInternal () - { - int currentStatus = - this.deactivated_ ? WAS_INACTIVE : WAS_ACTIVE; - - this.notFullCondition_.broadcast (); - this.notEmptyCondition_.broadcast (); - - this.deactivated_ = true; - return currentStatus; - } - - protected int activateInternal () - { - int currentStatus = - this.deactivated_ ? WAS_INACTIVE : WAS_ACTIVE; - this.deactivated_ = false; - - return currentStatus; - } - - protected int enqueueTailInternal (MessageBlock newItem) - { - if (newItem == null) - return -1; - - // List was empty, so build a new one. - if (this.tail_ == null) - { - this.head_ = newItem; - this.tail_ = newItem; - newItem.next (null); - newItem.prev (null); - } - // Link at the end. - else - { - newItem.next (null); - this.tail_.next (newItem); - newItem.prev (this.tail_); - this.tail_ = newItem; - } - - if (newItem.msgType() != MessageType.MB_OBJECT) - { - // Make sure to count *all* the bytes in a composite message!!! - for (MessageBlock temp = newItem; - temp != null; - temp = temp.cont ()) - this.currentBytes_ += temp.size (); - } - - this.currentCount_++; - return this.currentCount_; - } - - protected int enqueueHeadInternal (MessageBlock newItem) - { - if (newItem == null) - return -1; - - newItem.prev (null); - newItem.next (this.head_); - - if (this.head_ != null) - this.head_.prev (newItem); - else - this.tail_ = newItem; - - this.head_ = newItem; - - if (newItem.msgType() != MessageType.MB_OBJECT) - { - // Make sure to count *all* the bytes in a composite message!!! - for (MessageBlock temp = newItem; - temp != null; - temp = temp.cont ()) - this.currentBytes_ += temp.size (); - } - - this.currentCount_++; - - return this.currentCount_; - } - - protected int enqueueInternal (MessageBlock newItem) - { - if (newItem == null) - return -1; - - if (this.head_ == null) - // Check for simple case of an empty queue, where all we need to - // do is insert <newItem> into the head. - return this.enqueueHeadInternal (newItem); - else - { - MessageBlock temp; - - // Figure out where the new item goes relative to its priority. - - for (temp = this.head_; - temp != null; - temp = temp.next ()) - { - if (temp.msgPriority () <= newItem.msgPriority ()) - // Break out when we've located an item that has lower - // priority that <newItem>. - break; - } - - if (temp == null) - // Check for simple case of inserting at the end of the queue, - // where all we need to do is insert <newItem> after the - // current tail. - return this.enqueueTailInternal (newItem); - else if (temp.prev () == null) - // Check for simple case of inserting at the beginning of the - // queue, where all we need to do is insert <newItem> before - // the current head. - return this.enqueueHeadInternal (newItem); - else - { - // Insert the message right before the item of equal or lower - // priority. - newItem.next (temp); - newItem.prev (temp.prev ()); - temp.prev ().next (newItem); - temp.prev (newItem); - } - } - - if (newItem.msgType() != MessageType.MB_OBJECT) - { - // Make sure to count *all* the bytes in a composite message!!! - for (MessageBlock temp = newItem; - temp != null; - temp = temp.cont ()) - this.currentBytes_ += temp.size (); - } - - this.currentCount_++; - return this.currentCount_; - } - - protected MessageBlock dequeueHeadInternal () - { - MessageBlock firstItem = this.head_; - this.head_ = this.head_.next (); - - if (this.head_ == null) - this.tail_ = null; - - if (firstItem.msgType() != MessageType.MB_OBJECT) - { - // Make sure to subtract off all of the bytes associated with this - // message. - for (MessageBlock temp = firstItem; - temp != null; - temp = temp.cont ()) - this.currentBytes_ -= temp.size (); - } - - this.currentCount_--; - return firstItem; - } - - - /** Default high watermark (16 K). */ - public final static int DEFAULT_HWM = 16 * 1024; - - /** Default low watermark. */ - public final static int DEFAULT_LWM = 0; - - /** Message queue was active before activate() or deactivate(). */ - public final static int WAS_ACTIVE = 1; - - /** Message queue was inactive before activate() or deactivate(). */ - public final static int WAS_INACTIVE = 2; - - private int highWaterMark_; - // Greatest number of bytes before blocking. - - private int lowWaterMark_; - // Lowest number of bytes before unblocking occurs. - - private boolean deactivated_; - // Indicates that the queue is inactive. - - private int currentBytes_; - // Current number of bytes in the queue. - - private int currentCount_; - // Current number of messages in the queue. - - private MessageBlock head_; - // Head of Message_Block list. - - private MessageBlock tail_; - // Tail of Message_Block list. - - // The Delegated Notification mechanisms. - private NotFullCondition notFullCondition_ = new NotFullCondition (this); - private NotEmptyCondition notEmptyCondition_ = new NotEmptyCondition (this); - -} diff --git a/java/JACE/ASX/MessageType.java b/java/JACE/ASX/MessageType.java deleted file mode 100644 index 97e33a6c6ba..00000000000 --- a/java/JACE/ASX/MessageType.java +++ /dev/null @@ -1,102 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.ASX - * - * = FILENAME - * MessageType.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.ASX; - -/** - * Message types used by MessageBlock. <P> - * - * Defines bit masks used to identify various types of messages.<P> - * - * This class is not intended to be instantiable. - * - *@see MessageBlock - */ -public class MessageType -{ - // = Data and protocol messages (regular and priority) - /** regular data */ - public static final int MB_DATA = 0x01; - - /** protocol control */ - public static final int MB_PROTO = 0x02; - - /** regular data */ - public static final int MB_OBJECT = 0x09; - - - // = Control messages (regular and priority) - /** line break */ - public static final int MB_BREAK = 0x03; - - /** pass file pointer */ - public static final int MB_PASSFP = 0x04; - - /** post an event to an event queue */ - public static final int MB_EVENT = 0x05; - - /** generate process signal */ - public static final int MB_SIG = 0x06; - - /** ioctl; set/get params */ - public static final int MB_IOCTL = 0x07; - - /** set various stream head options */ - public static final int MB_SETOPTS = 0x08; - - - // = Control messages (high priority; go to head of queue) - /** acknowledge ioctl */ - public static final int MB_IOCACK = 0x81; - - /** negative ioctl acknowledge */ - public static final int MB_IOCNAK = 0x82; - - /** priority proto message */ - public static final int MB_PCPROTO = 0x83; - - /** generate process signal */ - public static final int MB_PCSIG = 0x84; - - /** generate read notification */ - public static final int MB_READ = 0x85; - - /** flush your queues */ - public static final int MB_FLUSH = 0x86; - - /** stop transmission immediately */ - public static final int MB_STOP = 0x87; - - /** restart transmission after stop */ - public static final int MB_START = 0x88; - - /** line disconnect */ - public static final int MB_HANGUP = 0x89; - - /** fatal error used to set u.u_error */ - public static final int MB_ERROR = 0x8a; - - /** post an event to an event queue */ - public static final int MB_PCEVENT = 0x8b; - - - /** Normal priority messages */ - public static final int MB_NORMAL = 0x00; - - /** High priority control messages */ - public static final int MB_PRIORITY = 0x80; - - // Default private constructor to avoid instantiation - private MessageType () - { - } -} - diff --git a/java/JACE/ASX/Module.java b/java/JACE/ASX/Module.java deleted file mode 100644 index 2b80cd690c9..00000000000 --- a/java/JACE/ASX/Module.java +++ /dev/null @@ -1,246 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.ASX - * - * = FILENAME - * Module.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.ASX; - -import JACE.OS.*; - -/** - * Provides an abstraction for managing a bi-directional flow of - * messages. <P> - * - * This is based on the Module concept in System V Streams, - * which contains a pair of Tasks, one for handling upstream - * processing, one for handling downstream processing. - */ -public class Module -{ - // = Initialization and termination methods. - - /** - * Create an empty Module. - */ - public Module () - { - // Do nothing... - this.name ("<unknown>"); - } - - /* - * Create an initialized module. - *@param modName identity of the module. - *@param writerQ writer task of the module. - *@param readerQ reader task of the module. - *@param flags Module flags - */ - public Module (String modName, - Task writerQ, - Task readerQ, - Object flags) - { - this.open (modName, writerQ, readerQ, flags); - } - - /* - * Create an initialized module. - *@param modName identity of the module. - *@param writerQ writer task of the module. - *@param readerQ reader task of the module. - *@param flags Module flags - */ - public void open (String modName, - Task writerQ, - Task readerQ, - Object arg) - { - this.name (modName); - this.arg_ = arg; - - if (writerQ == null) - writerQ = new ThruTask (); - if (readerQ == null) - readerQ = new ThruTask (); - - this.reader (readerQ); - this.writer (writerQ); - - // Setup back pointers. - readerQ.module (this); - writerQ.module (this); - } - - - /* - * Set the writer task. - *@param q the writer task - */ - public void writer (Task q) - { - this.qPair_[1] = q; - if (q != null) - q.flags (ACE.CLR_BITS (q.flags (), TaskFlags.ACE_READER)); - } - - /* - * Set the reader task. - *@param q the reader task - */ - public void reader (Task q) - { - this.qPair_[0] = q; - if (q != null) - q.flags (ACE.SET_BITS (q.flags (), TaskFlags.ACE_READER)); - } - - /* - * Link this Module on top of Module. - *@param m the module to link this on top of. - */ - public void link (Module m) - { - this.next (m); - this.writer ().next (m.writer ()); - m.reader ().next (this.reader ()); - } - - /* - * Set and get pointer to sibling Task in Module. - *@param orig the task to get the sibling for - *@return the sibling of the task - */ - public Task sibling (Task orig) - { - if (this.qPair_[0] == orig) - return this.qPair_[1]; - else if (this.qPair_[1] == orig) - return this.qPair_[0]; - else - return null; - } - - /* - * Close down the module and its tasks. - *@param flags Module flags - *@return 0 on success, -1 on failure - */ - public int close (long flags) - { - Task readerQ = this.reader (); - Task writerQ = this.writer (); - int result = 0; - - if (readerQ != null) - { - if (readerQ.close (flags) == -1) - result = -1; - readerQ.flush (flags); - readerQ.next (null); - } - - if (writerQ != null) - { - if (writerQ.close (flags) == -1) - result = -1; - writerQ.flush (flags); - writerQ.next (null); - } - - return result; - } - - /* - * Get the argument passed to tasks. - *@return the argument passed to tasks. - */ - public Object arg () - { - return this.arg_; - } - - /* - * Set the argument to be passed to tasks. - *@param a the argument to be passed to tasks. - */ - public void arg (Object a) - { - this.arg_ = a; - } - - /* - * Get the name of the module. - *@return the name of the module. - */ - public String name () - { - return this.name_; - } - - /* - * Set the name of the module. - *@param n the name of the module. - */ - public void name (String n) - { - this.name_ = n; - } - - /* - * Get the writer task of the module. - *@return the writer task of the module. - */ - public Task writer () - { - return this.qPair_[1]; - } - - /* - * Get the reader task of the module. - *@return the reader task of the module. - */ - public Task reader () - { - return this.qPair_[0]; - } - - /* - * Get the next pointer to the module above in the stream. - *@return the next pointer to the module above in the stream. - */ - public Module next () - { - return this.next_; - } - - /* - * Set the next pointer to the module above in the stream. - *@param m the next pointer to the module above in the stream. - */ - public void next (Module m) - { - this.next_ = m; - } - - private Task qPair_[] = new Task[2]; - // Pair of Tasks that form the "read-side" and "write-side" of the - // ACE_Module partitioning. - - private String name_ = null; - // Name of the ACE_Module. - - private Module next_; - // Next ACE_Module in the stack. - - private Object arg_; - // Argument passed through to the reader and writer task when they - // are opened. - -} - diff --git a/java/JACE/ASX/Stream.java b/java/JACE/ASX/Stream.java deleted file mode 100644 index 6a968714ab7..00000000000 --- a/java/JACE/ASX/Stream.java +++ /dev/null @@ -1,436 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.ASX - * - * = FILENAME - * Stream.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.ASX; - -import JACE.OS.*; - -/** - * This class is the primary abstraction for the ASX framework. - * It is moduled after System V Stream. <P> - * - * A Stream consists of a stack of Modules, each of which - * contains two Tasks. - * - *@see Module - *@see Task - */ - -public class Stream -{ - - public Stream () - { - this (null, null, null); - } - - // Create a Stream consisting of <head> and <tail> as the Stream - // head and Stream tail, respectively. If these are 0 then the - // <ACE_Stream_Head> and <ACE_Stream_Tail> are used, respectively. - // <arg> is the value past in to the open() methods of the tasks. - - public Stream (Object a, - Module head, - Module tail) - { - this.linkedUs_ = null; - // this.final_close_ = this.lock_; - - if (this.open (a, head, tail) == -1) - ACE.ERROR ("open" + head.name () + " " + tail.name ()); - } - - public int push (Module newTop) - { - if (this.pushModule (newTop, - this.streamHead_.next (), - this.streamHead_) == -1) - return -1; - else - return 0; - } - - // Note that the timeout tv is absolute time - public int put (MessageBlock mb, TimeValue tv) - { - return this.streamHead_.writer ().put (mb, tv); - } - - // Note that the timeout tv is absolute time - public MessageBlock get (TimeValue tv) throws InterruptedException - { - return this.streamHead_.reader ().getq (tv); - } - -// Return the "top" ACE_Module in a ACE_Stream, skipping over the -// stream_head. - - public Module top () - { - if (this.streamHead_.next () == this.streamTail_) - return null; - else - return this.streamHead_.next (); - } - -// Remove the "top" ACE_Module in a ACE_Stream, skipping over the -// stream_head. - - public int pop (long flags) - { - if (this.streamHead_.next () == this.streamTail_) - return -1; - else - { - // Skip over the ACE_Stream head. - Module top = this.streamHead_.next (); - Module newTop = top.next (); - - this.streamHead_.next (newTop); - - // Close the top ACE_Module. - - top.close (flags); - - this.streamHead_.writer ().next (newTop.writer ()); - newTop.reader ().next (this.streamHead_.reader ()); - - return 0; - } - } - -// Remove a named ACE_Module from an arbitrary place in the -// ACE_Stream. - - public int remove (String name, long flags) - { - Module prev = null; - - for (Module mod = this.streamHead_; - mod != null; mod = mod.next ()) - if (name.compareTo (mod.name ()) == 0) - { - if (prev == null) // Deleting ACE_Stream Head - this.streamHead_.link (mod.next ()); - else - prev.link (mod.next ()); - - mod.close (flags); - return 0; - } - else - prev = mod; - - return -1; - } - - public Module find (String name) - { - for (Module mod = this.streamHead_; - mod != null; - mod = mod.next ()) - if (name.compareTo (mod.name ()) == 0) - return mod; - - return null; - } - -// Actually push a module onto the stack... - - private int pushModule (Module newTop, - Module currentTop, - Module head) - { - Task ntReader = newTop.reader (); - Task ntWriter = newTop.writer (); - Task ctReader = null; - Task ctWriter = null; - - if (currentTop != null) - { - ctReader = currentTop.reader (); - ctWriter = currentTop.writer (); - ctReader.next (ntReader); - } - - ntWriter.next (ctWriter); - - if (head != null) - { - if (head != newTop) - head.link (newTop); - } - else - ntReader.next (null); - - newTop.next (currentTop); - - if (ntReader.open (newTop.arg ()) == -1) - return -1; - - if (ntWriter.open (newTop.arg ()) == -1) - return -1; - return 0; - } - - public synchronized int open (Object a, - Module head, - Module tail) - { - Task h1 = null, h2 = null; - Task t1 = null, t2 = null; - - if (head == null) - { - h1 = new StreamHead (); - h2 = new StreamHead (); - head = new Module ("ACEStreamHead", h1, h2, a); - } - - if (tail == null) - { - t1 = new StreamTail (); - t2 = new StreamTail (); - tail = new Module ("ACEStreamTail", - t1, t2, a); - } - - // Make sure *all* the allocation succeeded! - if (h1 == null || h2 == null || head == null - || t1 == null || t2 == null || tail == null) - { - // Close up! - head.close (0); - tail.close (0); - return -1; - } - - this.streamHead_ = head; - this.streamTail_ = tail; - - if (this.pushModule (this.streamTail_, - null, null) == -1) - return -1; - else if (this.pushModule (this.streamHead_, - this.streamTail_, - this.streamHead_) == -1) - return -1; - else - return 0; - } - - public synchronized int close (long flags) - { - if (this.streamHead_ != null - && this.streamTail_ != null) - { - // Don't bother checking return value here. - this.unlinkInternal (); - - int result = 0; - - // Remove and cleanup all the intermediate modules. - - while (this.streamHead_.next () != this.streamTail_) - { - if (this.pop (flags) == -1) - result = -1; - } - - // Clean up the head and tail of the stream. - if (this.streamHead_.close (flags) == -1) - result = -1; - if (this.streamTail_.close (flags) == -1) - result = -1; - - this.streamHead_ = null; - this.streamTail_ = null; - - // Tell all threads waiting on the close that we are done. - // this.final_close_.broadcast (); - return result; - } - return 0; - } - - public int control (int cmd, Object a) throws InterruptedException - { - IOCntlMsg ioc = new IOCntlMsg (cmd); - - // Create a data block that contains the user-supplied data. - MessageBlock db = - new MessageBlock (MessageType.MB_IOCTL, - null, - a); - - // Create a control block that contains the control field and a - // pointer to the data block. - MessageBlock cb = - new MessageBlock (MessageType.MB_IOCTL, - db, - (Object) ioc); - - int result = 0; - - if (this.streamHead_.writer ().put (cb, null) == -1) - result = -1; - else if ((cb = this.streamHead_.reader ().getq (null)) == null) - result = -1; - else - result = ((IOCntlMsg ) cb.obj ()).rval (); - - return result; - } - -// Link two streams together at their bottom-most Modules (i.e., the -// one just above the Stream tail). Note that all of this is premised -// on the fact that the Stream head and Stream tail are non-NULL... -// This must be called with locks held. - - private int linkInternal (Stream us) - { - this.linkedUs_ = us; - // Make sure the other side is also linked to us! - us.linkedUs_ = this; - - Module myTail = this.streamHead_; - - if (myTail == null) - return -1; - - // Locate the module just above our Stream tail. - while (myTail.next () != this.streamTail_) - myTail = myTail.next (); - - Module otherTail = us.streamHead_; - - if (otherTail == null) - return -1; - - // Locate the module just above the other Stream's tail. - while (otherTail.next () != us.streamTail_) - otherTail = otherTail.next (); - - // Reattach the pointers so that the two streams are linked! - myTail.writer ().next (otherTail.reader ()); - otherTail.writer ().next (myTail.reader ()); - return 0; - } - - public synchronized int link (Stream us) - { - return this.linkInternal (us); - } - -// Must be called with locks held... - - private int unlinkInternal () - { - // Only try to unlink if we are in fact still linked! - - if (this.linkedUs_ != null) - { - Module myTail = this.streamHead_; - - // Only relink if we still exist! - if (myTail != null) - { - // Find the module that's just before our stream tail. - while (myTail.next () != this.streamTail_) - myTail = myTail.next (); - - // Restore the writer's next() link to our tail. - myTail.writer ().next (this.streamTail_.writer ()); - } - - Module otherTail = this.linkedUs_.streamHead_; - - // Only fiddle with the other side if it in fact still remains. - if (otherTail != null) - { - while (otherTail.next () != this.linkedUs_.streamTail_) - otherTail = otherTail.next (); - - otherTail.writer ().next (this.linkedUs_.streamTail_.writer ()); - - } - - // Make sure the other side is also aware that it's been unlinked! - this.linkedUs_.linkedUs_ = null; - - this.linkedUs_ = null; - return 0; - } - else - return -1; - } - - public synchronized int unlink () - { - return this.unlinkInternal (); - } - - public void dump () - { - ACE.DEBUG ("-------- module links --------"); - - for (Module mp = this.streamHead_; ; mp = mp.next ()) - { - ACE.DEBUG ("module name = " + mp.name ()); - if (mp == this.streamTail_) - break; - } - - ACE.DEBUG ("-------- writer links --------"); - - Task tp; - - for (tp = this.streamHead_.writer (); ; tp = tp.next ()) - { - ACE.DEBUG ("writer queue name = " + tp.name ()); - tp.dump (); - ACE.DEBUG ("-------\n"); - if (tp == this.streamTail_.writer () - || (this.linkedUs_ != null && tp == this.linkedUs_.streamHead_.reader ())) - break; - } - - ACE.DEBUG ("-------- reader links --------\n"); - for (tp = this.streamTail_.reader (); ; tp = tp.next ()) - { - ACE.DEBUG ("reader queue name = " + tp.name ()); - tp.dump (); - ACE.DEBUG ("-------\n"); - if (tp == this.streamHead_.reader () - || (this.linkedUs_ != null && tp == this.linkedUs_.streamHead_.writer ())) - break; - } - } - - Module streamHead_ = null; - // Pointer to the head of the stream. - - Module streamTail_ = null; - // Pointer to the tail of the stream. - - Stream linkedUs_ = null; - // Pointer to an adjoining linked stream. - - // = Synchronization objects used for thread-safe streams. - // ACE_SYNCH_MUTEX lock_; - // Protect the stream against race conditions. - - // ACE_SYNCH_CONDITION final_close_; - // Use to tell all threads waiting on the close that we are done. - -} - - diff --git a/java/JACE/ASX/StreamHead.java b/java/JACE/ASX/StreamHead.java deleted file mode 100644 index 1492b43a297..00000000000 --- a/java/JACE/ASX/StreamHead.java +++ /dev/null @@ -1,123 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.ASX - * - * = FILENAME - * StreamHead.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.ASX; - -import JACE.OS.*; - -/** - * Standard module that acts as the head of a ustream. - */ - -public class StreamHead extends Task -{ - // Module that acts as the head of a Stream. - - public int open (Object obj) - { - return 0; - } - - public int close (long l) - { - return 0; - } - - public int svc () - { - return -1; - } - - private int control (MessageBlock mb) - { - - IOCntlMsg ioc = (IOCntlMsg) mb.obj (); - int cmd = ioc.cmd (); - - switch (cmd) - { - case IOCntlCmds.SET_LWM: - case IOCntlCmds.SET_HWM: - this.waterMarks (cmd, mb.cont ().length ()); - ioc.rval (0); - break; - default: - return 0; - } - return ioc.rval (); - } - - /* Performs canonical flushing at the ACE_Stream Head */ - - private int canonicalFlush (MessageBlock mb) - { - String s = mb.base (); - long f = (new Long (s)).longValue (); - - if ((f & TaskFlags.ACE_FLUSHR) != 0) - { - this.flush (TaskFlags.ACE_FLUSHALL); - f &= ~TaskFlags.ACE_FLUSHR; - } - if ((f & TaskFlags.ACE_FLUSHW) != 0) - return this.reply (mb, null); - return 0; - } - - // Will block forever to add the given MessageBlock - public int put (MessageBlock mb) - { - return this.put (mb, null); - } - - // tv is absolute time - public int put (MessageBlock mb, TimeValue tv) - { - int res = 0; - if (mb.msgType () == MessageType.MB_IOCTL - && (res = this.control (mb)) == -1) - return res; - - if (this.isWriter ()) - { - return this.putNext (mb, tv); - } - else /* this.isReader () */ - { - switch (mb.msgType ()) - { - case MessageType.MB_FLUSH: - return this.canonicalFlush (mb); - default: - break; - } - - try - { - return this.putq (mb, tv); - } - catch (InterruptedException e) - { - return -1; - } - } - } - - public void dump () - { - } - - public int handleTimeout (TimeValue tv, Object obj) - { - return 0; - } - -} diff --git a/java/JACE/ASX/StreamTail.java b/java/JACE/ASX/StreamTail.java deleted file mode 100644 index c1148a4c0f1..00000000000 --- a/java/JACE/ASX/StreamTail.java +++ /dev/null @@ -1,114 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.ASX - * - * = FILENAME - * StreamTail.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.ASX; - -import JACE.OS.*; - -/** - * Standard module that acts as the tail of a ustream. - */ -public class StreamTail extends Task -{ - // Module that acts as the tail of a Stream. - - public int open (Object obj) - { - return 0; - } - - public int close (long l) - { - return 0; - } - - public int svc () - { - return -1; - } - - private int control (MessageBlock mb) - { - IOCntlMsg ioc = (IOCntlMsg) mb.obj (); - int cmd = ioc.cmd (); - - switch (cmd) - { - case IOCntlCmds.SET_LWM: - case IOCntlCmds.SET_HWM: - { - int size = mb.cont ().length (); - - this.waterMarks (cmd, size); - this.sibling ().waterMarks (cmd, size); - ioc.rval (0); - break; - } - default: - mb.msgType (MessageType.MB_IOCNAK); - } - return this.reply (mb, null); - } - - // Perform flush algorithm as though we were the driver - private int canonicalFlush (MessageBlock mb) - { - String s = mb.base (); - long f = (new Long (s)).longValue (); - - if ((f & TaskFlags.ACE_FLUSHW) != 0) - { - this.flush (TaskFlags.ACE_FLUSHALL); - f &= ~TaskFlags.ACE_FLUSHW; - } - if ((f & TaskFlags.ACE_FLUSHR) != 0) - { - this.sibling ().flush (TaskFlags.ACE_FLUSHALL); - return this.reply (mb, null); - } - return 0; - } - - // put the given MessageBlock without a timeout (block forever if - // necessary) - public int put (MessageBlock mb) - { - return this.put (mb, null); - } - - // tv is an absolute time timeout - public int put (MessageBlock mb, TimeValue tv) - { - if (this.isWriter ()) - { - switch (mb.msgType ()) - { - case MessageType.MB_IOCTL: - return this.control (mb); - /* NOTREACHED */ - default: - break; - } - } - - return -1; - } - - public void dump () - { - } - - public int handleTimeout (TimeValue tv, Object obj) - { - return 0; - } - -} diff --git a/java/JACE/ASX/Task.java b/java/JACE/ASX/Task.java deleted file mode 100644 index b13de64f16a..00000000000 --- a/java/JACE/ASX/Task.java +++ /dev/null @@ -1,443 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.ASX - * - * = FILENAME - * Task.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.ASX; - -import JACE.OS.*; -import JACE.Reactor.*; -import JACE.Concurrency.*; - -/** - * Primary interface for application message processing, as well - * as input and output message queueing. <P> - * - * This class serves as the basis for passive and active objects - * in ACE. - * - *@see MessageQueue - *@see EventHandler - */ -public abstract class Task implements Runnable, EventHandler -{ - // = Initialization/termination methods. - - /** - * Initialize a Task. Note, we allocate a message queue ourselves. - */ - public Task () - { - this.msgQueue_ = new MessageQueue (); - this.thrMgr_ = null; - } - - /** - * Initialize a Task. Note, we use the message queue and thread - * manager supplied by the user. - *@param mq Message Queue to hold list of messages on the Task - *@param thrMgr Thread Manager that manages all the spawned threads - */ - public Task (MessageQueue mq, - ThreadManager thrMgr) - { - this.msgQueue_ = mq; - this.thrMgr_ = thrMgr; - } - - /** - * Not meant to be invoked by the user directly!. This needs to be - * in the public interface in order to get invoked by Thread - * class. - */ - public void run () - { - this.svc (); - } - - // = Initialization and termination hooks (note that these *must* be - // defined by subclasses). - - /** - * Hook called to open a Task. - *@param obj used to pass arbitrary information - */ - public abstract int open (Object obj); - - /** - * Hook called to close a Task. - */ - public abstract int close (long flags); - - // = Immediate and deferred processing methods, respectively. - - /** - * Transfer a message into the queue to handle immediate - * processing. - *@param mb Message Block to handle immediately - *@param tv Latest time to wait until (absolute time) - */ - public abstract int put (MessageBlock mb, TimeValue tv); - - /** - * Run by a daemon thread to handle deferred processing. Note, that - * to do anything useful, this method should be overriden by the - * subclass. - *@return default implementation always returns 0. - */ - public int svc () - { - return 0; - } - - /** - * Set the underlying Thread Manager. - *@param t Thread Manager to use - */ - public synchronized void thrMgr (ThreadManager t) - { - this.thrMgr_ = t; - } - - /** - * Get the Thread Manager. - *@return Underlying Thread Manager - */ - public synchronized ThreadManager thrMgr () - { - return this.thrMgr_; - } - - // = Active object method. - - /** - * Turn the task into an active object. That is, having <nThreads> - * separate threads of control that all invoke Task::svc. - *@param flags Task Flags - *@param nThreads number of threads to spawn - *@param forceActive whether to force creation of new threads or not - *@return -1 if failure occurs, 1 if Task is already an active - * object and <forceActive> is false (doesn't *not* create a new - * thread in this case), and 0 if Task was not already an active - * object and a thread is created successfully or thread is an active - * object and <forceActive> is true. - */ - public synchronized int activate (long flags, int nThreads, boolean forceActive) - { - // Create a Thread Manager if we do not already have one - if (this.thrMgr_ == null) - this.thrMgr_ = new ThreadManager (); - - if (this.thrCount () > 0 && forceActive == false) - return 1; // Already active. - this.flags_ = flags; - - if (ACE.BIT_ENABLED (flags, TaskFlags.THR_DAEMON)) - this.thrMgr_.spawnN (nThreads, this, true); // Spawn off all threads as daemon threads - else // Spawn off all threads as normal threads - this.thrMgr_.spawnN (nThreads, this, false); - - return 0; - } - - // = Suspend/resume a Task - - /** - * Suspend a task. Default implementation is a no-op. - */ - public synchronized void suspend () - { - } - - /** - * Resume a suspended task. Default implementation is a no-op. - */ - public synchronized void resume () - { - } - - /** - * Get the current group name. - *@return name of the current thread group - */ - public synchronized String grpName () - { - if (this.thrMgr_ != null) - return this.thrMgr_.thrGrp ().getName (); - else - return null; - } - - /** - * Get the message queue associated with this task. - *@return the message queue associated with this task. - */ - public MessageQueue msgQueue () - { - return this.msgQueue_; - } - - /** - * Set the message queue associated with this task. - *@param mq Message Queue to use with this Task. - */ - public void msgQueue (MessageQueue mq) - { - this.msgQueue_ = mq; - } - - /** - * Get the number of threads currently running within the Task. - *@return the number of threads currently running within the Task. - * 0 if we're a passive object, else > 0. - */ - public synchronized int thrCount () - { - if (this.thrMgr_ != null) - return this.thrMgr_.thrGrp ().activeCount (); - else - return 0; - } - - /** - * Set the Task flags - *@param flags Task Flags - */ - public synchronized void flags (long flags) - { - this.flags_ = flags; - } - - /** - * Get the Task flags - *@return Task Flags - */ - public synchronized long flags () - { - return this.flags_; - } - - // = Message queue manipulation methods. - - - /* - * Dump debug information. - */ - public void dump () - { - } - - /** - * Insert a message into the queue, blocking forever if necessary. - *@param mb Message Block to insert - *@exception java.lang.InterruptedException Interrupted while accessing queue - */ - protected int putq (MessageBlock mb) throws InterruptedException - { - return this.putq(mb, null); - } - - /** - * Insert message into the message queue. - *@param mb Message Block to insert into the Message Queue - *@param tv time to wait until (absolute time) - *@exception java.lang.InterruptedException Interrupted while accessing queue - */ - protected int putq (MessageBlock mb, TimeValue tv) throws InterruptedException - { - return this.msgQueue_.enqueueTail (mb, tv); - } - - /** - * Extract the first message from the queue, blocking forever if - * necessary. - *@return the first Message Block from the Message Queue. - *@exception InterrupteException Interrupted while accessing queue - */ - protected MessageBlock getq() throws InterruptedException - { - return this.getq(null); - } - - /** - * Extract the first message from the queue. Note that the call is blocking. - *@return the first Message Block from the Message Queue. - *@param tv Latest time to wait until (absolute time) - *@exception java.lang.InterruptedException Interrupted while accessing queue - */ - protected MessageBlock getq (TimeValue tv) throws InterruptedException - { - return this.msgQueue_.dequeueHead (tv); - } - - /** - * Return a message back to the queue. - *@param mb Message Block to return back to the Message Queue - *@param tv Latest time to wait until (absolute time) - *@exception java.lang.InterruptedException Interrupted while accessing queue - */ - protected int ungetq (MessageBlock mb, TimeValue tv) throws InterruptedException - { - return this.msgQueue_.enqueueHead (mb, tv); - } - - /** - * Transfer message to the adjacent ACETask in an ACEStream. - *@param mb Message Block to transfer to the adjacent Task - *@param tv Latest time to wait until (absolute time) - *@return -1 if there is no adjacent Task, else the return value of - * trying to put the Message Block on that Task's Message Queue. - */ - protected int putNext (MessageBlock mb, TimeValue tv) - { - return this.next_ == null ? -1 : this.next_.put (mb, tv); - } - - /** - * Turn the message back around. Puts the message in the sibling's - * Message Queue. - *@param mb Message Block to put into sibling's Message Queue - *@param tv Latest time to wait until (absolute time) - *@return -1 if there is no adjacent Task to the sibling, else the - * return value of trying to put the Message Block on sibling's - * Message Queue. - */ - protected int reply (MessageBlock mb, TimeValue tv) - { - return this.sibling ().putNext (mb, tv); - } - - // = ACE_Task utility routines to identify names et al. - - /** - * Get the name of the enclosing Module. - *@return the name of the enclosing Module if there's one associated - * with the Task, else null. - */ - protected String name () - { - if (this.mod_ == null) - return null; - else - return this.mod_.name (); - } - - /** - * Get the Task's sibling. - *@return the Task's sibling if there's one associated with the - * Task's Module, else null. - */ - protected Task sibling () - { - if (this.mod_ == null) - return null; - else - return this.mod_.sibling (this); - } - - /** - * Set the Task's module. - *@param mod the Task's Module. - */ - protected void module (Module mod) - { - this.mod_ = mod; - } - - /** - * Get the Task's module. - *@return the Task's Module if there is one, else null. - */ - protected Module module () - { - return this.mod_; - } - - /** - * Check if queue is a reader. - *@return true if queue is a reader, else false. - */ - protected boolean isReader () - { - return (ACE.BIT_ENABLED (this.flags_, TaskFlags.ACE_READER)); - } - - /** - * Check if queue is a writer. - *@return true if queue is a writer, else false. - */ - protected boolean isWriter () - { - return (ACE.BIT_DISABLED (this.flags_, TaskFlags.ACE_READER)); - } - - // = Pointers to next ACE_Queue (if ACE is part of an ACE_Stream). - - /** - * Get next Task pointer. - *@return pointer to the next Task - */ - protected Task next () - { - return this.next_; - } - - /** - * Set next Task pointer. - *@param task next task pointer - */ - protected void next (Task task) - { - this.next_ = task; - } - - // Special routines corresponding to certain message types. - - /** - * Flush the Message Queue - *@return 0 if Message Queue is null, 1 if flush succeeds, -1 if - * ACE_FLUSHALL bit is not enabled in flags. - */ - protected int flush (long flag) - { - if (ACE.BIT_ENABLED (flag, TaskFlags.ACE_FLUSHALL)) - return (this.msgQueue_ == null ? 0 : 1); - else - return -1; - } - - - /** - * Manipulate watermarks. - *@param cmd IOCntlCmd - *@param size watermark - */ - protected void waterMarks (int cmd, int size) - { - if (cmd == IOCntlCmds.SET_LWM) - this.msgQueue_.lowWaterMark (size); - else /* cmd == IOCntlMsg.SET_HWM */ - this.msgQueue_.highWaterMark (size); - } - - private ThreadManager thrMgr_ = null; - // Thread_Manager that manages all the spawned threads - - private long flags_; - // Task flags. - - private MessageQueue msgQueue_; - // List of messages on the Task.. - - private Task next_; - // Adjacent ACE_Task. - - private Module mod_; - // Back-pointer to the enclosing module. -} diff --git a/java/JACE/ASX/TaskFlags.java b/java/JACE/ASX/TaskFlags.java deleted file mode 100644 index 13347283adf..00000000000 --- a/java/JACE/ASX/TaskFlags.java +++ /dev/null @@ -1,49 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.ASX - * - * = FILENAME - * TaskFlags.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.ASX; - -/** - * Flags used within Task. - * - *@see Task - */ -public abstract class TaskFlags -{ - /** Identifies a Task as being the "reader" in a Module. */ - public static final int ACE_READER = 01; - - /** Just flush data messages in the queue. */ - public static final int ACE_FLUSHDATA = 02; - - /** Flush all messages in the Queue. */ - public static final int ACE_FLUSHALL = 04; - - /** Flush read queue */ - public static final int ACE_FLUSHR = 010; - - /** Flush write queue */ - public static final int ACE_FLUSHW = 020; - - /** Flush both queues */ - public static final int ACE_FLUSHRW = 030; - - /** Identifies a thread as suspended */ - public static final int THR_SUSPENDED = 0x00000080; - - /** Identifies a thread as a daemon thread */ - public static final int THR_DAEMON = 0x00000100; - - // Default private constructor to avoid instantiation - private TaskFlags () - { - } -} diff --git a/java/JACE/ASX/ThruTask.java b/java/JACE/ASX/ThruTask.java deleted file mode 100644 index 3fd0bbd4476..00000000000 --- a/java/JACE/ASX/ThruTask.java +++ /dev/null @@ -1,44 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.ASX - * - * = FILENAME - * ThruTask.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.ASX; - -/** - * Standard module that acts as a "no op", simply passing on all - * data to its adjacent neighbor. - */ -public class ThruTask extends Task -{ - public int open (Object obj) - { - return 0; - } - - public int close (long flags) - { - return 0; - } - - public int put (MessageBlock msg, TimeValue tv) - { - return this.putNext (msg, tv); - } - - public int svc () - { - return -1; - } - - public int handleTimeout (TimeValue tv, Object obj) - { - return 0; - } -} diff --git a/java/JACE/ASX/TimeValue.java b/java/JACE/ASX/TimeValue.java deleted file mode 100644 index 452f80447c4..00000000000 --- a/java/JACE/ASX/TimeValue.java +++ /dev/null @@ -1,296 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Reactor - * - * = FILENAME - * TimeValue.java - * - *@author Prashant Jain - * - *************************************************/ -//package JACE.Reactor; -package JACE.ASX; - -/** - * Encapsulates a specific time or time interval. <P> - * - * Also provides methods for generating absolute times from - * relative times. This is used throughout JACE for timeouts. - * - *@see TimedWait - */ -public class TimeValue -{ - /** - * TimeValue representing 0 seconds and 0 nanoseconds. - */ - public final static TimeValue zero = new TimeValue (0,0); - - /** - * Default constructor. This creates a TimeValue that is - * equal to TimeValue.zero. - */ - public TimeValue () - { - this (0, 0); - } - - /** - * Constructor - *@param sec seconds - */ - public TimeValue (long sec) - { - this (sec, 0); - } - - /** - * Constructor - *@param sec seconds - *@param nanos nanoseconds - */ - public TimeValue (long sec, int nanos) - { - this.set (sec, nanos); - } - - /** - * Sets the seconds and nanoseconds of Time Value - *@param sec seconds - *@param nanos nanoseconds - */ - public void set (long sec, int nanos) - { - this.millisec_ = sec * 1000; - this.nanos_ = nanos; - this.normalize (); - } - - /** - * Get seconds - *@return Seconds - */ - public long sec () - { - return this.millisec_/1000; - } - - /** - * Get nanoseconds - *@return Nanoseconds - */ - public int nanos () - { - return this.nanos_; - } - - /** - * Get time in milliseconds. - *@return time in milliseconds - */ - public long getMilliTime () - { - return this.millisec_; - } - - /** - * Get a String representation of the Time Value. - *@return String representation of the Time Value - */ - public String toString () - { - return (new Long (this.millisec_/1000)).toString () + ":" + - (new Integer (this.nanos_)).toString (); - } - - /** - * Get current time. - *@return the current system time as a new TimeValue - */ - public static TimeValue getTimeOfDay () - { - return new TimeValue (System.currentTimeMillis ()/1000); - } - - /** - * Return a new TimeValue that represents the current system time - * of day offset by the given number of seconds and nanoseconds. - *@param sec Number of seconds to offset by - *@param nanos Number of nanoseconds to offset by - *@see JACE.ASX.TimeValue - *@return TimeValue for the system time plus the given offset - */ - public static TimeValue relativeTimeOfDay(long sec, int nanos) - { - return new TimeValue ((System.currentTimeMillis() / 1000) + sec, - nanos); - } - - /** - * Return a new TimeValue that represents the current system time - * of day offset by the given TimeValue. - *@param tv TimeValue to offset by - *@see JACE.ASX.TimeValue - *@return TimeValue for the system time plus the given offset - */ - public static TimeValue relativeTimeOfDay(TimeValue offset) - { - return new TimeValue ((System.currentTimeMillis() / 1000) + - offset.sec(), - offset.nanos()); - } - - /** - * Compare two Time Values for equality. - *@param tv Time Value to compare with - *@return true if the two Time Values are equal, false otherwise - */ - public boolean equals (TimeValue tv) - { - return this.millisec_ == (tv.sec () * 1000) && this.nanos_ == tv.nanos (); - } - - /** - * Compare two Time Values for non-equality. - *@param tv Time Value to compare with - *@return true if the two Time Values are not equal, false otherwise - */ - public boolean notEquals (TimeValue tv) - { - return !this.equals (tv); - } - - /** - * Add two Time Values. - *@param tv1 The first Time Value - *@param tv2 The second Time Value - *@return sum of the two Time Values. - */ - public static TimeValue plus (TimeValue tv1, TimeValue tv2) - { - TimeValue tv = new TimeValue (tv1.sec () + tv2.sec (), - tv1.nanos () + tv2.nanos ()); - tv.normalize (); - return tv; - } - - /** - * Subtract two Time Values. - *@param tv1 The first Time Value - *@param tv2 The second Time Value - *@return difference of the two Time Values. - */ - public static TimeValue minus (TimeValue tv1, TimeValue tv2) - { - TimeValue tv = new TimeValue (tv1.sec () - tv2.sec (), - tv1.nanos () - tv2.nanos ()); - tv.normalize (); - return tv; - } - - /** - * Add Time Value to "this". - *@param tv The Time Value to add to this. - */ - public void plusEquals (TimeValue tv) - { - this.set (this.sec () + tv.sec (), - this.nanos () + tv.nanos ()); - this.normalize (); - } - - /** - * Subtract Time Value from "this". - *@param tv The Time Value to subtract from this. - */ - public void minusEquals (TimeValue tv) - { - this.set (this.sec () - tv.sec (), - this.nanos () - tv.nanos ()); - this.normalize (); - } - - /** - * Compare two Time Values for less than. - *@param tv Time Value to compare with - *@return true if "this" is less than tv, false otherwise - */ - public boolean lessThan (TimeValue tv) - { - return tv.greaterThan (this); - } - - /** - * Compare two Time Values for greater than. - *@param tv Time Value to compare with - *@return true if "this" is greater than tv, false otherwise - */ - public boolean greaterThan (TimeValue tv) - { - if (this.sec () > tv.sec ()) - return true; - else if (this.sec () == tv.sec () - && this.nanos () > tv.nanos ()) - return true; - else - return false; - } - - /** - * Compare two Time Values for <=. - *@param tv Time Value to compare with - *@return true if "this" <= tv, false otherwise - */ - public boolean lessThanEqual (TimeValue tv) - { - return tv.greaterThanEqual (this); - } - - /** - * Compare two Time Values for >=. - *@param tv Time Value to compare with - *@return true if "this" >= tv, false otherwise - */ - public boolean greaterThanEqual (TimeValue tv) - { - return this.sec () >= tv.sec () && this.nanos () >= tv.nanos (); - } - - private void normalize () - { - if (this.nanos_ >= ONE_MILLISECOND) - { - do - { - this.millisec_++; - this.nanos_ -= ONE_MILLISECOND; - } - while (this.nanos_ >= ONE_MILLISECOND); - } - else if (this.nanos_ <= -ONE_MILLISECOND) - { - do - { - this.millisec_--; - this.nanos_ += ONE_MILLISECOND; - } - while (this.nanos_ <= -ONE_MILLISECOND); - } - - if (this.millisec_ >= 1 && this.nanos_ < 0) - { - this.millisec_--; - this.nanos_ += ONE_MILLISECOND; - } - else if (this.millisec_ < 0 && this.nanos_ > 0) - { - this.millisec_++; - this.nanos_ -= ONE_MILLISECOND; - } - } - - private long millisec_; - private int nanos_; - private final static int ONE_MILLISECOND = 1000000; -} diff --git a/java/JACE/ASX/TimedWait.java b/java/JACE/ASX/TimedWait.java deleted file mode 100644 index dc1d0bab673..00000000000 --- a/java/JACE/ASX/TimedWait.java +++ /dev/null @@ -1,157 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.ASX - * - * = FILENAME - * TimedWait.java - * - *@author Prashant Jain and Doug Schmidt - * - *************************************************/ -package JACE.ASX; - -/** - * A wait/notify system with absolute time timeouts and built-in - * check of a condition. <P> - * - * Subclasses define the condition to check, and the object to - * wait on can be specified. - */ -public abstract class TimedWait -{ - /** - * Default Constructor. Sets "this" to be used for the delegation of - * the wait() call to. - */ - public TimedWait () - { - object_ = this; - } - - /** - * Constructor. Allows subclasses to supply us with an Object that - * is delegated the wait() call. - *@param obj The Object that is delegated the wait() call. - */ - public TimedWait (Object obj) - { - object_ = obj; - } - - /** - * Hook method that needs to be implemented by subclasses. - */ - public abstract boolean condition (); - - /** - * Wait until condition becomes true. Note that the method - * blocks. Also note that this method is final to ensure that no one - * overrides it. - * IMPORTANT: This method assumes it is called with the object_'s - * monitor lock already held. - *@exception InterruptedException Interrupted during wait - */ - public final void timedWait () throws InterruptedException - { - // Acquire the monitor lock. - if (!condition ()) - { - // Only attempt to perform the wait if the condition isn't - // true initially. - for (;;) - { - // Wait until we are notified. - object_.wait (); - - // Recheck the condition. - if (condition ()) - break; // Condition became true. - - // else we were falsely notified so go back into wait - } - } - } - - /** - * Template Method that implements the actual timed wait. Note that - * this method is final to ensure that no one overrides it. - * IMPORTANT: This method assumes it is called with the object_'s - * monitor lock already held. - * If the specified wait time is zero, this checks the condition, - * then returns on success or throws a TimeoutException on failure. - *@param tv Absolute time to wait until before throwing an exception - * if the condition isn't satisfied - *@exception java.lang.InterruptedException Interrupted during wait - *@exception JACE.ASX.TimeoutException Reached timeout specified - */ - public final void timedWait (TimeValue tv) - throws InterruptedException, - TimeoutException - { - if (tv == null) { - this.timedWait(); - return; - } - - // Acquire the monitor lock. - if (!condition ()) - { - long start = System.currentTimeMillis(); - long waitTime = tv.getMilliTime() - start; - - for (;;) { - - // Prevent a conversion from absolute to relative time from - // generating a zero or negative waitTime. - if (waitTime < 1) - throw new TimeoutException (); - - // Wait until we are notified. - object_.wait (waitTime); - - // Recheck the condition. - if (!condition ()) { - - long now = System.currentTimeMillis(); - - // Timed out! - if (now >= tv.getMilliTime ()) - throw new TimeoutException (); - else - // We still have some time left to wait, so adjust the - // wait_time. - waitTime = tv.getMilliTime() - now; - } - else - break; // Condition became true. - } - } - } - - /** - * Notify any one thread waiting on the object_. - * IMPORTANT: This method assumes it is called with the object_'s - * monitor lock already held. - */ - public final void signal () { - object_.notify (); - } - - /** - * Notify all threads waiting on the object_. - * IMPORTANT: This method assumes it is called with the object_'s - * monitor lock already held. - */ - public final void broadcast () { - object_.notifyAll (); - } - - /** - * The object we delegate to. If a subclass gives us a particular - * object, we use that to delegate to, otherwise, we ``delegate'' - * to ourself (i.e., this). - */ - protected Object object_; - -} diff --git a/java/JACE/ASX/TimeoutException.java b/java/JACE/ASX/TimeoutException.java deleted file mode 100644 index d55cc4fe999..00000000000 --- a/java/JACE/ASX/TimeoutException.java +++ /dev/null @@ -1,37 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.ASX - * - * = FILENAME - * TimeoutException.java - * - *@author Prashant Jain and Doug Schmidt - * - *************************************************/ -package JACE.ASX; - -/** - * Thrown when a timer has expired. - */ -public class TimeoutException extends Exception -{ - /** - * Default Constructor. - */ - public TimeoutException () - { - super ("Timed Out"); - } - - /** - * Constructor. - *@param timeout The timeout value which expired. - *@param desc Textual description of the exception - */ - public TimeoutException (TimeValue timeout, String desc) - { - super ("Timed Out in " + timeout + ": " + desc); - } - -} diff --git a/java/JACE/ASX/package.html b/java/JACE/ASX/package.html deleted file mode 100644 index 346782ed083..00000000000 --- a/java/JACE/ASX/package.html +++ /dev/null @@ -1,11 +0,0 @@ -<!-- $Id$ --> -<HTML> -<BODY> -Message queueing facilities. -<P> -@see <a href="http://www.cs.wustl.edu/~schmidt/ACE-papers.html#ipc"> -Documents on ACE interprocess communication components</a> -@see <a href="http://www.cs.wustl.edu/~schmidt/ACE-papers.html#streams"> -Documents on the ACE streams framework</a> -</BODY> -</HTML> diff --git a/java/JACE/Concurrency/AbstractLock.java b/java/JACE/Concurrency/AbstractLock.java deleted file mode 100644 index c8afaf789ae..00000000000 --- a/java/JACE/Concurrency/AbstractLock.java +++ /dev/null @@ -1,269 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Concurrency - * - * = FILENAME - * Lock.java - * - *@author Everett Anderson - * - *************************************************/ -package JACE.Concurrency; - -import JACE.ASX.*; - -/** - * Interface for any Java ACE synchronization mechanism. - * <P> - * Defines the interface for Token, Mutex, RWMutex, Semaphore, - * and the RemoteLock proxies in the Token service, as well as - * the possible constant return values. - * <P> - * Methods which take TimeValue timeouts can throw - * JACE.ASX.TimeoutExceptions. The locks should continue to - * function properly after a thread times out or is interrupted. - * <em>Also note that the timeouts are absolute time-of-day - * values, not relative times.</em> - * <P> - * An AbstractLock.FAILURE can be returned for an undefined type of - * failure. - * <P> - * You can assume that - * AbstractLock.FAILURE < AbstractLock.SUCCESS < AbstractLock.SLEEPHOOK - * <P> - * Any method can throw a LockException, providing a way to return - * unusual error cases in future types of locks (such as the Token - * service). - * <P> - * It is safe to call release () in a finally block, since it will - * return FAILURE if the accessing thread is not the owner. - * - */ -public interface AbstractLock -{ - /** - * Generic failure indication, used as a return value. - */ - public static final int FAILURE = -1; - - /** - * Success indication, used as a return value. - */ - int SUCCESS = 0; - - /** - * Success indication, but notes that the thread had to sleep - * to complete it (and it called the sleep hook). Used as a - * return value. - */ - int SLEEPHOOK = 1; - - - /** - * Acquire ownership of the lock, blocking indefinitely if necessary. - * <P> - *@return AbstractLock.FAILURE or AbstractLock.SUCCESS - *@exception LockException special exception defined by a later - * implementation - *@exception InterruptedException indicates another thread has - * interrupted this one during wait - */ - public int acquire () throws LockException, InterruptedException; - - /** - * Acquire ownership of the lock by the given absolute time time-out. - * A value of null for the timeout parameter results in a blocking - * acquire. - * A value of TimeValue.zero throws a TimeoutException if the - * acquire would block. - * <P> - *@param timeout absolute time by which the lock must be acquired - *@return appropriate Lock return value (AbstractLock.FAILURE, - * AbstractLock.SUCCESS or AbstractLock.SLEEPHOOK) - *@exception LockException special exception defined by a later - * implementation - *@exception JACE.ASX.TimeoutException thrown when the lock is not - * obtained by the desired time - *@exception InterruptedException indicates another thread has - * interrupted this one during wait - *@see AbstractLock#tryAcquire - */ - public int acquire (TimeValue timeout) - throws LockException, TimeoutException, InterruptedException; - - /** - * Acquire a read lock, blocking indefinitely if necessary. This can - * be used to implement Reader-Writer locks in which multiple readers - * may have simultaneous access. - * <P> - *@return AbstractLock.FAILURE or AbstractLock.SUCCESS - *@exception LockException special exception defined by a later - * implementation - *@exception InterruptedException indicates another thread has - * interrupted this one during wait - */ - public int acquireRead () throws LockException, InterruptedException; - - /** - * Acquire a read lock by the given absolute time time-out. This can - * be used to implement Reader-Writer locks in which multiple readers - * may have simultaneous access. - * <P> - *@param timeout absolute time by which the lock must be acquired - *@return appropriate lock return value (AbstractLock.FAILURE, - * AbstractLock.SUCCESS or AbstractLock.SLEEPHOOK) - *@exception LockException special exception defined by a later - * implementation - *@exception JACE.ASX.TimeoutException thrown when the lock is not - * obtained by the desired time - *@exception InterruptedException indicates another thread has - * interrupted this one during wait - *@see AbstractLock#tryAcquireRead - */ - public int acquireRead (TimeValue timeout) - throws LockException, TimeoutException, InterruptedException; - - /** - * Acquire a write lock, blocking indefinitely if necessary. This can - * be used to implement Reader-Writer locks in which a writer has - * exclusive access. - * <P> - *@return AbstractLock.FAILURE or AbstractLock.SUCCESS - *@exception LockException special exception defined by a later - * implementation - *@exception InterruptedException indicates another thread has - * interrupted this one during wait - */ - public int acquireWrite () throws LockException, InterruptedException; - - /** - * Acquire a write lock by the given absolute time time-out. This can - * be used to implement Reader-Writer locks in which a writer has - * exclusive access. - * <P> - *@param timeout absolute time by which the lock must be acquired - *@return appropriate AbstractLock return value (AbstractLock.FAILURE, - * AbstractLock.SUCCESS or AbstractLock.SLEEPHOOK) - *@exception LockException special exception defined by a later - * implementation - *@exception JACE.ASX.TimeoutException thrown when the lock is not - * obtained by the desired time - *@exception InterruptedException indicates another thread has - * interrupted this one during wait - *@see AbstractLock#tryAcquireWrite - */ - public int acquireWrite (TimeValue timeout) - throws LockException, TimeoutException, InterruptedException; - - /** - * Give up the lock to some number of waiting threads (if any), then - * reacquire, blocking indefinitely if necessary. - * <P> - * An optimized method that efficiently reacquires the token if no - * other threads are waiting. This is useful for situations where - * you don't want to degrade the quality of service if there are - * other threads waiting to get the token. - * <P> - *@param requeuePosition position in the waiters queue to insert - * this thread. If this value is -1 and there are other - * threads waiting to obtain the token, this thread is queued - * at the end. If this value is greater than -1, then it - * indicates how many entries to skip over before inserting - * our thread into the queue. (For example, if it is 0, - * this thread is put at the front of the queue.) If this - * value is greater than the number of waiters, this thread is - * simply put at the end of the current waiters queue. - *@return AbstractLock.FAILURE or AbstractLock.SUCCESS - *@exception LockException special exception defined by a later - * implementation - *@exception InterruptedException indicates another thread has - * interrupted this one during wait - */ - public int renew (int requeuePosition) throws LockException, - InterruptedException; - - /** - * Give up the lock to some waiting threads (if any), then reacquire - * by the given absolute time time-out. - * <P> - * An optimized method that efficiently reacquires the token if no - * other threads are waiting. This is useful for situations where - * you don't want to degrade the quality of service if there are - * other threads waiting to get the token. - * <P> - * A value of null for the timeout should indicate a blocking renew. - * <P> - *@param requeuePosition position in the waiters queue to insert - * this thread. If this value is -1 and there are other - * threads waiting to obtain the token, this thread is queued - * at the end. If this value is greater than -1, then it - * indicates how many entries to skip over before inserting - * our thread into the queue. (For example, if it is 0, - * this thread is put at the front of the queue.) If this - * value is greater than the number of waiters, this thread is - * simply put at the end of the current waiters queue. - * - *@param timeout absolute time by which the lock must be reacquired - * - *@return appropriate AbstractLock return value - * (AbstractLock.FAILURE or AbstractLock.SUCCESS) - *@exception LockException special exception defined by a later - * implementation - *@exception JACE.ASX.TimeoutException thrown when the lock is not - * obtained by the desired time - *@exception InterruptedException indicates another thread has - * interrupted this one during wait - */ - public int renew (int requeuePosition, TimeValue timeout) - throws LockException, TimeoutException, InterruptedException; - - /** - * Try to acquire the lock without blocking. - * <P> - *@return appropriate AbstractLock return value - * (AbstractLock.FAILURE or AbstractLock.SUCCESS) - *@exception LockException special exception defined by a later - * implementation - */ - public int tryAcquire () throws LockException; - - /** - * Try to acquire a read lock without blocking. - * <P> - *@see #acquireRead - *@return appropriate AbstractLock return value - * (AbstractLock.FAILURE or AbstractLock.SUCCESS) - *@exception LockException special exception defined by a later - * implementation - */ - public int tryAcquireRead () throws LockException; - - /** - * Try to acquire a write lock without blocking. - *<P> - *@see #acquireWrite - *@return appropriate AbstractLock return value - * (AbstractLock.FAILURE or AbstractLock.SUCCESS) - *@exception LockException special exception defined by a later - * implementation - */ - public int tryAcquireWrite () throws LockException; - - /** - * Method that is called before a thread goes to sleep in an - * acquire. This should be overridden by a subclass to define - * the appropriate behavior. - */ - public void sleepHook (); - - /** - * Release ownership of this lock. - * <P> - *@return appropriate AbstractLock return value - * (AbstractLock.FAILURE or AbstractLock.SUCCESS) - *@exception LockException special exception defined by a later - * implementation - */ - public int release () throws LockException; -} diff --git a/java/JACE/Concurrency/Condition.java b/java/JACE/Concurrency/Condition.java deleted file mode 100644 index 1889f6e1edf..00000000000 --- a/java/JACE/Concurrency/Condition.java +++ /dev/null @@ -1,124 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Concurrency - * - * = FILENAME - * Condition.java - * - *@author Irfan Pyarali - * - *************************************************/ -package JACE.Concurrency; - -import JACE.ASX.TimeoutException; -import JACE.ASX.TimeValue; - -/** - * Abstraction for <em>traditional</em> - * condition variable - * <P> - * This condition variable allows the use of one - * mutex between multiple conditions. - * This implementation is based on the C++ version of ACE. - */ -public class Condition -{ - /** - * Default constructor - *@param Mutex for synchronization - */ - public Condition (Mutex mutex) - { - mutex_ = mutex; - } - - /** - * Wait for condition to become signaled. - *@exception InterruptedException exception during wait - */ - public void Wait () - throws InterruptedException - { - waiters_++; - - try - { - mutex_.release(); - synchronized (waitObject_) { - waitObject_.wait (); - } - mutex_.acquire (); - } - finally - { - waiters_--; - } - } - - /** - * TimedWait for condition to become signaled. Note that the - * given TimeValue is an absolute time, not a relative time. - * - *@param tv Absolute time to wait until before timing out - *@exception TimeoutException wait timed out exception - *@exception InterruptedException exception during wait - */ - public void Wait (TimeValue tv) - throws TimeoutException, InterruptedException - { - waiters_++; - - try - { - mutex_.release(); - - synchronized (waitObject_) { - long start = System.currentTimeMillis(); - long waitTime = tv.getMilliTime() - start; - if (waitTime < 1) - throw new TimeoutException (); - waitObject_.wait (waitTime); - } - - mutex_.acquire (tv); - } - finally - { - waiters_--; - } - } - - /** - * Signal condition. Wake one waiter (if any). - */ - public void signal () - { - synchronized (waitObject_) { - waitObject_.notify (); - } - } - - /** - * Signal condition. Wake up all waiters (if any). - */ - public void broadcast () - { - synchronized (waitObject_) { - waitObject_.notifyAll (); - } - } - - /** - * Accessor to lock - *@return Mutex - */ - public Mutex mutex () - { - return mutex_; - } - - private int waiters_; - private Object waitObject_ = new Object (); - private Mutex mutex_; -} diff --git a/java/JACE/Concurrency/LockAdapter.java b/java/JACE/Concurrency/LockAdapter.java deleted file mode 100644 index db2e9de05c7..00000000000 --- a/java/JACE/Concurrency/LockAdapter.java +++ /dev/null @@ -1,262 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Concurrency - * - * = FILENAME - * Lock.java - * - *@author Everett Anderson - * - *************************************************/ -package JACE.Concurrency; - -import JACE.ASX.*; - -/** - * Abstract adapter class which provides useful default implementations - * for several methods in the AbstractLock interface, as well as - * protected helper functions for making sure only the owner - * can perform certain operations. - * - *@see JACE.Concurrency.AbstractLock - */ -public abstract class LockAdapter implements AbstractLock -{ - /** - * Default implementation that calls acquire (TimeValue) with a null - * timeout. - * - *@see AbstractLock#acquire - */ - public int acquire () throws InterruptedException - { - try { - return acquire (null); - } catch (TimeoutException e) { - // This should never happen - return AbstractLock.FAILURE; - } - } - - /** - * Acquire ownership of the lock by the given absolute time time-out. - * A value of null for the timeout parameter results in a blocking - * acquire. - * A value of TimeValue.zero throws a TimeoutException if the - * acquire would block. - * <P> - *@param timeout absolute time by which the lock must be acquired - *@return appropriate Lock return value (AbstractLock.FAILURE, - * AbstractLock.SUCCESS or AbstractLock.SLEEPHOOK) - *@exception JACE.ASX.TimeoutException thrown when the lock is not - * obtained by the desired time - *@exception InterruptedException indicates another thread has - * interrupted this one during wait - *@see AbstractLock#tryAcquire - */ - public abstract int acquire (TimeValue timeout) - throws TimeoutException, InterruptedException; - - /** - * Default implementation that calls acquireRead (TimeValue) with a - * null timeout. - * - *@see AbstractLock#acquireRead - */ - public int acquireRead () throws InterruptedException - { - try { - return acquireRead (null); - } catch (TimeoutException e) { - // This should never happen - } - - return AbstractLock.FAILURE; - } - - /** - * Default implementation that calls acquire (TimeValue). - * - *@see AbstractLock#acquireRead(TimeValue) - */ - public int acquireRead (TimeValue timeout) - throws TimeoutException, InterruptedException - { - return acquire (timeout); - } - - /** - * Default implementation that calls acquire with a null - * timeout. - * - *@see AbstractLock#acquireWrite - */ - public int acquireWrite () throws InterruptedException - { - try { - return acquire (null); - } catch (TimeoutException e) { - // This should never happen - } - - return AbstractLock.FAILURE; - } - - /** - * Default implementation that calls acquire (TimeValue). - * - *@see AbstractLock#acquireWrite(TimeValue) - */ - public int acquireWrite (TimeValue timeout) - throws TimeoutException, InterruptedException - { - return acquire (timeout); - } - - /** - * Default implementation that calls renew (int, TimeValue) with - * a null timeout. - * - *@see AbstractLock#renew(int) - */ - public int renew (int requeuePosition) throws InterruptedException - { - try - { - return renew (requeuePosition, null); - } catch (TimeoutException e) { - // Note that this should never happen since we requested a - // blocking acquire. - return AbstractLock.FAILURE; - } - } - - /** - * Give up the lock to some waiting threads (if any), then reacquire - * by the given absolute time time-out. - * <P> - * An optimized method that efficiently reacquires the token if no - * other threads are waiting. This is useful for situations where - * you don't want to degrade the quality of service if there are - * other threads waiting to get the token. - * <P> - * A value of null for the timeout should indicate a blocking renew. - * <P> - *@param requeuePosition position in the waiters queue to insert - * this thread. If this value is -1 and there are other - * threads waiting to obtain the token, this thread is queued - * at the end. If this value is greater than -1, then it - * indicates how many entries to skip over before inserting - * our thread into the queue. (For example, if it is 0, - * this thread is put at the front of the queue.) If this - * value is greater than the number of waiters, this thread is - * simply put at the end of the current waiters queue. - * - *@param timeout absolute time by which the lock must be reacquired - * - *@return appropriate AbstractLock return value - * (AbstractLock.FAILURE or AbstractLock.SUCCESS) - *@exception JACE.ASX.TimeoutException thrown when the lock is not - * obtained by the desired time - *@exception InterruptedException indicates another thread has - * interrupted this one during wait - */ - public abstract int renew (int requeuePosition, - TimeValue timeout) - throws TimeoutException, - InterruptedException; - - /** - * Default implementation that calls tryAcquire (). - * - *@see AbstractLock#tryAcquireRead - */ - public int tryAcquireRead () - { - return tryAcquire (); - } - - /** - * Default implementation that calls tryAcquire (). - * - *@see AbstractLock#tryAcquireWrite - */ - public int tryAcquireWrite () - { - return tryAcquire (); - } - /** - * Try to acquire the lock without blocking. - * <P> - *@return appropriate AbstractLock return value - * (AbstractLock.FAILURE or AbstractLock.SUCCESS) - */ - public abstract int tryAcquire (); - - /** - * Default implementation as a no-op. - * - *@see AbstractLock#sleepHook - */ - public void sleepHook () - { - } - - /** - * Release ownership of this lock. - * <P> - *@return appropriate AbstractLock return value - * (AbstractLock.FAILURE or AbstractLock.SUCCESS) - */ - public abstract int release (); - - /** - * Obtains an Object which uniquely identifies the current accessor - * (usually a thread). This is used to make sure only an owner can - * perform certain operations like release. Subclasses can redefine - * the behavior as necessary, such as in the Token service where it is - * defined to be the client ID sent by the proxy. - * <P> - * When using Java 1.2 or later, it might be more efficient to use - * ThreadLocal and an Integer for the ID. The current default - * implementation returns the Thread.currentThread () reference. - * - *@return Object representing a unique ID for this accessor - */ - protected Object accessorID () - { - return Thread.currentThread(); - } - - /** - * Check to see if the current accessor is the (or a) owner of this - * lock. - */ - protected boolean isOwner() - { - return accessorID().equals(this.owner_); - } - - /** - * Set the current accessor to be the (or a) owner of this lock. - */ - protected void setOwner() - { - this.owner_ = accessorID(); - } - - /** - * Make sure that this accessor is no longer the (or a) owner of this - * lock. - */ - protected void clearOwner() - { - this.owner_ = null; - } - - /** - * Reference to the accessorID of the owner. - */ - private Object owner_; -} diff --git a/java/JACE/Concurrency/LockException.java b/java/JACE/Concurrency/LockException.java deleted file mode 100644 index dff4c09c626..00000000000 --- a/java/JACE/Concurrency/LockException.java +++ /dev/null @@ -1,28 +0,0 @@ -package JACE.Concurrency; - -/** - * Base class for possible exceptions thrown from Lock - * mechanisms. This can be used by later Lock - * implementations to signal special types of exceptions, such - * as a remote failure, etc. - * <P> - */ -public class LockException extends java.lang.Exception -{ - /** - * Default constructor - */ - public LockException () { } - - /** - * Constructor with a string message that will be returned - * via the getMessage() method on Exception. - * <P> - *@see java.lang.Exception#getMessage - */ - public LockException (String message) - { - super(message); - } -} - diff --git a/java/JACE/Concurrency/Mutex.java b/java/JACE/Concurrency/Mutex.java deleted file mode 100644 index 856fdbd79eb..00000000000 --- a/java/JACE/Concurrency/Mutex.java +++ /dev/null @@ -1,239 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Concurrency - * - * = FILENAME - * Mutex.java - * - *@author Prashant Jain - *@author Everett Anderson - * - *************************************************/ -package JACE.Concurrency; - -import java.util.*; -import JACE.ASX.*; - -/** - * Value added abstraction for mutex variable creation. - * - * A mutex whose operations do not block forever and can time out. - * <P> - * <EM>This class does not support recursive semantics.</EM> - */ -public class Mutex extends LockAdapter -{ - /** - * Acquire ownership of the lock, blocking indefinitely if necessary. - * <P> - *@return AbstractLock.FAILURE or AbstractLock.SUCCESS - *@exception InterruptedException indicates another thread has - * interrupted this one during wait - */ - public synchronized int acquire () throws InterruptedException - { - if (this.monitor_.condition ()) { - this.monitor_.condition (false); - setOwner (); - return AbstractLock.SUCCESS; - } - - this.numberOfWaiters_++; - try { - sleepHook (); - this.monitor_.timedWait (); - } finally { - this.numberOfWaiters_--; - } - this.monitor_.condition (false); - setOwner(); - - return AbstractLock.SLEEPHOOK; - } - - public int renew (int requeuePosition, - TimeValue timeout) - throws InterruptedException, - TimeoutException - { - RenewObject rwo; - - synchronized (this) { - - if (!this.isOwner ()) - return AbstractLock.FAILURE; - - if (numberOfWaiters_ == 0 || requeuePosition == 0) - return AbstractLock.SUCCESS; - - if (requeuePosition < 0 || requeuePosition > numberOfWaiters_) - requeuePosition = numberOfWaiters_; - - rwo = new RenewObject (requeuePosition); - - this.release (); - this.renewers_.addElement (rwo); - } - - // We can't have the method synchronized, or synchronize on (this) - // in here because then the Thread that was woken up won't be able - // to continue its acquire. - // - // Normally when an exception occurs in timedWait, this thread just - // needs to remove itself from the renewers queue. - // - // However, the following situation exists: - // Thread A is the current owner, and is doing processing in release() - // This thread generates a timeout exception in timedWait - // Thread A signals this thread to wake up and take ownership, and - // removes it from the queue. - // This thread never takes ownership -- the exception keeps going up. - // - // This could lead to other renewers waiting in limbo forever. - // - // Solution: If this thread has an exception and it looks like it - // has been proclaimed the owner, then it calls release and lets - // the exception continue. - - boolean exceptionOccured = true; - try { - synchronized (rwo) { - rwo.timedWait (timeout); - - exceptionOccured = false; - } - } finally { - if (exceptionOccured) { - synchronized (this) { - if (!renewers_.removeElement (rwo)) { - setOwner (); - release (); - } - } - } - } - - synchronized (this) { - setOwner (); - } - - // By this point, we should know that we have the lock. The condition - // flag is never set to true in the release() call from the Thread - // that gave us control. - - return AbstractLock.SUCCESS; - } - - public synchronized int tryAcquire () { - if (this.monitor_.condition ()) { - this.monitor_.condition (false); - setOwner(); - return AbstractLock.SUCCESS; - } else - return AbstractLock.FAILURE; - } - - public synchronized int acquire (TimeValue tv) - throws TimeoutException, InterruptedException - { - if (this.monitor_.condition ()) { - this.monitor_.condition (false); - setOwner (); - return AbstractLock.SUCCESS; - } - - this.numberOfWaiters_++; - try { - sleepHook (); - this.monitor_.timedWait (tv); - } finally { - this.numberOfWaiters_--; - } - this.monitor_.condition (false); - setOwner(); - - return AbstractLock.SLEEPHOOK; - } - - /** - * Checks any objects in the renewers queue, giving one of them - * the lock if it is appropriate. Assumes the synchronization - * lock is already held. - * - *@return true if a renewer was signaled, else false - */ - protected boolean signalNextRenewer () - { - // First find the renewer with the minimum yieldTo count, processing - // all of them along the way. - if (this.renewers_.size() > 0) { - - RenewObject renewer = (RenewObject)renewers_. - elementAt (renewers_.size () - 1); - - renewer.decrementYieldTo (); - - for (int i = this.renewers_.size() - 2; i >=0; i--) { - - RenewObject rwo = (RenewObject)renewers_.elementAt (i); - - rwo.decrementYieldTo (); - - renewer = renewer.min (rwo); - } - - // If the renewer with the minimum yieldTo count has yielded to - // enough threads, or if there are no waiting threads, it should - // be signaled (thus, it wakes up and obtains the lock again). - - if (renewer.condition () || numberOfWaiters_ == 0) { - // Note that we leave monitor_.condition in the false state so - // we are assured that only the renewer (and not another - // Thread that does an acquire) will gain control. This - // is important since the renew method can't be synchronized - // in its current implementation. - renewers_.removeElement(renewer); - - synchronized (renewer) { - renewer.signal (); - } - - return true; - } - } - - return false; - } - - public synchronized int release () - { - if (!isOwner()) - return AbstractLock.FAILURE; - - if (!signalNextRenewer ()) { - // Do a normal release if there are no threads waiting to renew - // or no such threads are ready to renew. - this.monitor_.condition (true); - this.monitor_.signal (); - } - - return AbstractLock.SUCCESS; - } - - /** - * Monitor used to signal whether or not this Mutex is available. - */ - protected WaitObject monitor_ = new WaitObject (true, this); - // The monitor (adapter) to wait on - - /** - * Queue of waiting renewers. - */ - protected Vector renewers_ = new Vector (); - - /** - * Number of waiting threads. - */ - protected int numberOfWaiters_ = 0; -} diff --git a/java/JACE/Concurrency/RWMutex.java b/java/JACE/Concurrency/RWMutex.java deleted file mode 100644 index abb30ce3bc8..00000000000 --- a/java/JACE/Concurrency/RWMutex.java +++ /dev/null @@ -1,268 +0,0 @@ -package JACE.Concurrency; - -import java.util.*; -import JACE.ASX.*; - -/** - * A read/write lock allows multiple - * readers or a single writer to access the guarded element. - * <P> - * <EM>This class does not support recursive semantics.</EM> - */ -public class RWMutex extends LockAdapter -{ - public synchronized int tryAcquire () - { - if (referenceCount_ == 0) { - referenceCount_ = -1; - setOwner (); - return AbstractLock.SUCCESS; - } else - return AbstractLock.FAILURE; - } - - public synchronized int tryAcquireRead () - { - if (referenceCount_ > -1 && waiters_.size () == 0) { - referenceCount_++; - setOwner (); - return AbstractLock.SUCCESS; - } else - return AbstractLock.FAILURE; - } - - public int acquire(TimeValue timeout) - throws TimeoutException, InterruptedException - { - return acquireWrite(timeout); - } - - public void waitUntilIsOwner (RWWaitObject waitObj, TimeValue timeout) - throws TimeoutException, InterruptedException - { - boolean exceptionOccured = true; - try { - sleepHook (); - synchronized (waitObj) { - waitObj.timedWait (timeout); - } - exceptionOccured = false; - } finally { - - synchronized (this) { - - if (exceptionOccured) { - if (!waiters_.removeElement (waitObj)) { - setOwner (); - release (); - } - } else - setOwner(); - } - } - } - - public int acquireRead(TimeValue timeout) - throws TimeoutException, InterruptedException - { - RWWaitObject waitObj = null; - - synchronized (this) { - - if (referenceCount_ > -1 && waiters_.size () == 0) { - referenceCount_++; - setOwner (); - return AbstractLock.SUCCESS; - } - - waitObj = new RWWaitObject (true); - - waiters_.addElement (waitObj); - } - - waitUntilIsOwner (waitObj, timeout); - - return AbstractLock.SLEEPHOOK; - } - - public int acquireWrite(TimeValue timeout) - throws TimeoutException, InterruptedException - { - RWWaitObject waitObj = null; - - synchronized (this) { - - if (referenceCount_ == 0) { - referenceCount_ = -1; - setOwner (); - return AbstractLock.SUCCESS; - } - - waitObj = new RWWaitObject (false); - - waiters_.addElement (waitObj); - } - - waitUntilIsOwner (waitObj, timeout); - - // When the writer gets here, it has been cleared to go by - // whatever thread specifically gave control to this writer in - // release. The referenceCount_ and numberOfWaitingWriters_ - // variables are also adjusted by the releasing thread since - // it already has a synchronization lock. Not doing that, - // and then having another synchronized (this) block in here - // could lead to a situation in which another thread sneaks - // in inbetween when this thread leaves timedWait and goes to - // adjust them. - - return AbstractLock.SLEEPHOOK; - } - - - public synchronized int release () - { - if (!isOwner ()) - return AbstractLock.FAILURE; - - clearOwner (); - - // Releasing a reader. - if (referenceCount_ > 0) { - referenceCount_--; - - if (referenceCount_ != 0) - return AbstractLock.SUCCESS; - - } else { - // releasing a writer - referenceCount_ = 0; - } - - if (waiters_.size () == 0) - return AbstractLock.SUCCESS; - - if (releaseFirstReaders () == 0) { - RWWaitObject waitObj = (RWWaitObject)waiters_.firstElement (); - waiters_.removeElementAt (0); - - referenceCount_ = -1; - - waitObj.condition (true); - synchronized (waitObj) { - waitObj.signal (); - } - } - - return AbstractLock.SUCCESS; - } - - // Releases all waiting readers up to the first waiting writer - // or the end of the queue. Returns the number of readers - // released. - protected int releaseFirstReaders () - { - int releasedReaders = 0; - - do { - - RWWaitObject waitObj = (RWWaitObject)waiters_.firstElement (); - if (!waitObj.isReader ()) - break; - - waiters_.removeElementAt (0); - - referenceCount_++; - releasedReaders++; - - waitObj.condition (true); - synchronized (waitObj) { - waitObj.signal (); - } - - } while (waiters_.size () > 0); - - return releasedReaders; - } - - public int renew (int requeuePosition, - JACE.ASX.TimeValue timeout) - throws InterruptedException, - TimeoutException - { - RWWaitObject waitObj = null; - - synchronized (this) { - - if (!isOwner ()) - return AbstractLock.FAILURE; - - if (requeuePosition == 0 || waiters_.size () == 0) - return AbstractLock.SUCCESS; - - waitObj = new RWWaitObject (referenceCount_ > 0); - - if (requeuePosition < 0 || requeuePosition > waiters_.size ()) { - requeuePosition = waiters_.size (); - } - - waiters_.insertElementAt (waitObj, requeuePosition); - - release (); - } - - waitUntilIsOwner (waitObj, timeout); - - // When the writer gets here, it has been cleared to go by - // whatever thread specifically gave control to this writer in - // release. The referenceCount_ and numberOfWaitingWriters_ - // variables are also adjusted by the releasing thread since - // it already has a synchronization lock. Not doing that, - // and then having another synchronized (this) block in here - // could lead to a situation in which another thread sneaks - // in inbetween when this thread leaves timedWait and goes to - // adjust them. - - return AbstractLock.SUCCESS; - } - - static class RWWaitObject extends WaitObject - { - public RWWaitObject (boolean isReader) - { - isReader_ = isReader; - } - - public boolean isReader () - { - return isReader_; - } - - private boolean isReader_ = false; - } - - protected boolean isOwner () - { - return owners_.containsKey (accessorID()); - } - - protected void setOwner () - { - owners_.put (accessorID(), this); - } - - protected void clearOwner () - { - owners_.remove (accessorID()); - } - - private Vector waiters_ = new Vector (); - - private int referenceCount_ = 0; - // Value is -1 if writer has the lock, else this keeps track of the - // number of readers holding the lock. - - private Hashtable owners_ = new Hashtable (); - - private int nestingLevel_ = 0; -} - diff --git a/java/JACE/Concurrency/RenewObject.java b/java/JACE/Concurrency/RenewObject.java deleted file mode 100644 index b690958968a..00000000000 --- a/java/JACE/Concurrency/RenewObject.java +++ /dev/null @@ -1,36 +0,0 @@ -package JACE.Concurrency; - -import JACE.ASX.TimedWait; - -class RenewObject extends TimedWait -{ - public RenewObject (int maxYieldTo) - { - yieldTo_ = maxYieldTo; - } - - public boolean condition () - { - return yieldTo_ <= 0; - } - - public void decrementYieldTo() - { - this.yieldTo_--; - } - - public int yieldTo () - { - return this.yieldTo_; - } - - public RenewObject min (RenewObject other) - { - if (other.yieldTo_ < this.yieldTo_) - return other; - else - return this; - } - - private int yieldTo_; -} diff --git a/java/JACE/Concurrency/Semaphore.java b/java/JACE/Concurrency/Semaphore.java deleted file mode 100644 index 5e558035aee..00000000000 --- a/java/JACE/Concurrency/Semaphore.java +++ /dev/null @@ -1,263 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Concurrency - * - * = FILENAME - * Semaphore.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.Concurrency; - -import java.util.*; -import JACE.ASX.*; - -/** - * Implementation of Dijkstra's counting semaphore in java. - * <P> - * <EM>This class does not support recursive semantics.</EM> - */ -public class Semaphore extends LockAdapter -{ - static class TimedWaitSAdapter extends JACE.ASX.TimedWait - { - TimedWaitSAdapter (Object obj) - { - super (obj); - } - - // Check to see if there are any semaphores available. - public boolean condition () - { - return this.count_ > 0; - } - - // Increment the count by one - public void increment () - { - this.count_++; - } - - // Decrement the count by one - public void decrement () - { - this.count_--; - } - - // Set the count - public void count (int c) - { - this.count_ = c; - } - - public int count () - { - return this.count_; - } - - private int count_ = 0; - } - - /** - * Create a Semaphore. - *@param count semaphore count - */ - public Semaphore (int c) - { - this.monitor_.count (c); - this.owners_ = new Hashtable (c); - } - - /** - * Create a binary Semaphore. - */ - public Semaphore () - { - this.monitor_.count (1); - this.owners_ = new Hashtable (1); - } - - public synchronized int tryAcquire () - { - if (this.monitor_.condition ()) { - this.monitor_.decrement (); - setOwner (); - return AbstractLock.SUCCESS; - } else - return AbstractLock.FAILURE; - } - - /** - * Acquire the Semaphore. Throws a TimeoutException if the semaphore - * isn't acquired before the given absolute time. - *@param tv time (TimeValue) to wait until before throwing a - * TimeoutException (unless the semaphore is acquired before that) - *@exception TimeoutException wait timed out exception - *@exception InterruptedException exception during wait - */ - public synchronized int acquire (TimeValue tv) - throws TimeoutException, InterruptedException - { - if (this.monitor_.condition ()) { - this.monitor_.decrement (); - setOwner (); - return AbstractLock.SUCCESS; - } - - numberOfWaiters_++; - - try { - sleepHook (); - this.monitor_.timedWait (tv); - } finally { - numberOfWaiters_--; - } - - this.monitor_.decrement (); - setOwner (); - - return AbstractLock.SLEEPHOOK; - } - - public synchronized int release () - { - if (!isOwner ()) - return AbstractLock.FAILURE; - - if (!signalNextRenewer ()) { - this.monitor_.increment (); - this.monitor_.signal (); - clearOwner (); - } - - return AbstractLock.SUCCESS; - } - - /** - * Checks any objects in the renewers queue, giving one of them - * the lock if it is appropriate. Assumes the synchronization - * lock is already held. - * - *@return true if a renewer was signaled, else false - */ - protected boolean signalNextRenewer () - { - // First find the renewer with the minimum yieldTo count, processing - // all of them along the way. - if (this.renewers_.size() > 0) { - - RenewObject renewer = (RenewObject)renewers_. - elementAt (renewers_.size () - 1); - - renewer.decrementYieldTo (); - - for (int i = this.renewers_.size() - 2; i >=0; i--) { - - RenewObject rwo = (RenewObject)renewers_.elementAt (i); - - rwo.decrementYieldTo (); - - renewer = renewer.min (rwo); - } - - // If the renewer with the minimum yieldTo count has yielded to - // enough threads, or if there are no waiting threads, it should - // be signaled (thus, it wakes up and obtains the lock again). - - if (renewer.condition () || numberOfWaiters_ == 0) { - // Note that we leave monitor_.inUse in the true state so - // we are assured that only the renewer (and not another - // Thread that does an acquire) will gain control. This - // is important since the renew method can't be synchronized - // in its current implementation. - renewers_.removeElement(renewer); - - synchronized (renewer) { - renewer.signal (); - } - - return true; - } - } - - return false; - } - - public int renew (int requeuePosition, - JACE.ASX.TimeValue timeout) - throws InterruptedException, - TimeoutException - { - RenewObject rwo; - - synchronized (this) { - - if (!this.isOwner ()) - return AbstractLock.FAILURE; - - if (numberOfWaiters_ == 0 || - requeuePosition == 0 || - this.monitor_.condition ()) - return AbstractLock.SUCCESS; - - if (requeuePosition < 0 || requeuePosition > numberOfWaiters_) - requeuePosition = numberOfWaiters_; - - rwo = new RenewObject (requeuePosition); - - this.release (); - this.renewers_.addElement (rwo); - } - - boolean exceptionOccured = true; - try { - synchronized (rwo) { - rwo.timedWait (timeout); - - exceptionOccured = false; - } - } finally { - synchronized (this) { - - if (exceptionOccured) { - if (!renewers_.removeElement (rwo)) { - setOwner (); - release (); - } - } else { - setOwner(); - } - } - } - - // By this point, we should know that we have the lock. The inUse - // flag is never set to false in the release() call from the Thread - // that gave us control. That thread also set the owner value. - - return AbstractLock.SUCCESS; - } - - protected boolean isOwner () - { - return owners_.containsKey (accessorID()); - } - - protected void setOwner () - { - owners_.put (accessorID(), this); - } - - protected void clearOwner () - { - owners_.remove (accessorID()); - } - - private TimedWaitSAdapter monitor_ = new TimedWaitSAdapter (this); - // The monitor (adapter) to wait on - - private Hashtable owners_; - private Vector renewers_ = new Vector (); - private int numberOfWaiters_ = 0; -} diff --git a/java/JACE/Concurrency/ThreadManager.java b/java/JACE/Concurrency/ThreadManager.java deleted file mode 100644 index d23e2410676..00000000000 --- a/java/JACE/Concurrency/ThreadManager.java +++ /dev/null @@ -1,113 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Concurrency - * - * = FILENAME - * ThreadManager.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.Concurrency; - -import java.util.*; -import JACE.OS.*; - -/** - * Wrapper for a ThreadGroup which provides additional methods for - * creating a certain number of Runnable instances. - */ -public class ThreadManager -{ - /** - * Default constructor - */ - public ThreadManager () - { - this (ACE.DEFAULT_THREAD_GROUP_NAME); - } - - /** - * Create a Thread Manager. - *@param groupName name of the thread group that the Thread Manager - * will manage - */ - public ThreadManager (String groupName) - { - this.thrGrp_ = new ThreadGroup (groupName); - if (this.thrGrp_ == null) - ACE.ERROR ("Thread group create failed"); - } - - /** - * Create a new thread. - *@param thr the caller whose run method will be invoked when the - * thread has been spawned - *@param daemon flag indicating whether the thread should be - * spawned off as a daemon thread - */ - public void spawn (Runnable thr, - boolean daemon) - { - Thread t = new Thread (this.thrGrp_, thr); - if (daemon) // Set the thread to be a daemon thread - t.setDaemon (true); - t.start (); - } - - /** - * Create a new thread and also give it a name. - *@param thr the caller whose run method will be invoked when the - * thread has been spawned - *@param threadName the name of the new thread - *@param daemon flag indicating whether the thread should be - * spawned off as a daemon thread - */ - public void spawn (Runnable thr, - String threadName, - boolean daemon) - { - Thread t = new Thread (this.thrGrp_, thr, threadName); - if (daemon) // Set the thread to be a daemon thread - t.setDaemon (true); - t.start (); - } - - - /** - * Create <n> new threads. - *@param n the number of threads to spawn - *@param thr the caller whose run method will be invoked by each of - * the <n> threads - *@param daemon flag indicating whether the threads should be - * spawned off as daemon threads - */ - public void spawnN (int n, - Runnable thr, - boolean daemon) - { - // Spawn off all the threads. - for (int i = 0; i < n; i++) - { - this.spawn (thr, daemon); - } - } - - /** - * Get the thread group containing all the threads. Note that the - * thread group can be used to get information regarding number of - * active threads as well as to suspend/resume all the threads in - * the group. - *@return the thread group that contains all the threads managed by - * the Thread Manager - */ - public ThreadGroup thrGrp () - { - return this.thrGrp_; - } - - private ThreadGroup thrGrp_; - // Thread Group that contains all the spawned threads - -} diff --git a/java/JACE/Concurrency/Token.java b/java/JACE/Concurrency/Token.java deleted file mode 100644 index c9080b47fbe..00000000000 --- a/java/JACE/Concurrency/Token.java +++ /dev/null @@ -1,301 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Concurrency - * - * = FILENAME - * Token.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.Concurrency; - -import java.util.*; -import JACE.ASX.*; - -import JACE.OS.*; - -/** - * Class that acquires, renews, and releases a synchronization - * token that is serviced in strict FIFO ordering. - * <P> - * This is a general-purpose synchronization mechanism that offers - * several benefits. For example, it implements "recursive mutex" - * semantics, where a thread that owns the token can reacquire it - * without deadlocking. In addition, threads that are blocked - * awaiting the token are serviced in strict FIFO order as other - * threads release the token. The solution makes use of the - * Specific Notification pattern presented by Tom Cargill in - * "Specific Notification for Java Thread Synchronization," PLoP96. - * - * <P> - * This class DOES support recursive semantics. - */ -public class Token extends LockAdapter -{ - /** - * Acquire ownership of the lock, blocking indefinitely if necessary. - * <P> - *@return AbstractLock.FAILURE or AbstractLock.SUCCESS - *@exception InterruptedException indicates another thread has - * interrupted this one during wait - */ - public int acquire () throws InterruptedException - { - try - { - return this.acquire (null); - } - catch (TimeoutException e) - { - // This really shouldn't happen since we are supposed to - // block. - return AbstractLock.FAILURE; - } - } - - /** - * Acquire the token by the given absolute time time-out. The - * method uses synchronized blocks internally to avoid race conditions. - *@param timeout time to wait until before throwing a - * TimeoutException (unless the token is acquired before that). - * Performs a blocking acquire if the given timeout is null. - *@return AbstractLock.SUCCESS if acquires without calling <sleepHook> - * AbstractLock.SLEEPHOOK if <sleepHook> is called. - * AbstractLock.FAILURE if failure occurs - *@exception TimeoutException if time-out occurs - *@exception InterruptedException exception during wait - */ - public int acquire (TimeValue timeout) throws TimeoutException, - InterruptedException - { - int result = AbstractLock.SUCCESS; - WaitObject snl = new WaitObject (); - boolean mustWait; - synchronized (snl) - { - synchronized (this) - { - mustWait = !this.snq_.isEmpty (); - - if (mustWait && isOwner ()) - { - // I am the one who has the token. So just increment - // the nesting level - this.nestingLevel_++; - return AbstractLock.SUCCESS; - } - // Add local lock to the queue - this.snq_.addElement (snl); - } - if (mustWait) - { - result = AbstractLock.SLEEPHOOK; - sleepHook(); - - boolean exceptionOccured = true; - try { - snl.timedWait(timeout); - exceptionOccured = false; - } finally { - if (exceptionOccured) { - synchronized (this) { - if (!snq_.removeElement (snl)) { - setOwner (); - release (); - } - } - } - } - } - - // Set the owner of the token - synchronized (this) { - setOwner(); - } - } - - return result; - } - - /** - * Try to acquire the token. Implements a non-blocking acquire. - * - *@return AbstractLock.SUCCESS if acquires - * AbstractLock.FAILURE if failure occurs - */ - public synchronized int tryAcquire () - { - int result = AbstractLock.SUCCESS; - - if (this.snq_.isEmpty ()) - { - // No one has the token, so acquire it - this.snq_.addElement (new WaitObject ()); - - setOwner(); - } - else if (isOwner()) - { - this.nestingLevel_++; - } - // Someone else has the token. - else - { - // Would have to block to acquire the token, so return - // failure. - result = AbstractLock.FAILURE; - } - return result; - } - - /** - * An optimized method that efficiently reacquires the token if no - * other threads are waiting. This is useful for situations where - * you don't want to degrade the quality of service if there are - * other threads waiting to get the token. If the given TimeValue - * is null, it's the same as calling renew(int requeuePosition). - *@param requeuePosition Position in the queue where to insert the - * lock. If requeuePosition == -1 and there are other threads - * waiting to obtain the token we are queued at the end of the list - * of waiters. If requeuePosition > -1 then it indicates how many - * entries to skip over before inserting our thread into the list of - * waiters (e.g.,requeuePosition == 0 means "insert at front of the - * queue"). - *@param timeout Throw a TimeoutException if the token isn't renewed - * before this absolute time timeout. - *@return AbstractLock.SUCCESS if renewed the lock - * AbstractLock.FAILURE if failure occurs - *@exception TimeoutException exception if timeout occurs - *@exception InterruptedException exception during wait - */ - public int renew (int requeuePosition, TimeValue timeout) - throws TimeoutException, InterruptedException - { - WaitObject snl = null; - int saveNestingLevel = 0; - - synchronized (this) - { - if (!isOwner ()) - return AbstractLock.FAILURE; - - // Check if there is a thread waiting to acquire the token. If - // not or if requeuePosition == 0, then we don't do anything - // and we simply keep the token. - if (this.snq_.size () > 1 && requeuePosition != 0) - { - // Save the nesting level - saveNestingLevel = this.nestingLevel_; - this.nestingLevel_ = 0; - - // Reinsert ourselves at requeuePosition in the queue - snl = (WaitObject) this.snq_.firstElement (); - this.snq_.removeElementAt (0); - - if (requeuePosition < 0) - this.snq_.addElement (snl); // Insert at end - else - this.snq_.insertElementAt (snl, Math.min(requeuePosition, - this.snq_.size())); - - synchronized (this.snq_.firstElement ()) - { - // Notify the first waiting thread in the queue - WaitObject obj = (WaitObject) this.snq_.firstElement (); - // Set its condition to be true so that it falls out - // of the for loop - obj.condition (true); - // Now signal the thread - obj.signal (); - } - } - } - - // Check if we reinserted the lock in the queue and therefore need - // to do a wait - if (snl != null) - { - synchronized (snl) - { - // Set the condition to be false so that we can begin the - // wait - snl.condition (false); - // Wait until the given absolute time (or until notified - // if the timeout is null) - - boolean exceptionOccured = true; - try { - - snl.timedWait (timeout); - - exceptionOccured = false; - - } finally { - if (exceptionOccured) { - synchronized (this) { - if (!snq_.removeElement (snl)) { - setOwner (); - release (); - } - } - } - } - } - - synchronized (this) { - // Restore the nesting level and current owner of the lock - this.nestingLevel_ = saveNestingLevel; - - // Set the owner of the token - setOwner(); - } - } - - return AbstractLock.SUCCESS; - } - - /** - * Release the token. It is safe for non-owners to call - * this. - *@return AbstractLock.SUCCESS on success - * AbstractLock.FAILURE on failure (for instance, a non-owner - * calling release) - */ - public synchronized int release () - { - if (!isOwner()) - return AbstractLock.FAILURE; - - // Check if nestingLevel > 0 and if so, decrement it - if (this.nestingLevel_ > 0) - this.nestingLevel_--; - else - { - clearOwner (); - this.snq_.removeElementAt (0); - if (!this.snq_.isEmpty ()) - { - synchronized (this.snq_.firstElement ()) - { - // Notify the first waiting thread in the queue - WaitObject obj = (WaitObject) this.snq_.firstElement (); - // Set its condition to be true so that it falls out - // of the for loop - obj.condition (true); - // Now signal the thread - obj.signal (); - } - } - } - - return AbstractLock.SUCCESS; - } - - private Vector snq_ = new Vector (); - // Vector of lock objects - - private int nestingLevel_ = 0; - // Current Nesting Level -} diff --git a/java/JACE/Concurrency/WaitObject.java b/java/JACE/Concurrency/WaitObject.java deleted file mode 100644 index b7c8cbc7191..00000000000 --- a/java/JACE/Concurrency/WaitObject.java +++ /dev/null @@ -1,39 +0,0 @@ -package JACE.Concurrency; - -import JACE.ASX.TimedWait; - -class WaitObject extends TimedWait -{ - public WaitObject () - { - super (); - } - - public WaitObject (Object obj) - { - super (obj); - } - - public WaitObject (boolean initialState) - { - condition_ = initialState; - } - - public WaitObject (boolean initialState, Object obj) - { - super (obj); - condition_ = initialState; - } - - public boolean condition () - { - return this.condition_; - } - - public void condition (boolean c) - { - this.condition_ = c; - } - - private boolean condition_ = false; -} diff --git a/java/JACE/Concurrency/package.html b/java/JACE/Concurrency/package.html deleted file mode 100644 index ceadb36f662..00000000000 --- a/java/JACE/Concurrency/package.html +++ /dev/null @@ -1,15 +0,0 @@ -<!-- $Id$ --> -<HTML> -<BODY> -Collection of concurrency mechanisms and a Thread manager. -<P> -JACE concurrency mechanisms now inherit from a common base class, -AbstractLock. This allows users to write code without regard to -whether a lock is local or remote. - -@see JACE.netsvcs.Token.RemoteLock -@see <a href="http://www.cs.wustl.edu/~schmidt/ACE-papers.html#concurrency">Documents on ACE concurrency components</a> -</BODY> -</HTML> - - diff --git a/java/JACE/Connection/AcceptStrategy.java b/java/JACE/Connection/AcceptStrategy.java deleted file mode 100644 index 3af87865c79..00000000000 --- a/java/JACE/Connection/AcceptStrategy.java +++ /dev/null @@ -1,87 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Connection - * - * = FILENAME - * AcceptStrategy.java - * - *@author Prashant Jain - *@author Everett Anderson - * - *************************************************/ -package JACE.Connection; - -import java.io.*; -import java.net.*; -import JACE.SOCK_SAP.*; - -/** - * Interface for specifying a passive connection - * acceptance strategy for a - * <a href="ACE.Connection.SvcHandler.html"><tt>SvcHandler</tt></a> - * . - * <P> - * This class provides a strategy that manages passive - * connection setup for an application, and can be extended - * to define new strategies. - * <P> - * - * The default implementation delegates to a generic Acceptor. - * - *@see SvcHandler - *@see Acceptor - */ -public class AcceptStrategy -{ - /** - * Create an instance of AcceptStrategy that delegates to the given - * Acceptor. - *@param port port number where the server will listen for connections - *@param peer Acceptor instance to delegate to - */ - AcceptStrategy (int port, Acceptor peer) throws IOException - { - this.acceptor_ = peer; - this.open (port); - } - - /** - * Create an instance of Accept Strategy that delegates to Acceptor. - *@param port port number where the server will listen for connections - *@exception IOException couldn't open port - */ - AcceptStrategy (int port) throws IOException - { - this.acceptor_ = new Acceptor (); - this.open (port); - } - - /** - * Initialize AcceptStrategy. - *@param port port number where the server will listen for connections - *@exception IOException couldn't open port - */ - public void open (int port) throws IOException - { - this.acceptor_.open (port); - } - - /** - * Accept connections into the SvcHandler. Note that subclasses - * should overwrite this method to provide a different accept - * strategy. - *@param sh Svc Handler in which to accept the connection - *@exception SocketException Socket error - *@exception IOException Socket error - *@return 0 - */ - public int acceptSvcHandler (SvcHandler sh) throws - SocketException, IOException - { - return this.acceptor_.acceptSvcHandler (sh); - } - - // The Acceptor we delegate to (if any) - private Acceptor acceptor_; -} diff --git a/java/JACE/Connection/Acceptor.java b/java/JACE/Connection/Acceptor.java deleted file mode 100644 index 00dbed4c056..00000000000 --- a/java/JACE/Connection/Acceptor.java +++ /dev/null @@ -1,215 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Connection - * - * = FILENAME - * Acceptor.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.Connection; - -import java.io.*; -import java.net.*; -import JACE.OS.*; -import JACE.SOCK_SAP.*; -import JACE.ServiceConfigurator.*; - -/** - * Abstract factory for creating a service handler - * (<a href="ACE.Connection.SvcHandler.html"><tt>SvcHandler</tt></a>), - * accepting into the - * <a href="ACE.Connection.SvcHandler.html"><tt>SvcHandler</tt></a>, and activating the - * <a href="ACE.Connection.SvcHandler.html"><tt>SvcHandler</tt></a>. - * <P> - * - * Implements the basic strategy for passively establishing - * connections with applications. The <tt>Acceptor</tt> - * is a factory for <tt>SvcHandler</tt> instances, and, by default - * generates a new <tt>SvcHandler</tt> instance for each connection - * esablished. - * - * <p> - * - * The user of this class <em>must</em> provide a - * reference to a handler factory prior to calling <a - * href="#accept()"><tt>accept</tt></a>, or an exception will be - * thrown. The handler factory is identified by the meta-class for - * the <tt>SvcHandler</tt>, and is typically obtained by calling <a - * href="java.lang.Class#classForName(java.lang.String)"><tt>Class.classForName("SvcHandler")</tt></a>. - * - * <p> - * - * TCP is the transport mechanism used, via - * <a href="ACE.SOCK_SAP.SOCKAcceptor.html#_top_"><tt>SOCKAcceptor</tt></a>, - * <em>et.al.</em> The SvcHandler is instantiated with a concrete type - * that performs the application-specific service. - * - * <P> - * - * This class is not directly related to the - * <tt>AcceptorStrategy</tt> class. - * - * - * @see java.lang.Class - * @see JACE.Connection.SvcHandler - * @see JACE.SOCK_SAP.SOCKAcceptor - */ -public class Acceptor extends ServiceObject -{ - /** - * Create an instance of Acceptor. Default constructor. Note that if - * an instance is created via this method, <tt>setHandlerFactory</tt> - * must be called prior to using <tt>accept</tt>. - * - * @see JACE.Connection.Acceptor#setHandlerFactory - */ - public Acceptor () - { - } - - /** - * Create an instance of Acceptor. - *@param handlerFactory meta-class reference used to create - * an instance of a SvcHandler when a connection is accepted - * (typically obtained by calling <tt>Class.classForName</tt>). - * - *@see java.lang.Class#forName - */ - public Acceptor (Class handlerFactory) - { - this.handlerFactory_ = handlerFactory; - } - - /** - * Set the handler factory. This is provided to aid the default - * no-arg constructor. - *@param handlerFactory meta-class reference used to create - * an instance of a SvcHandler when a connection is accepted - * (typically obtained by calling <tt>Class.forName</tt>). - * - *@see java.lang.Class#forName - */ - public void setHandlerFactory (Class handlerFactory) - { - this.handlerFactory_ = handlerFactory; - } - - /** - * Initialize the Acceptor. - *@param port TCP port number where the Acceptor will listen for connections - *@exception IOException socket level exception - */ - public void open (int port) throws IOException - { - this.port_ = port; - this.sockAcceptor_ = new SOCKAcceptor (port); - } - - /** - * Template method for accepting connections. Delegates operational - * activities to the following bridge methods: - * <ul> - * <li><tt>makeSvcHandler</tt></li> - * <li><tt>acceptSvcHandler</tt></li> - * <li><tt>activateSvcHandler</tt></li> - * </ul> - * - * <p> - * - * The method first obtains a <tt>SvcHandler</tt> via - * <tt>makeSvcHandler</tt>, accepts the connection <q>into</q> the - * handler using <tt>acceptSvcHandler</tt>, and finally turns over - * control to the handler with <tt>activateSvcHandler</tt>. - * - *@exception SocketException socket level error - *@exception InstantiationException <tt>makeSvcHandler</tt> failure - *@exception IllegalAccessException <tt>makeSvcHandler</tt> failure - *@exception IOException socket level error - */ - public void accept () throws SocketException, - InstantiationException, - IllegalAccessException, - IOException - { - - // Create a Svc_Handler using the appropriate Creation_Strategy - SvcHandler sh = this.makeSvcHandler (); - - // Accept a connection into the SvcHandler using the appropriate - // Accept_Strategy - this.acceptSvcHandler (sh); - - // Activate the SvcHandler using the appropriate ActivationStrategy - this.activateSvcHandler (sh); - } - - /** - * Bridge method for creating a <tt>SvcHandler</tt>. The default is to - * create a new <SvcHandler>. However, subclasses can override this - * policy to perform <SvcHandler> creation in any way that they like - * (such as creating subclass instances of <SvcHandler>, using a - * singleton, etc.) - *@return a new instance of the SvcHandler - *@exception InstantiationException could not create new SvcHandler - *@exception IllegalAccessException no SvcHandler factory provided - */ - protected SvcHandler makeSvcHandler () - throws InstantiationException, IllegalAccessException - { - // Create a new handler for the connection - return (SvcHandler) handlerFactory_.newInstance (); - } - - /** - * Bridge method for accepting the new connection into the - * <tt>SvcHandler</tt>. The default behavior delegates the work to - * <tt>SOCKAcceptor.accept</tt>. However, subclasses can override this - * strategy. - *@param sh SvcHandler in which to accept the connection - *@return 0 - *@exception SocketException socket level error - *@exception IOException socket level error - */ - protected int acceptSvcHandler (SvcHandler sh) - throws SocketException, IOException - { - // Create a new stream - SOCKStream sockStream = new SOCKStream (); - - // Block in accept. Returns when a connection shows up - this.sockAcceptor_.accept (sockStream); - - // Set the streams for the new handler - sh.setHandle (sockStream); - return 0; - } - - /** - * Bridge method for activating a <tt>SvcHandler</tt>. The default - * behavior of this method is to activate the <tt>SvcHandler</tt> by - * calling its open() method (which allows the <tt>SvcHandler</tt> to - * define its own concurrency strategy). However, subclasses can - * override this strategy to do more sophisticated concurrency - * activations. - *@param sh SvcHandler to activate - *@return 0 - */ - protected int activateSvcHandler (SvcHandler sh) - { - sh.open (null); - return 0; - } - - protected int port_ = ACE.DEFAULT_SERVER_PORT; - - // Handler class that should be instantiated when a connection is - // made with a client - protected Class handlerFactory_; - - // Our connection acceptance factory - protected SOCKAcceptor sockAcceptor_; -} - diff --git a/java/JACE/Connection/ActivateStrategy.java b/java/JACE/Connection/ActivateStrategy.java deleted file mode 100644 index 91072a6c823..00000000000 --- a/java/JACE/Connection/ActivateStrategy.java +++ /dev/null @@ -1,40 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Connection - * - * = FILENAME - * ActivateStrategy.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.Connection; - - -/** - * Bridge supporting activation strategy used by - * <a href="ACE.Connection.StrategyAcceptor.html#_top_"><tt>StrategyAcceptor</tt></a> - * <P> - * Subclass and overload - * <a href="#activateSvcHandler(ACE.Connection.SvcHandler)"><tt>activateSvcHandler</tt></a> - * in order change the activation strategy. Then, submit this subclass to - * <a href="ACE.Connection.StrategyAcceptor.html#_top_"><tt>StrategyAcceptor</tt></a> - * as the activation strategy. - * - *@see StrategyAcceptor - */ -public class ActivateStrategy -{ - /** - * Activate the Svc Handler. Note that subclasses should overwrite - * this method to provide a different Activate strategy. - *@param sh Svc Handler to activate - *@return zero if success, non-zero for failure - */ - public int activateSvcHandler (SvcHandler sh) - { - sh.open (null); - return 0; - } -} diff --git a/java/JACE/Connection/Blob.java b/java/JACE/Connection/Blob.java deleted file mode 100644 index d3102c81aa2..00000000000 --- a/java/JACE/Connection/Blob.java +++ /dev/null @@ -1,114 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Connection - * - * = FILENAME - * Blob.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.Connection; - -import java.io.*; -import java.net.*; -import JACE.SOCK_SAP.*; -import JACE.ASX.*; -import JACE.OS.*; - -/** - * Provides a way of reading from or writing to a remote file - * using MessageBlocks. - */ -public class Blob -{ - /** - * Initialize the Blob. - * - *@param filename File to read or write - *@param hostname Host to contact for the file - *@param port Port on which to connect - */ - public int open (String filename, String hostname , int port) - { - this.filename_ = filename; - this.hostname_ = hostname; - this.port_ = port; - return 0; - } - - /** - * Read a certain amount from the file. - */ - public MessageBlock read (int length, int offset) - { - // Check if we have a valid length and a valid offset - if (length < 0 || offset < 0) - { - ACE.ERROR ("Blob::read(): Negative length or offset"); - return null; - } - - // Create a Blob Reader - BlobReader blobReader = new BlobReader (length, - offset, - this.filename_, - this.hostname_, this.port_); - - // Receive data - MessageBlock mb = blobReader.receiveData (); - if (blobReader.bytesRead () != length) - return null; - else - return mb; - } - - /** - * Write a certain amount to the file. - */ - public int write (MessageBlock mb, int length, int offset) - { - // Check if we have a valid length and a valid offset - if (length < 0 || offset < 0) - ACE.ERROR ("Blob::write(): Negative length or offset"); - - // Create a Blob Writer - BlobWriter blobWriter = new BlobWriter (mb, length, offset, this.filename_); - - try - { - // Connect to the server - this.connector_.open (this.hostname_, this.port_); - this.connector_.connect (blobWriter); - } - catch (UnknownHostException e) - { - ACE.ERROR (e); - } - catch (InstantiationException e) - { - ACE.ERROR (e); - } - catch (IllegalAccessException e) - { - ACE.ERROR (e); - } - catch (IOException e) - { - ACE.ERROR (e); - } - - return blobWriter.bytesWritten (); - } - - public int close () - { - return 0; - } - - String filename_; - String hostname_; - int port_; - Connector connector_ = new Connector (); -} diff --git a/java/JACE/Connection/BlobHandler.java b/java/JACE/Connection/BlobHandler.java deleted file mode 100644 index ec282bdeaa9..00000000000 --- a/java/JACE/Connection/BlobHandler.java +++ /dev/null @@ -1,35 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Connection - * - * = FILENAME - * BlobHandler.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.Connection; - -import java.io.*; -import java.net.*; -import JACE.SOCK_SAP.*; -import JACE.ASX.*; -import JACE.OS.*; - -public abstract class BlobHandler extends SvcHandler -{ - public BlobHandler (int length, int offset, String filename) - { - this.length_ = length; - this.offset_ = offset; - this.filename_ = filename; - } - - public abstract int open (Object obj); - - protected int length_ = 0; - protected int offset_ = 0; - protected String filename_ = null; -} - diff --git a/java/JACE/Connection/BlobReader.java b/java/JACE/Connection/BlobReader.java deleted file mode 100644 index 4de6b65bedc..00000000000 --- a/java/JACE/Connection/BlobReader.java +++ /dev/null @@ -1,108 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Connection - * - * = FILENAME - * BlobReader.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.Connection; - -import java.io.*; -import java.net.*; -import JACE.SOCK_SAP.*; -import JACE.ASX.*; -import JACE.OS.*; - -/** - * Provides a way to read from a remote file using - * MessageBlocks (and HTTP). <P> - * - * Created by Blob during a call to read. - */ -public class BlobReader -{ - public BlobReader (int length, - int offset, - String filename, - String hostname, - int port) - { - this.length_ = length; - this.offset_= offset; - this.filename_ = filename; - this.hostname_ = hostname; - this.port_ = port; - } - - - public MessageBlock receiveData () - { - String hostname = this.hostname_; - String filename = this.filename_; - - // Check if the filename begins with a "/" and if so, remove it - // since we are concatenating a "/" to the hostname. - if (this.filename_.startsWith ("/")) - filename = this.filename_.substring (1); - - hostname = hostname + ":" + this.port_ + "/"; - // System.out.println (hostname + filename); - - // Allocate a buffer to hold the offset worth of data - byte tempBuf [] = new byte [this.offset_]; - // Allocate a buffer to hold the actual data - byte dataBuf [] = new byte [this.length_]; - - try - { - // Create a URL to fetch the file - URL url = new URL (this.protocol_ + hostname + filename); - - // Get the input stream and pipe it to a DataInputStream - DataInputStream iStream = new DataInputStream (url.openStream ()); - - // Read the offset worth of bytes - iStream.readFully (tempBuf, 0, this.offset_); - - // Read length worth of bytes - iStream.readFully (dataBuf, 0, this.length_); - } - catch (MalformedURLException e) - { - ACE.ERROR (e); - } - catch (IOException e) - { - ACE.ERROR (e); - } - // Cache number of bytes read - this.bytesRead_ = this.length_; - return new MessageBlock (new String (dataBuf, 0, this.length_)); - } - - public int close (long flags) - { - return 0; - } - - public int bytesRead () - { - return this.bytesRead_; - } - - private String protocol_ = "http://"; - - int length_ = 0; - int offset_= 0; - String filename_ = null; - String hostname_ = "localhost"; - int port_ = 80; - - int bytesRead_ = 0; -} - - diff --git a/java/JACE/Connection/BlobWriter.java b/java/JACE/Connection/BlobWriter.java deleted file mode 100644 index 18c9b092964..00000000000 --- a/java/JACE/Connection/BlobWriter.java +++ /dev/null @@ -1,224 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Connection - * - * = FILENAME - * BlobWriter.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.Connection; - -import java.io.*; -import java.net.*; -import JACE.SOCK_SAP.*; -import JACE.ASX.*; -import JACE.OS.*; - -/** - * Provides a way to write to a remote file using MessageBlocks - * (and HTTP). <P> - * - * Created by Blob during a write. - */ -public class BlobWriter extends BlobHandler -{ - public BlobWriter (MessageBlock mb, - int length, - int offset, - String filename) - { - super (length, offset, filename); - this.mb_ = mb; - this.returnCode_ = -1; - - } - - /******************************* - * This constructor should be used when using the basic HTTP 1.1 - * authentication scheme - *******************************/ - public BlobWriter (MessageBlock mb, - int length, - int offset, - String filename, - String authentication) - { - super (length, offset, filename); - this.mb_ = mb; - this.returnCode_ = -1; - this.authentication_ = authentication; - } - - - public int open (Object obj) - { - if (this.sendRequest () != 0) - { - ACE.ERROR ("BlobWriter::open():sendRequest failed"); - return -1; - } - else if (this.receiveReply () != 0) - { - ACE.ERROR ("BlobWriter::open():receiveReply failed"); - return -1; - } - return 0; - } - - public int close (long flags) - { - return 0; - } - - public int bytesWritten () - { - return this.bytesWritten_;; - } - - protected int sendRequest () - { - // Check for sanity -- check if we have any data to send. - if (this.offset_+ this.length_ > this.mb_.length ()) - { - ACE.ERROR ("BlobWriter::sendRequest():Invalid offset/length"); - return -1; - } - - if (this.sendHeader () == -1) - { - ACE.ERROR ("BlobWriter::sendHeader failed."); - return -1; - } - else - if (this.sendData () == -1) - { - ACE.ERROR ("BlobWriter::sendData failed."); - return -1; - } - return 0; - } - - // Send the header - protected int sendHeader () - { - String filename = this.filename_; - // Check if the filename begins with a "/" and if it doesn't, add it - if (!this.filename_.startsWith ("/")) - filename = "/" + this.filename_; - - // Create the header, store the actual length in mesglen - String mesg = this.requestPrefix_ + " " + filename + " " + this.requestSuffix_; - - if (this.authentication_ != null) - mesg += "Authorization: Basic " + JACE.Connection.HTTPHelper.EncodeBase64(this.authentication_) + '\n'; - - mesg += "Content-length: " + this.length_ + "\n"; - - try - { - if (this.peer ().send (mesg) < 0) - { - ACE.ERROR ("Error sending request"); - return -1; - } - } - catch (IOException e) - { - ACE.ERROR (e); - return -1; - } - return 0; - } - - // Send the data - protected int sendData () - { - // Get the actual data to send - String data = this.mb_.base ().substring (this.offset_, - this.offset_ + this.length_); - - - try - { - // System.out.println (data); - // Now send the data - if (this.peer ().send (data) != this.length_) - { - ACE.ERROR ("Error sending file"); - return -1; - } - } - catch (IOException e) - { - ACE.ERROR (e); - return -1; - } - this.bytesWritten_ = this.length_; - return 0; - } - - - protected int receiveReply () - { - System.out.println("Waiting for reply"); - - // Receive the reply from the server - StringBuffer reply = new StringBuffer (1024); - - try - { - if (this.peer ().recv (reply) < 0) - { - ACE.ERROR ("Error receiving reply from server"); - return -1; - } - } - catch (IOException e) - { - ACE.ERROR (e); - } - - String s = reply.toString (); - - int index = -1; - // Now parse the reply to see if it was a success or a failure - if ((index = s.indexOf (replyPrefix_)) == -1) - { - ACE.ERROR ("Error receiving reply from server"); - return -1; - } - - int codeIndex = index + replyPrefix_.length () + 1; - - // Assume code is a 3 digit number - String codeString = s.substring (codeIndex, codeIndex + 3); - - returnCode_ = (new Integer (codeString)).intValue (); - // System.out.println (code); - - if (returnCode_ >= 200 && returnCode_ < 300) { // Check if everything went smoothly - System.out.println("We got the goodies!"); - return 0; - } else - return -1; - } - - public int returnCode () - { - return this.returnCode_; - } - - protected String authentication_ = null; - protected String protocol_ = "http://"; - protected int bytesWritten_ = 0; - protected MessageBlock mb_ = null; - protected String requestPrefix_ = "PUT"; - protected String requestSuffix_ = "HTTP/1.0\n"; - protected String replyPrefix_ = "HTTP/1.0"; - protected int returnCode_; -} - - diff --git a/java/JACE/Connection/Connector.java b/java/JACE/Connection/Connector.java deleted file mode 100644 index dbe72b8c359..00000000000 --- a/java/JACE/Connection/Connector.java +++ /dev/null @@ -1,148 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Connection - * - * = FILENAME - * Connector.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.Connection; - -import java.io.*; -import java.net.*; -import JACE.OS.*; -import JACE.SOCK_SAP.*; -import JACE.ServiceConfigurator.*; - -/** - * Abstract factory for connecting a - * (<a href="JACE.Connection.SvcHandler.html"><tt>SvcHandler</tt></a>), - * to an application. - * <P> - * Implements the basic strategy for actively establishing connections - * with applications. The <tt>Connector</tt> establishes the connection, - * passing it on to a <tt>SvcHandler</tt> instance, and handing over - * control to that instance. - *<p> - * TCP is the transport mechanism used, via - * <a href="JACE.SOCK_SAP.SOCKConnector.html#_top_"><tt>SOCKConnector</tt></a>. - *<P> - * This class, as currently implemented, does not work like its C++ - * counterpart. - * Future versions are expected to rectify this discrepancy. - * - *@see SOCKConnector - *@see SvcHandler - */ -public class Connector extends ServiceObject -{ - /** - * Create a Connector. Do nothing constructor. Allows user to - * call <a href="#open(java.lang.String)">open</a>() later. - */ - public Connector () - { - } - - /** - * Create a Connector passing in server hostname and port - * number, effectively shorthand for calling - * <a href="#open(java.lang.String)">open</a>(). - *@param hostname server hostname - *@param port server port number - */ - public Connector (String hostname, int port) - { - this.open (hostname, port); - } - - /** - * Initialize the Connector passing in server hostname and port - * number. Note that no connection attempt is made. - *@param hostname server hostname - *@param port server port number - */ - public void open (String hostname, int port) - { - this.hostname_ = hostname; - this.port_ = port; - } - - /** - * Connect to the server. - *@param sh Svc Handler to use to handle the connection - *@exception UnknownHostException Bad host - *@exception SocketException Socket error - *@exception InstantiationException Couldn't create new SOCKConnector - *@exception IllegalAccessException No strategy available - *@exception IOException Socket error - */ - public void connect (SvcHandler sh) throws UnknownHostException, - SocketException, - InstantiationException, - IllegalAccessException, - IOException - { - // Make a connection using the appropriate Connection_Strategy - this.connectSvcHandler (sh); - - // Activate the Svc_Handler using the appropriate Activation_Strategy - this.activateSvcHandler (sh); - } - - /** - * Bridge method for making a new connection. The default behavior - * creates a new SOCKConnector and then calls setHandle() on the - * <SvcHandler> that was passed in. Subclasses can override this - * strategy, if needed. - *@param sh Svc Handler to use to handle the connection - *@return 0 - *@exception SocketException Socket error - *@exception IOException Socket error - */ - protected int connectSvcHandler (SvcHandler sh) throws - SocketException, IOException - { - // Create a new stream - SOCKStream sockStream = new SOCKStream (); - - // Create a SOCK_Connector (note the constructor does the connect for us) - this.sockConnector_ = new SOCKConnector (sockStream, - this.hostname_, - this.port_); - ACE.DEBUG ("Connected to " + - sockStream.socket ().getInetAddress ()); - - // Set the streams for the new handler - sh.setHandle (sockStream); - return 0; - } - - /** - * Bridge method for activating a <SvcHandler>. The default - * behavior of this method is to activate the <SvcHandler> by - * calling its open() method (which allows the SVC_HANDLER to define - * its own concurrency strategy). However, subclasses can override - * this strategy to do more sophisticated concurrency activations. - *@param sh Svc Handler to activate - *@return 0 - */ - protected int activateSvcHandler (SvcHandler sh) - { - sh.open (null); - return 0; - } - - - // Port server is listening on - private int port_; - - // Server hostname - private String hostname_; - - // Our connection factory - private SOCKConnector sockConnector_; -} diff --git a/java/JACE/Connection/CreationStrategy.java b/java/JACE/Connection/CreationStrategy.java deleted file mode 100644 index f4828d5bff5..00000000000 --- a/java/JACE/Connection/CreationStrategy.java +++ /dev/null @@ -1,57 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Connection - * - * = FILENAME - * CreationStrategy.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.Connection; - -/** - * Defines the interface for specifying a creation strategy for a - * <a href="ACE.Connection.SvcHandler.html#_top_"><tt>SvcHandler</tt></a> to the - * <a href="ACE.Connection.StrategyAcceptor.html#_top_"><tt>StrategyAcceptor</tt></a>. - * <P> - * The default behavior is to make a new SvcHandler. However, - * subclasses can override this strategy to perform SvcHandler - * creation in any way that they like (such as creating subclass - * instances of SvcHandler, using a singleton, dynamically - * linking the handler, etc.). - * - *@see SvcHandler - *@see StrategyAcceptor - *@see AcceptStrategy - *@see ActivateStrategy - */ -public class CreationStrategy -{ - /** - * Create an instance of Creation Strategy. - *@param handlerFactory Svc Handler factory that is used to create - * an instance of a Svc Handler - */ - public CreationStrategy (Class handlerFactory) - { - this.handlerFactory_ = handlerFactory; - } - - /** - * Create a new SvcHandler. Note that subclasses should override - * this method to provide a new creation strategy. - *@return reference to a new instance of the SvcHandler (or subclass) - *@exception InstantiationException Unable to instantiate. - *@exception IllegalAccessException No handler factory available. - */ - public SvcHandler makeSvcHandler () throws InstantiationException, - IllegalAccessException - { - // Create a new Svc_Handler - return (SvcHandler) handlerFactory_.newInstance (); - } - - private Class handlerFactory_; -} diff --git a/java/JACE/Connection/HTTPHelper.java b/java/JACE/Connection/HTTPHelper.java deleted file mode 100644 index 2901d74a14a..00000000000 --- a/java/JACE/Connection/HTTPHelper.java +++ /dev/null @@ -1,182 +0,0 @@ -package JACE.Connection; - -import JACE.OS.*; - -/** - * Collection of methods concerning HTTP. - */ -public class HTTPHelper -{ - /** - * Alphabet used in encoding and decoding basic base64 authentication. - * See the HTTP 1.1 RFC for details. - */ - public static String Alphabet - = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - - /** - * Decode a secret encrypted with the basic base64 HTTP 1.1 authentication - * scheme. - * - *@param secret Message to decode - *@return null on error, decoded String on success - */ - public static String DecodeBase64 (String secret) - { - StringBuffer output = new StringBuffer (); - boolean inalphabet [] = new boolean[256]; - char decoder [] = new char [256]; - - for (int i = 0; i < 256; i++) { - inalphabet [i] = false; - decoder [i] = 0; - } - - for (int i = Alphabet.length () - 1; - i >= 0; - i--) - { - inalphabet [(int)Alphabet.charAt (i)] = true; - decoder [(int)Alphabet.charAt (i)] = (char)i; - } - - int inidx = 0; - int c = 0; - int char_count = 0; - int bits = 0; - boolean error = false; - - while (inidx < secret.length ()) - { - c = secret.charAt (inidx++); - - if (c == '=') - break; - - if (c > 255 || !inalphabet[(int)c]) - continue; - - bits += decoder[c]; - char_count++; - if (char_count == 4) { - output.append ((char) (bits >> 16)); - output.append ((char) ((bits >> 8) & 0xff)); - output.append ((char) (bits & 0xff)); - bits = 0; - char_count = 0; - } else - bits <<= 6; - } - - if (c == '\0') { - if (char_count != 0) { - ACE.DEBUG ("base64 encoding incomplete: at least " - + ((4 - char_count) * 6) + " bits truncated"); - error = true; - } - } else { - // c == '=' - switch (char_count) - { - case 1: - ACE.DEBUG ("output so far: " + output.toString ()); - ACE.DEBUG ("base64 encoding incomplete: at least 2 bits missing"); - error = true; - break; - case 2: - output.append ((char) (bits >> 10)); - break; - case 3: - output.append ((char) (bits >> 16)); - output.append ((char) ((bits >> 8) & 0xff)); - break; - } - } - - if (!error) - return output.toString (); - else - return null; - } - - /** - * Encode a message with the basic base64 HTTP 1.1 authentication - * scheme. Adapted from James' JAWS HTTP_Helpers code. - * - *@param secret Message to encode - *@return null on error, an encoded String on success - */ - public static String EncodeBase64 (String secret) - { - StringBuffer output = new StringBuffer (); - - // Index of the input string - int inidx = 0; - - // character value - int c; - - int char_count = 0; - int bits = 0; - boolean error = false; - - while (inidx < secret.length()) - { - c = secret.charAt(inidx++); - - // This will mess up internationalization. I wonder if it is really - // necessary for HTTP? - if (c > 255) - { - ACE.DEBUG ("encountered char > 255 (decimal %d): " + c); - error = true; - break; - } - - bits += c; - char_count++; - - if (char_count == 3) - { - output.append(HTTPHelper.Alphabet.charAt(bits >> 18)); - output.append(HTTPHelper.Alphabet.charAt((bits >> 12) & 0x3f)); - output.append(HTTPHelper.Alphabet.charAt((bits >> 6) & 0x3f)); - output.append(HTTPHelper.Alphabet.charAt(bits & 0x3f)); - - bits = 0; - char_count = 0; - } - else - bits <<= 8; - } - - if (!error) - { - if (char_count != 0) - { - bits <<= 16 - (8 * char_count); - output.append(HTTPHelper.Alphabet.charAt(bits >> 18)); - output.append(HTTPHelper.Alphabet.charAt((bits >> 12) & 0x3f)); - - if (char_count == 1) - { - output.append("=="); - } - else - { - output.append(HTTPHelper.Alphabet.charAt((bits >> 6) & 0x3f)); - output.append('='); - } - } - - return output.toString(); - } - - // Returns null on error - return null; - } - - private HTTPHelper () {} -} - - diff --git a/java/JACE/Connection/StrategyAcceptor.java b/java/JACE/Connection/StrategyAcceptor.java deleted file mode 100644 index 743d384776f..00000000000 --- a/java/JACE/Connection/StrategyAcceptor.java +++ /dev/null @@ -1,174 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Connection - * - * = FILENAME - * StrategyAcceptor.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.Connection; - -import java.io.*; -import java.net.*; -import JACE.OS.*; -import JACE.SOCK_SAP.*; - -/** - * Abstract factory for creating, accepting into, and activating - * a service handler. - * <P> - * Uses instances of CreationStrategy, AcceptStrategy, and - * ActivateStrategy. - * - *@see SvcHandler - *@see CreationStrategy - *@see AcceptStrategy - *@see ActivateStrategy - */ -public class StrategyAcceptor extends Acceptor -{ - /** - * Create an instance of StrategyAcceptor. The caller must - * call setHandlerFactory before open! - */ - public StrategyAcceptor () - { - this (null, null, null, null); - } - - /** - * Create an instance of StrategyAcceptor. - *@param handlerFactory Svc Handler factory that is used to create - * an instance of a Svc Handler when a connection is accepted. - */ - public StrategyAcceptor (Class handlerFactory) - { - this (handlerFactory, null, null, null); - } - - /** - * Create an instance of StrategyAcceptor. Use the creation - * strategy and the handlerFactory passed in to creae a new instance - * of the Svc Handler. - *@param handlerFactory Svc Handler factory that is used to create - * an instance of a Svc Handler when a connection is accepted. - *@param creStrategy Creation strategy to use to create a new - * instance of the Svc Handler. - *@param acceptStrategy Accept strategy to use to accept a new - * connection into the Svc Handler. - *@param activateStrategy Activate strategy to use to activate the - * instance of the Svc Handler. - */ - public StrategyAcceptor (Class handlerFactory, - CreationStrategy creStrategy, - AcceptStrategy acceptStrategy, - ActivateStrategy activateStrategy) - { - // Cache everything - this.handlerFactory_ = handlerFactory; - this.creStrategy_ = creStrategy; - this.acceptStrategy_ = acceptStrategy; - this.activateStrategy_ = activateStrategy; - } - - /** - * Initialize the Strategy Acceptor. The method creates the - * appropriate strategies as needed. - *@param port port number where the server will listen for connections - *@exception IOException Socket level error - */ - public void open (int port) throws IOException - { - if (this.creStrategy_ == null) - this.creStrategy_ = new CreationStrategy (this.handlerFactory_); - if (this.acceptStrategy_ == null) - this.acceptStrategy_ = new AcceptStrategy (port); - else - this.acceptStrategy_.open (port); - if (this.activateStrategy_ == null) - this.activateStrategy_ = new ActivateStrategy (); - } - - /** - * Accept a connection using the appropriate strategies. - * - *@exception SocketException Socket level error - *@exception InstantiationException Problem creating a handler - *@exception IllegalAccessException No strategy available - *@exception IOException Socket level error - */ - public void accept () throws SocketException, - InstantiationException, - IllegalAccessException, - IOException - { - // Create a Svc_Handler using the appropriate Creation_Strategy - SvcHandler sh = this.makeSvcHandler (); - - // Accept a connection into the Svc_Handler - this.acceptSvcHandler (sh); - - // Activate the Svc_Handler - this.activateSvcHandler (sh); - } - - /** - * Bridge method for creating a SvcHandler. The strategy for - * creating a SvcHandler is configured into the Acceptor via it's - * creStrategy_. If no strategy is passed in, the default behavior - * of this method is to use the default CreationStrategy. - *@return a new instance of the Svc Handler - *@exception InstantiationException Couldn't create SvcHandler - *@exception IllegalAccessException No strategy available - */ - protected SvcHandler makeSvcHandler () - throws InstantiationException, IllegalAccessException - { - // Create a new handler for the connection - return this.creStrategy_.makeSvcHandler (); - } - - - /** - * Bridge method for accepting the new connection into the - * <SvcHandler>. The strategy for accepting into a SvcHandler is - * configured into the Acceptor via it's acceptStrategy_. If no - * strategy is passed in, the default behavior of this method is to - * use the default AcceptStrategy. - *@param sh Svc Handler in which to accept the connection - *@return result of accepting a connection using the accept strategy - *@exception SocketException Socket level error - *@exception IOException Socket level error - */ - protected int acceptSvcHandler (SvcHandler sh) throws SocketException, IOException - { - // Delegate responsibility to the appropriate strategy - return this.acceptStrategy_.acceptSvcHandler (sh); - } - - /** - * Bridge method for activating a <SvcHandler>. The strategy for - * activating a SvcHandler is configured into the Acceptor via it's - * activateStrategy_. If no strategy is passed in, the default - * behavior of this method is to use the default ActivateStrategy. - *@param sh Svc Handler to activate - *@return result of activating the Svc Handler - */ - protected int activateSvcHandler (SvcHandler sh) - { - // Delegate responsibility to the appropriate strategy - return this.activateStrategy_.activateSvcHandler (sh); - } - - // Creation Strategy - private CreationStrategy creStrategy_; - - // Accept Strategy - private AcceptStrategy acceptStrategy_; - - // Activation Strategy - private ActivateStrategy activateStrategy_; -} diff --git a/java/JACE/Connection/SvcHandler.java b/java/JACE/Connection/SvcHandler.java deleted file mode 100644 index 1df62247baa..00000000000 --- a/java/JACE/Connection/SvcHandler.java +++ /dev/null @@ -1,101 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Connection - * - * = FILENAME - * SvcHandler.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.Connection; - -import java.io.*; -import java.net.*; -import JACE.SOCK_SAP.*; -import JACE.ASX.*; -import JACE.Reactor.*; - -/** - * Defines the interface for a service that exchanges data with its - * connected peer. - * <P> - * This class provides a well-defined interface that the Acceptor and - * Connector pattern factories use as their target. Typically, client - * applications will subclass SvcHandler and do all the interesting work - * in the subclass. One thing that the SvcHandler does contain is a - * peer SOCKStream endpoint that is initialized by Acceptor or Connector - * when a connection is established successfully. This endpoint is used - * to exchange data between a SvcHandler and the peer it is connected - * with. - */ -public abstract class SvcHandler extends Task -{ - - /** - * Do nothing constructor. - */ - public SvcHandler () - { - } - - /** - * Set the stream using the SOCKStream passed in. This sets the - * underlying peer - *@param s SOCK Stream to use for the connection - */ - public void setHandle (SOCKStream s) throws IOException - { - this.stream_ = s; - } - - /** - * Get the underlying peer - *@return the underlying peer - */ - public SOCKStream peer () - { - return this.stream_; - } - - /** - * Abstract method that subclasses must define to allow - * initialization to take place. - */ - public abstract int open (Object obj); - - /** - * Provide a default implementation to simplify ancestors. - *@return 0 - */ - public int close (long flags) - { - return 0; - } - - /** - * Provide a default implementation to simplify ancestors. - *@return -1 - */ - public int put (MessageBlock mb, TimeValue tv) - { - return -1; - } - - /** - * Provide a default implementation to simplify ancestors. - *@param tv Time Value when the event occured - *@param obj An arbitrary object that was passed to the Timer Queue - * (Asynchronous Completion Token) - */ - public int handleTimeout (TimeValue tv, Object obj) - { - return -1; - } - - /** - * Underlying peer socket stream. - */ - protected SOCKStream stream_; -} diff --git a/java/JACE/Connection/package.html b/java/JACE/Connection/package.html deleted file mode 100644 index 429904216d5..00000000000 --- a/java/JACE/Connection/package.html +++ /dev/null @@ -1,7 +0,0 @@ -<!-- $Id$ --> -<HTML> -<BODY> -Collection of factories for services. -@see <a href="http://www.cs.wustl.edu/~schmidt/ACE-papers.html#initialize">Documents on ACE object and service initialization components</a> -</BODY> -</HTML> diff --git a/java/JACE/Makefile b/java/JACE/Makefile deleted file mode 100644 index fd8d7b7a68a..00000000000 --- a/java/JACE/Makefile +++ /dev/null @@ -1,234 +0,0 @@ -# Makefile -# $Id$ - -.SUFFIXES: .java .class - -VERSION = 1.5 -JACE_WRAPPER = .. -CLASSDIR = $(JACE_WRAPPER)/classes -DOCDIR = $(JACE_WRAPPER)/doc - -JC = javac -JCOPTS = -d $(CLASSDIR) -JD = javadoc -JDOPTS = -classpath $(CLASSDIR) -sourcepath $(JACE_WRAPPER) -windowtitle \ - "Java ACE $(VERSION) Documentation" -bottom \ - "Java ACE Version $(VERSION)<BR> \ - <A HREF="http://www.cs.wustl.edu/~schmidt"> \ - http://www.cs.wustl.edu/~schmidt</A>" \ - -doctitle "Java ACE Version $(VERSION) Documentation" -d $(DOCDIR) \ - -overview overview.html - -COMPILE.java = $(JC) $(JCOPTS) $(filter %.java,$?) - -CLASSPATH := $(CLASSDIR):$(CLASSPATH) - -all: asx os concurrency connection timers misc reactor svcconfig socksap netsvcs - -pkg_all = $(pkg_asx_timestuff) $(pkg_asx) $(pkg_os) $(pkg_concurrency) \ - $(pkg_connection) $(pkg_timers) $(pkg_misc) $(pkg_reactor) \ - $(pkg_socksap) $(pkg_svcconfig) $(pkg_netsvcs) - -doc: - $(JD) $(JDOPTS) $(packages) - -docclean: - find ${JACE_WRAPPER}/doc -name '*.html' -print | xargs ${RM} - -clean: - find ${JACE_WRAPPER}/classes/JACE -name '*.class' -print | xargs ${RM} - -realclean: clean docclean - - -pkg_asx_timestuff = \ - TimeValue \ - TimeoutException \ - TimedWait - -asx_timestuff: $(addprefix ASX/,$(addsuffix .java,$(pkg_asx_timestuff))) - $(COMPILE.java) - -pkg_asx = \ - IOCntlCmds \ - IOCntlMsg \ - Task \ - TaskFlags \ - ThruTask \ - Module \ - MessageType \ - MessageBlock \ - MessageQueue \ - StreamHead \ - StreamTail \ - Stream - -asx: os asx_timestuff reactor concurrency \ - $(addprefix ASX/,$(addsuffix .java,$(pkg_asx))) - $(COMPILE.java) - -pkg_os = \ - OS \ - ACE - -os: $(addprefix OS/,$(addsuffix .java,$(pkg_os))) - $(COMPILE.java) - -pkg_concurrency = \ - AbstractLock \ - LockAdapter \ - LockException \ - WaitObject \ - RenewObject \ - Condition \ - Mutex \ - RWMutex \ - Semaphore \ - ThreadManager \ - Token - -concurrency: $(addprefix Concurrency/,$(addsuffix .java,\ - $(pkg_concurrency))) asx_timestuff os - $(COMPILE.java) - -pkg_connection = \ - SvcHandler \ - Acceptor \ - Connector \ - AcceptStrategy \ - ActivateStrategy \ - CreationStrategy \ - StrategyAcceptor \ - Blob \ - BlobHandler \ - BlobReader \ - BlobWriter \ - HTTPHelper - -connection: os socksap svcconfig $(addprefix Connection/,\ - $(addsuffix .java,$(pkg_connection))) - $(COMPILE.java) - -pkg_timers = \ - ProfileTimer - -timers: $(addprefix Timers/,$(addsuffix .java,$(pkg_timers))) - $(COMPILE.java) - -pkg_misc = \ - GetOpt - -misc: $(addprefix Misc/,$(addsuffix .java,$(pkg_misc))) - $(COMPILE.java) - -pkg_reactor = \ - EventHandler \ - TimerQueue - -reactor: asx_timestuff $(addprefix Reactor/,\ - $(addsuffix .java,$(pkg_reactor))) - $(COMPILE.java) - -pkg_socksap = \ - INETAddr \ - SOCKStream \ - SOCKAcceptor \ - SOCKConnector - -socksap: os $(addprefix SOCK_SAP/,\ - $(addsuffix .java,$(pkg_socksap))) - $(COMPILE.java) - -pkg_svcconfig = \ - Service \ - ServiceLoader \ - ServiceObject \ - ServiceConfig \ - ServiceRepository - -svcconfig: os reactor misc $(addprefix ServiceConfigurator/,\ - $(addsuffix .java,$(pkg_svcconfig))) - $(COMPILE.java) - -netsvcs: netsvcs_base netsvcs_logger netsvcs_naming netsvcs_time \ - netsvcs_token - -pkg_netsvcs = $(pkg_netsvcs_base) $(pkg_netsvcs_logger) \ - $(pkg_netsvcs_time) $(pkg_netsvcs_naming) $(pkg_netsvcs_token) - -pkg_netsvcs_base = \ - Server \ - Handler - -netsvcs_base: os asx concurrency connection socksap svcconfig \ - $(addprefix netsvcs/,$(addsuffix .java,$(pkg_netsvcs_base))) - $(COMPILE.java) - -pkg_netsvcs_logger = \ - LogRecord \ - LoggingStrategy \ - StderrStrategy \ - ServerLoggingHandler \ - ServerLoggingAcceptor - -netsvcs_logger: netsvcs_base $(addprefix netsvcs/Logger/,\ - $(addsuffix .java,$(pkg_netsvcs_logger))) - $(COMPILE.java) - -pkg_netsvcs_naming = \ - NameRequest \ - NameReply \ - NameProxy \ - NameHandler \ - NameAcceptor - -netsvcs_naming: netsvcs_base $(addprefix netsvcs/Naming/,\ - $(addsuffix .java,$(pkg_netsvcs_naming))) - $(COMPILE.java) - -pkg_netsvcs_time = \ - TimeInfo \ - TimeRequest \ - TSClerkHandler \ - TSClerkProcessor \ - TSServerHandler \ - TSServerAcceptor - -netsvcs_time: netsvcs_base $(addprefix netsvcs/Time/,\ - $(addsuffix .java,$(pkg_netsvcs_time))) - $(COMPILE.java) - -pkg_netsvcs_token = \ - TokenRequest \ - TokenReply \ - TokenRequestHandler \ - LockHandler \ - LockHandlerAdapter \ - LockOperations \ - LockTypes \ - TokenAcceptor \ - RemoteLock \ - RemoteMutex \ - RemoteRWMutex \ - MutexHandler \ - RWMutexHandler - -netsvcs_token: netsvcs_base $(addprefix netsvcs/Token/,\ - $(addsuffix .java,$(pkg_netsvcs_token))) - $(COMPILE.java) - -packages = \ - JACE.ASX \ - JACE.Connection \ - JACE.Concurrency \ - JACE.Misc \ - JACE.OS \ - JACE.Reactor \ - JACE.SOCK_SAP \ - JACE.ServiceConfigurator \ - JACE.Timers \ - JACE.netsvcs \ - JACE.netsvcs.Logger \ - JACE.netsvcs.Naming \ - JACE.netsvcs.Time \ - JACE.netsvcs.Token diff --git a/java/JACE/Misc/GetOpt.java b/java/JACE/Misc/GetOpt.java deleted file mode 100644 index e373baedb67..00000000000 --- a/java/JACE/Misc/GetOpt.java +++ /dev/null @@ -1,171 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Misc - * - * = FILENAME - * GetOpt.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.Misc; - -import java.io.*; -import java.util.Hashtable; -import java.util.StringTokenizer; - -/** - * Iterator for parsing command-line arguments. - * <P> - * This version of `get_opt' appears to the caller like standard - * Unix `get_opt' but it behaves differently for the user, since - * it allows the user to intersperse the options with the other - * arguments. - * - * <p> As `get_opt' works, it permutes the elements of `argv' so that, - * when it is done, all the options precede everything else. Thus - * all application programs are extended to handle flexible argument - * order. - */ -public class GetOpt -{ - /** - * Constructor - *@param args command line arguments - *@param optstring string containing the legitimate option - * characters. A colon in optstring means that the previous character - * is an option that wants an argument which is then taken from the - * rest of the current args-element. Here is an example of what - * optstring might look like: "c:dP:p". - */ - public GetOpt (String[] args, String optstring) - { - this (args, optstring, false); - } - - /** - * Constructor - *@param args command line arguments - *@param optstring string containing the legitimate option - * characters. A colon in optstring means that the previous character - * is an option that wants an argument which is then taken from the - * rest of the current args-element. Here is an example of what - * optstring might look like: "c:dP:p". - *@param returnAllArgs specify true if next() should return any - * arguments, even if not in the optstring. This is useful for - * providing an error message. - */ - public GetOpt (String[] args, String optstring, boolean returnAllArgs) - { - returnAllArgs_ = returnAllArgs; - - // Cache the arguments - this.args_ = args; - this.hasArg_ = false; - - // Build the arg hashtable - this.buildArgTable (optstring); - } - - /** - * Scan elements specified in optstring for next option flag. - *@return The character corresponding to the next flag. - */ - public int next () - { - if (this.args_ == null) - return -1; - - if (this.index_ < this.args_.length) - { - String arg = this.args_[this.index_++]; - - // Make sure flag starts with "-" - if (!arg.startsWith ("-")) - return -1; - - // Check if there is more than one character specified as flag - if (arg.length () > 2) - return -1; - - // So far so good - // Check if the flag is in the arg_table and if it is get the - // associated binding. - Character c = (Character) this.argTable_.get - (new Character (arg.charAt (1))); - - if (c == null) { - if (returnAllArgs_) - return arg.charAt (1); - else - return -1; - } - - if (c.charValue () == '#') - { - this.hasArg_ = false; - return arg.charAt (1); - } - else if (c.charValue () == ':') - { - this.hasArg_ = true; - return arg.charAt (1); - } - else // This should not happen - return -1; - } - return -1; - } - - /** - * Get the argument (if any) associated with the flag. - *@return the argument associated with the flag. - */ - public String optarg () - { - if (this.hasArg_) - return this.args_[this.index_++]; - else - return null; - } - - // Build the argument table - private void buildArgTable (String s) - { - this.argTable_ = new Hashtable (); - StringTokenizer tokens = new StringTokenizer (s, ":"); - while (tokens.hasMoreTokens ()) - { - // Get the next token - String t = tokens.nextToken (); - - // First add all flags except the one with ":" after it - // Note "#" is an arbitrary character we use to distinguish - // the two cases - for (int i = 0; i < t.length () - 1; i++) - this.argTable_.put (new Character (t.charAt (i)), - new Character ('#')); - - // Now Add the flag just before ":" to the arg_table - this.argTable_.put (new Character (t.charAt (t.length () - 1)), - new Character (':')); - } - } - - private String [] args_; - // Copy of the args passed in - - private boolean hasArg_; - // Indicator that the flag has an argument following it - - private int index_; - // Index into the array of arguments - - private Hashtable argTable_; - // Table of flags that take arguments after them - - private boolean returnAllArgs_; - // When true, GetOpt returns arguments even if not present in the - // given optstring. -} diff --git a/java/JACE/Misc/package.html b/java/JACE/Misc/package.html deleted file mode 100644 index 31803472e19..00000000000 --- a/java/JACE/Misc/package.html +++ /dev/null @@ -1,6 +0,0 @@ -<!-- $Id$ --> -<HTML> -<BODY> -Miscellaneous utility classes. -</BODY> -</HTML> diff --git a/java/JACE/OS/ACE.java b/java/JACE/OS/ACE.java deleted file mode 100644 index 3979fa6c2d2..00000000000 --- a/java/JACE/OS/ACE.java +++ /dev/null @@ -1,156 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.OS - * - * = FILENAME - * JACE.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.OS; - -/** - * Constants, utility "functions", etc. - * <P> - * Defines default constants for ACE. Many of these are used for the - * ACE tests and applications. You may want to change some of these to - * correspond to your environment. Also, routines for error handling, - * debugging and bit manipulation are included. - * <P> - * This class is non-instantiable, and intended only to provide a constrained - * namespace. - */ -public abstract class ACE -{ - /** - * Default port on which a server listens for connections. - */ - public static final int DEFAULT_SERVER_PORT = 10002; - - /** - * Default name to use for a thread group. - */ - public static final String DEFAULT_THREAD_GROUP_NAME = "ace_thread_group"; - - /** - * Disable debugging. Once debugging is disabled, all ACE.DEBUG - * statements would be ignored. - */ - public static final void disableDebugging () - { - ACE.debug_ = false; - } - - /** - * Enable debugging. Once debugging is enabled, all ACE.DEBUG - * statements get printed. - */ - public static final void enableDebugging () - { - ACE.debug_ = true; - } - - /** - * Print the string representation of Java Exception. - *@param e Java exception - */ - public static final void ERROR (Exception e) - { - System.err.println (e); - } - - /** - * Print the string being passed in. - *@param s a Java String - */ - public static final void ERROR (String s) - { - System.err.println (s); - } - - /** - * Print the string being passed in. - *@param s A Java String - *@return Error value passed in - */ - public static final int ERROR_RETURN (String s, int errorVal) - { - System.err.println (s); - return errorVal; - } - - /** - * Print the string being passed in. Note the behavior will vary - * depending upon whether debugging is enabled or disabled. - *@param s a Java String - */ - public static final void DEBUG (String s) - { - if (ACE.debug_) - System.out.println (s); - } - - /** - * Flush out any data that may be buffered. - */ - public static final void FLUSH () - { - System.out.flush (); - } - - /** - * Set the bits of WORD using BITS as the mask. - *@param WORD the bits to be set. - *@param BITS the mask to use. - *@return The value obtained after setting the bits. - */ - public static final long SET_BITS (long WORD, long BITS) - { - return WORD | BITS; - } - - /** - * Clear the bits of WORD using BITS as the mask. - *@param WORD the bits to clear. - *@param BITS the mask to use. - *@return The value obtained after clearing the bits. - */ - public static final long CLR_BITS (long WORD, long BITS) - { - return WORD & ~BITS; - } - - /** - * Check if bits are enabled in WORD. - *@param WORD the bits to check. - *@param BIT the bit to check to see if it is enabled or not. - *@return true if bit is enabled, false otherwise. - */ - public static final boolean BIT_ENABLED (long WORD, long BIT) - { - return (WORD & BIT) != 0; - } - - /** - * Check if bits are disabled in WORD. - *@param WORD the bits to check. - *@param BIT the bit to check to see if it is disabled or not. - *@return true if bit is disabled, false otherwise. - */ - public static final boolean BIT_DISABLED (long WORD, long BIT) - { - return (WORD & BIT) == 0; - } - - // Debug flag (turn debugging on/off) - private static boolean debug_ = false; - - // Default private constructor to avoid instantiation - private ACE () - { - } -} - - diff --git a/java/JACE/OS/OS.java b/java/JACE/OS/OS.java deleted file mode 100644 index 3f15a028cc2..00000000000 --- a/java/JACE/OS/OS.java +++ /dev/null @@ -1,65 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.OS - * - * = FILENAME - * OS.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.OS; - -import java.util.StringTokenizer; - -/** - * Methods to extend the capabilities of the Java runtime system. - * <P> - * This non-instantiable class contains little <q>utility functions</q> - * that should have been in Java to begin with :-) - */ -public class OS -{ - /** - * Create an array of Strings from a single String using <delim> as - * the delimiter. - *@param args the String to break up to make an array of Strings - *@param delim the delimeter to use to break the String up - *@return an array containing the original String broken up - */ - public static String [] createStringArray (String args, String delim) - { - // First determine the number of arguments - int count = 0; - StringTokenizer tokens = new StringTokenizer (args, delim); - while (tokens.hasMoreTokens ()) - { - tokens.nextToken (); - count++; - } - if (count == 0) - return null; - - // Create argument array - String [] argArray = new String [count]; - int index = 0; - tokens = new StringTokenizer (args, " "); - while (tokens.hasMoreTokens ()) - { - argArray [index] = tokens.nextToken (); - index++; - } - - // Assert index == count - if (index != count) - return null; - else - return argArray; - } - - // Default private constructor to avoid instantiation - private OS () - { - } -} diff --git a/java/JACE/OS/package.html b/java/JACE/OS/package.html deleted file mode 100644 index 01245ef0b51..00000000000 --- a/java/JACE/OS/package.html +++ /dev/null @@ -1,6 +0,0 @@ -<!-- $Id$ --> -<HTML> -<BODY> -Extensions to the Java runtime system. -</BODY> -</HTML> diff --git a/java/JACE/Reactor/EventHandler.java b/java/JACE/Reactor/EventHandler.java deleted file mode 100644 index 220f999fcb5..00000000000 --- a/java/JACE/Reactor/EventHandler.java +++ /dev/null @@ -1,43 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Reactor - * - * = FILENAME - * EventHandler.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.Reactor; - -import JACE.ASX.TimeValue; - -/** - * Provides an abstract interface for handling timer events. - * <P> - * Classes implementing this interface handle a timer's - * expiration. - * <P> - * Users of C++ ACE will notice that this defines a substantially - * smaller interface than the C++ counterpart. Signal events are - * absent due to the complete absence of this feature from Java itself. - * Moreover, at this point - * there is still some question regarding whether or not the I/O - * portion will make any sense or fit into the Java model for I/O. - * - *@see JACE.Reactor.TimerQueue - *@see JACE.Reactor - */ -public interface EventHandler -{ - /** - * Called when timer expires. - *@param tv Time Value for which timer was set - *@param obj An arbitrary object that was passed to the Timer Queue - * (Asynchronous Completion Token) - */ - public int handleTimeout (TimeValue tv, Object obj); -} - -// Note that more methods will be added as needed diff --git a/java/JACE/Reactor/TimerQueue.java b/java/JACE/Reactor/TimerQueue.java deleted file mode 100644 index 638cffe3391..00000000000 --- a/java/JACE/Reactor/TimerQueue.java +++ /dev/null @@ -1,437 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Reactor - * - * = FILENAME - * TimerQueue.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.Reactor; - -import java.util.*; -import JACE.ASX.*; - -import JACE.OS.*; - -/** - * Timer Queue implementation which calls back to the handleTimeout - * method on EventHandler implementations when their timers expire. - * <P> - * This is a simple implementation that keeps a linked list of - * absolute timers. It allows multiple timers to be scheduled - * and returns a timer id for each timer scheduled. In addition, - * it allows periodic timers to be scheduled. - * <P> - * Note that timeouts given to the TimerQueue are relative time - * ("2 seconds from now", etc). - */ -public class TimerQueue implements Runnable -{ - static class TimerNode - { - public TimerNode (EventHandler handler, - Object arg, - TimeValue timerValue, - TimeValue interval, - TimerNode next, - int timerId) - { - this.handler_ = handler; - this.arg_ = arg; - this.timerValue_ = timerValue; - this.interval_ = interval; - this.next_ = next; - this.timerId_ = timerId; - } - - public EventHandler handler_; - // Handler to invoke <handleTimeout> on when a timeout occurs. - - public Object arg_; - // Argument to pass to <handleTimeout>. - - public TimeValue timerValue_; - // Time until the timer expires. - - public TimeValue interval_; - // If this is a periodic timer this holds the time until the next - // timeout. - - public TimerNode next_; - // Pointer to next timer. - - public int timerId_; - // Id of this timer (used to cancel timers before they expire). - } - - static class WaitObject extends TimedWait - { - public boolean condition () - { - return this.condition_; - } - - public void condition (boolean c) - { - this.condition_ = c; - } - - private boolean condition_ = false; - } - - /** - * Constructor. The caller is responsible for calling handleEvents () - * to run the event loop. - */ - public TimerQueue () - { - this (false); - } - - /** - * Constructor. - *@param createInternalThread flag specifying whether to create an - * internal thread that runs the event loop. If it is true, a thread - * is spawned and it runs the event loop, handling all timeout - * events. If it is false, the caller is then responsible for calling - * handleEvents () to run the event loop. The thread that is created - * is set to be a daemon thread. - */ - public TimerQueue (boolean createInternalThread) - { - this.eventLoopRunning_ = false; - if (createInternalThread) { - Thread queueThread = new Thread (this, "Timer Queue"); - queueThread.setDaemon (true); - queueThread.start (); - } - } - - /** - * The thread run method. Do *NOT* call this method! It gets called - * automatically. - */ - public void run () - { - this.handleEvents (); - } - - /** - * Handle timeout events. This forms the event loop and takes care - * of all scheduling. This method should only be called if the Timer - * Queue was constructed with the value of createInternalThread as - * false. - */ - public void handleEvents () - { - if (!this.eventLoopRunning_) - { - // Set the flag indicating that the event loop is now running - this.eventLoopRunning_ = true; - - for (;;) - { - synchronized (this.obj_) - { - try { - // Extract the earliest time from the queue and do a - // timed wait - - this.obj_.timedWait (this.earliestTime ()); - - // We have been notified. Check to see if we need to - // restart the wait with a different timeout - if (this.reset_) - { - this.reset_ = false; - this.obj_.condition (false); - } - - } catch (TimeoutException e) { - // Timeout occurred. Call handleTimeout on appropriate - // Event Handlers - this.dispatchHandlers (); - - } catch (InterruptedException e) { - ACE.ERROR ("TimerQueue was interrupted"); - return; - } - } - } - } - } - - /** - * Check if the queue is empty. - *@return true if queue is empty, else false. - */ - boolean isEmpty () - { - return this.head_ == null; - } - - /** - * Get the node of the earliest node in the TimerQueue. - *@return the time of the earlier node in the TimerQueue. - */ - TimeValue earliestTime () - { - synchronized (this.obj_) - { - if (!this.isEmpty ()) - return this.head_.timerValue_; - else - return null; - } - } - - /** - * Schedule an <EventHandler> that will expire after <delta> amount - * of time. If it expires then <obj> is passed in as the value to - * the <EventHandler>'s <handleTimeout> callback method. This method - * returns a timer id that uniquely identifies the timer and can be - * used to cancel the timer before it expires. - *@param handler Event Handler that is to be scheduled with the timer - *@param obj Object that is passed back to the Event Handler when - * timeout occurs (Asynchronous Completion Token) - *@param delta amount of time for which to schedule the timer - *@return id of the timer scheduled - */ - public int scheduleTimer (EventHandler handler, - Object obj, - TimeValue delta) - { - return this.scheduleTimer (handler, obj, delta, TimeValue.zero); - } - - /** - * Schedule an <EventHandler> that will expire after <delta> amount - * of time. If it expires then <obj> is passed in as the value to - * the <EventHandler>'s <handleTimeout> callback method. If - * <interval> is != to <TimeValue.zero> then it is used to - * reschedule the <EventHandler> automatically. This method - * returns a timer id that uniquely identifies the timer and can be - * used to cancel the timer before it expires. - *@param handler Event Handler that is to be scheduled with the timer - *@param arg Object that is passed back to the Event Handler when - * timeout occurs (Asynchronous Completion Token) - *@param timeout amount of time for which to schedule the timer - *@param interval amount of time to use to reschedule the timer - *@return id of the timer scheduled - */ - public int scheduleTimer (EventHandler handler, - Object arg, - TimeValue timeout, - TimeValue interval) - { - - // Increment the sequence number (it will wrap around). - this.timerId_++; - - ACE.DEBUG("scheduleTimer (" + this.timerId_ + "): " + - timeout + ", " + interval); - - - TimeValue futureTime = TimeValue.plus (timeout, TimeValue.getTimeOfDay ()); - TimerNode node = new TimerNode (handler, - arg, - futureTime, - interval, - null, - this.timerId_); - synchronized (this.obj_) - { - // Check if event loop is running. If it is not, then we can - // just place it at the appropriate place in the queue and - // don't need to do any notification. If event loop is - // running, then check if the node is the first node in the - // queue (either because the queue is empty or because the - // time for the node is earlier than the currently scheduled - // timer node). - if (this.eventLoopRunning_ && - (this.isEmpty () || futureTime.lessThan (this.earliestTime ()))) - { - // Insert the node into (the beginning of) the queue to be - // scheduled. - this.reschedule (node); - - // Notify the waiting thread so that it can reschedule - // using the earliest timeout - this.obj_.notify (); - } - else // Place in the appropriate position in the queue. - { - this.reschedule (node); - } - } - return this.timerId_; - } - - - /** - * Cancel the single timer associated with <timerId>. - *@param timerId id of the timer that needs to be cancelled. - *@return Object that was passed in when timer was scheduled - * (Asynchronous Completion Token). - */ - public Object cancelTimer (int timerId) - { - TimerNode prev = null; - TimerNode curr = null; - - synchronized (this.obj_) - { - // Try to locate the TimerNode that matches the timerId. - for (curr = this.head_; - curr != null && curr.timerId_ != timerId; - curr = curr.next_) - prev = curr; - - if (curr != null) - { - if (prev == null) - this.head_ = curr.next_; - else - prev.next_ = curr.next_; - - return curr.arg_; - } - } - return null; - } - - /** - * Cancel all timers associated with <Event Handler>. - *@param handler Event Handler whose associated timers need to be cancelled. - */ - public void cancelTimer (EventHandler handler) - { - TimerNode prev = null; - TimerNode curr = this.head_; - - synchronized (this.obj_) - { - while (curr != null) - { - if (curr.handler_ == handler) - { - if (prev == null) - { - this.head_ = curr.next_; - curr = this.head_; - } - else - { - prev.next_ = curr.next_; - curr = prev.next_; - } - } - else - { - prev = curr; - curr = curr.next_; - } - } - } - } - - // Call handleTimeout() on all handlers whose timers have expired. - private void dispatchHandlers () - { - TimeValue currentTime = TimeValue.getTimeOfDay (); - - for (;;) - { - if (this.isEmpty () || this.earliestTime ().greaterThan (currentTime)) - break; // There aren't any more timers eligible to expire. - - TimerNode expired = this.head_; - EventHandler handler = expired.handler_; - Object arg = expired.arg_; - int result; - - this.head_ = this.head_.next_; - - // Check whether this is an interval timer. - if (expired.interval_.greaterThan (TimeValue.zero)) - { - // Make sure that we skip past values that have already - // "expired". - do - expired.timerValue_.plusEquals (expired.interval_); - while (expired.timerValue_.lessThanEqual (currentTime)); - - // Since this is an interval timer, we need to reschedule - // it. - this.reschedule (expired); - } - - ACE.DEBUG("Calling handleTimeout for ID " + expired.timerId_); - - // Perform the callback. - result = handler.handleTimeout (currentTime, arg); - - if (result == -1) - this.cancelTimer (handler); - } - } - - // Reschedule a TimerNode by inserting it at the appropriate - // position in the queue. - private void reschedule (TimerNode expired) - { - if (this.isEmpty () || - expired.timerValue_.lessThan (this.earliestTime ())) - { - expired.next_ = this.head_; - this.head_ = expired; - // Set the condition to true so that the waiting thread can be - // notified and it can reschedule. - this.obj_.condition (true); - this.reset_ = true; - } - else - { - TimerNode prev = this.head_; - TimerNode after = this.head_.next_; - - // Locate the proper position in the queue. - - while (after != null - && expired.timerValue_.greaterThan (after.timerValue_)) - { - prev = after; - after = after.next_; - } - - expired.next_ = after; - prev.next_ = expired; - } - } - - public boolean eventLoopRunning () - { - return eventLoopRunning_; - } - - private WaitObject obj_ = new WaitObject (); - // Synchronization object (as well as object to use to do wait on) - - private TimerNode head_; - // Pointer to linked list of TimerHandles. - - private int timerId_; - // Keeps track of the timer id that uniquely identifies each timer. - // This id can be used to cancel a timer via the <cancel (int)> - // method. - - private boolean reset_; - // Flag indicating whether to start the wait again - - private boolean eventLoopRunning_; - // Flag indicating whether the event loop is running or not -} - diff --git a/java/JACE/Reactor/package.html b/java/JACE/Reactor/package.html deleted file mode 100644 index 8cf9b2a941a..00000000000 --- a/java/JACE/Reactor/package.html +++ /dev/null @@ -1,6 +0,0 @@ -<!-- $Id$ --> -<HTML> -<BODY> -Timer queue implementation and a system for handling timeout events. -</BODY> -</HTML> diff --git a/java/JACE/SOCK_SAP/INETAddr.java b/java/JACE/SOCK_SAP/INETAddr.java deleted file mode 100644 index 11b74a2b0ba..00000000000 --- a/java/JACE/SOCK_SAP/INETAddr.java +++ /dev/null @@ -1,96 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.SOCK_SAP - * - * = FILENAME - * INETAddr.java - * - *@author Chris Cleeland - * - *************************************************/ -package JACE.SOCK_SAP; - -import java.io.*; -import java.net.*; -import JACE.OS.*; - -/** - * Defines an endpoint of a connection, encapsulating host and port. - * This is only a part-way implementation of C++ ACE's ACE_INET_Addr. - * <P> - * Currently the class is very limited in its capabilities; it will - * be expanded in future revisions of ACE. - */ -public class INETAddr // extends Addr -{ - private InetAddress addr_; - private int port_ = 0; - /** - */ - public INETAddr () - { - // Do nothing constructor - } - - /** - * Create an INETAddr from a port/hostname - *@param port port number to connect with server at - *@param hostname hostname of the server - */ - public INETAddr (int port, String hostname) throws UnknownHostException - { - super(); - port_ = port; - addr_ = InetAddress.getByName(hostname); - // Should really use getAllByName(), - // but I don't think we do that in - // C++ ACE, even. - } - - /** - * Create an INETAddr from an address. - * @param address an address in the form "ip-number:port-number", <em>e.g.</em> <pre>tango.cs.wustl.edu:1234</pre> or <pre>128.252.166.57:1234</pre>; if no ':' is present address is assumed to be <b>INADDR_ANY</b> and address contains only the port number - * @throws UnknownHostException - */ - public INETAddr (String address) throws UnknownHostException - { - int colon = address.indexOf(':'); - if (colon != 0) - { - addr_ = InetAddress.getByName(address.substring(0, colon)); - address = address.substring(colon+1); - } - - port_ = Integer.parseInt(address); - } - - /** - * Return the name of the host. - */ - public String getHostName() - { - return addr_.getHostName(); - } - - /** - * Return the dotted Internet address. - */ - public String getHostAddr() - { - return addr_.toString(); - } - - /** - * Return the port number. - */ - public int getPortNumber() - { - return port_; - } - - public String toString() - { - return getHostAddr() + Integer.toString(port_); - } -} diff --git a/java/JACE/SOCK_SAP/SOCKAcceptor.java b/java/JACE/SOCK_SAP/SOCKAcceptor.java deleted file mode 100644 index dc9e12c8496..00000000000 --- a/java/JACE/SOCK_SAP/SOCKAcceptor.java +++ /dev/null @@ -1,113 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.SOCK_SAP - * - * = FILENAME - * SOCKAcceptor.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.SOCK_SAP; - -import java.io.*; -import java.net.*; -import JACE.OS.*; - -/** - * Defines a factory that creates new SOCKStreams passively. - */ -public class SOCKAcceptor -{ - // = Initialization - - /** - * Create a SOCKAcceptor. Do nothing constructor. Allows user to - * call open() later and pass in the port number. - */ - public SOCKAcceptor () - { - } - - /** - * Create a SOCKAcceptor. - *@param port port number where the server will listen for connections - */ - public SOCKAcceptor (int port) throws IOException - { - this.open (port); - } - - /** - * Create socket to listen for connections on. - *@param port port number where the server will listen for connections - */ - public void open(int port) throws IOException - { - // Close old socket (if there is one) - this.close (); - - // Create a new server socket - this.listenSocket_ = new ServerSocket (port); - // ACE.DEBUG ("Server listening on port " + port); - } - - /** - * Close the socket and do any necessary cleanup. - */ - public void close () throws IOException - { - if (this.listenSocket_ != null) - { - this.listenSocket_.close (); - this.listenSocket_ = null; - } - } - - /** - * Accept a connection. The streams are set when the method returns. - *@param sockStream SOCK Stream to use for the connection - */ - public void accept (SOCKStream sockStream) throws SocketException, IOException - { - // Block in accept. Returns when a connection shows up and sets - // the streams - sockStream.socket (this.listenSocket_.accept ()); - ACE.DEBUG ("Accepted connection from " + - sockStream.socket ().getInetAddress ()); - } - - /** - * Get the underlying listen socket. - *@return the underlying listen socket - */ - public ServerSocket listenSocket () - { - return this.listenSocket_; - } - - /** - * Set the underlying listen socket. - *@param s the underlying listen socket - */ - public void listenSocket (ServerSocket s) - { - this.listenSocket_ = s; - } - - /** - * Clean up when the garbage collector gets run (if at all). Note - * that there is no guarantee that finalize () will get called. - *@exception Throwable (Probably IOException from the socket level) - */ - protected void finalize () throws Throwable - { - super.finalize (); - this.close (); - } - - // Socket on which listen for connections (by default initialized to - // null) - private ServerSocket listenSocket_; -} diff --git a/java/JACE/SOCK_SAP/SOCKConnector.java b/java/JACE/SOCK_SAP/SOCKConnector.java deleted file mode 100644 index cc3a558f77f..00000000000 --- a/java/JACE/SOCK_SAP/SOCKConnector.java +++ /dev/null @@ -1,73 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.SOCK_SAP - * - * = FILENAME - * SOCKConnector.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.SOCK_SAP; - -import java.io.*; -import java.net.*; -import JACE.OS.*; - -/** - * Defines an active connection factory for the socket wrappers. - */ -public class SOCKConnector -{ - // = Initialization - - /** - * Create a SOCKConnector. Do nothing constructor. Allows user to - * call connect() later. - */ - public SOCKConnector () - { - // Do nothing constructor - } - - /** - * Create a SOCKConnector and connect to the server. - *@param sockStream SOCK Stream to use for the connection - *@param hostname hostname of the server - *@param port port number to connect with server at - */ - public SOCKConnector (SOCKStream sockStream, - String hostname, - int port) throws SocketException, IOException - { - this.connect (sockStream, - hostname, - port); - } - - /** - * Connect to the server. - *@param sockStream SOCK Stream to use for the connection - *@param hostname hostname of the server - *@param port port number to connect with server at - */ - public void connect (SOCKStream sockStream, - String hostname, - int port) throws SocketException, IOException - { - sockStream.socket (new Socket (hostname, port)); - } - - /** - * Connect to the server. - *@param sockStream SOCK Stream to use for the connection - *@param addr INETAddr instance specifying host/port - */ - public void connect (SOCKStream sockStream, - INETAddr addr) throws SocketException, IOException - { - sockStream.socket (new Socket (addr.getHostName(), - addr.getPortNumber())); - } -} diff --git a/java/JACE/SOCK_SAP/SOCKStream.java b/java/JACE/SOCK_SAP/SOCKStream.java deleted file mode 100644 index 05e2535e62a..00000000000 --- a/java/JACE/SOCK_SAP/SOCKStream.java +++ /dev/null @@ -1,227 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.SOCK_SAP - * - * = FILENAME - * SOCKStream.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.SOCK_SAP; - -import java.io.*; -import java.net.*; -import JACE.OS.*; - -/** - * This adds additional wrapper methods atop the java Socket class. - */ -public class SOCKStream -{ - /** - * Create a default SOCK Stream. Do nothing constructor. - */ - public SOCKStream () - { - } - - /** - * Create a SOCK Stream. - *@param s Socket to initialize SOCK Stream with. - */ - public SOCKStream (Socket s) throws IOException - { - this.socket (s); - } - - /** - * Set the socket and the underlying streams. - *@param s Socket associated with the SOCK Stream. - */ - public void socket (Socket s) throws IOException - { - this.socket_ = s; - // Note that if s is not a valid socket or is null, the - // following calls will throw exceptions - - this.iStream_ = - new DataInputStream(new BufferedInputStream(s.getInputStream())); - - this.oStream_ = - new DataOutputStream(new BufferedOutputStream(s.getOutputStream())); - } - - /* Get the underlying Socket. - *@return the underlying socket - */ - public Socket socket () - { - return this.socket_; - } - - /** - * Close the streams and the underlying socket. - */ - public void close () throws IOException - { - if (this.socket_ != null) - this.socket_.close (); - this.socket_ = null; - } - - // = The following send and recv methods are overloaded to provide a - // flexible interface - - /** - * Send a StringBuffer. Note that the method blocks. - *@param s the StringBuffer to send - *@return the length of the StringBuffer - */ - public int send (StringBuffer s) throws IOException - { - // Get the data out - String buf = s.toString (); - - //this.oStream_.println(buf); - this.oStream_.writeChars(buf.toString()); - this.oStream_.writeChar('\n'); - this.oStream_.flush (); - - return buf.length (); - } - - /** - * Send a String. Note that the method blocks. - *@param s the String to send - *@return the length of the String - */ - public int send (String s) throws IOException - { - this.oStream_.writeChars(s); - this.oStream_.writeChar('\n'); - - //this.oStream_.println(s); - this.oStream_.flush(); - - return s.length (); - } - - /** - * Send an array of bytes. Note that the method blocks. - *@param b array of bytes to send - *@param offset offset into the byte array to start sending from - *@param length number of bytes to send - *@return number of bytes sent - */ - public int sendN (byte[] b, int offset, int length) throws IOException - { - this.oStream_.write (b, offset, length); - this.oStream_.flush (); - return length; - } - - /** - * Receive data and append it to the StringBuffer that was passed - * in. Note that the method blocks. - *@param s the StringBuffer to append the result of the recv to - *@return the length of the String received - */ - public int recv (StringBuffer s) throws IOException - { - int len = 0; - char in = (char)this.iStream_.readByte(); - - while (in != '\n') { - s.append(in); - in = (char)this.iStream_.readByte(); - len++; - } - - return len; - } - - /** - * Receive an array of characters. This method blocks until either - * all the bytes are read, the end of the stream is detected, or - * an exception is thrown. - *@param b byte array to receive the data in - *@param offset the start offset of the data in the byte array. - *@param n number of bytes to receive - *@return n - */ - public int recvN (byte[] b, int offset, int n) throws IOException - { - this.iStream_.readFully (b, offset, n); - return n; - } - - /** - * Set the underlying input stream. - *@param iStream the input stream - */ - public void inputStream (InputStream iStream) - { - this.iStream_ = new DataInputStream(new BufferedInputStream(iStream)); - } - - /** - * Get the underlying input stream. - *@return the underlying input stream - */ - public InputStream inputStream () - { - return this.iStream_; - } - - /** - * Set the underlying output stream. - *@param iStream the output stream - */ - public void outputStream (OutputStream oStream) - { - this.oStream_ = new DataOutputStream(new BufferedOutputStream(oStream)); - } - - /** - * Get the underlying output stream. - *@return the underlying output stream - */ - public OutputStream outputStream () - { - return this.oStream_; - } - - /** - * Get the underlying stream wrapped in a buffered DataOutputStream - */ - public DataOutputStream dataOutputStream () - { - return this.oStream_; - } - - /** - * Get the underlying stream wrapped in a buffered DataInputStream - */ - public DataInputStream dataInputStream () - { - return this.iStream_; - } - - /** - * Cleanup when the SOCK Stream is garbage collected. - *@exception Throwable (Probably IOException from the socket level) - */ - protected void finalize () throws Throwable - { - super.finalize (); - this.close (); - } - - private Socket socket_; - - // = The input and output streams (by default null) - private DataInputStream iStream_; - private DataOutputStream oStream_; -} diff --git a/java/JACE/SOCK_SAP/package.html b/java/JACE/SOCK_SAP/package.html deleted file mode 100644 index fa4b9346aab..00000000000 --- a/java/JACE/SOCK_SAP/package.html +++ /dev/null @@ -1,8 +0,0 @@ -<!-- $Id$ --> -<HTML> -<BODY> -Wrappers for the sockets system. - -@see JACE.Connection.Acceptor -</BODY> -</HTML> diff --git a/java/JACE/ServiceConfigurator/Service.java b/java/JACE/ServiceConfigurator/Service.java deleted file mode 100644 index fac0b0fc54b..00000000000 --- a/java/JACE/ServiceConfigurator/Service.java +++ /dev/null @@ -1,96 +0,0 @@ -package JACE.ServiceConfigurator; - -/** - * Interface common to all services loaded with the - * Service Configurator. - * <P> - * In order to create a completely new type of service, all that - * is necessary is to implement this interface, and ServiceConfig - * will be able to load it. A concrete example is ServiceObject, - * the base class for the network services. - * <P> - * Implementing classes must also: - * <UL> - * <LI> Provide a default constructor - * <LI> Begin in their own thread (probably in init (String[])) - * </UL> - * <P> - * Implementing classes should also: - * <UL> - * <LI> Shut down completely when close () has been called. That - * means ending thread activity. - * </UL> - * - *@see JACE.ServiceConfigurator.ServiceObject - *@see JACE.ServiceConfigurator.ServiceConfig - *@author Everett Anderson - */ -public interface Service -{ - /** - * Temporarily disable this service. This will only be called for a - * service which returns false from its suspended() method. - * <P> - *@return -1 on failure, 0 on success - */ - int suspend (); - - /** - * Re-enable this service. This will only be called for a service - * which returns true from its suspended() method. - * <P> - *@return -1 on failure, 0 on success - */ - int resume (); - - /** - * Initialize this service. The arguments will be given as if they - * were from the command line, separated into Strings using spaces - * as the delimiters. - * <P> - *@param args set of command line arguments - *@return -1 on failure, 0 on success - */ - int init (String [] args); - - /** - * Close this service and free any internal resources. - * <P> - *@return -1 on failure, 0 on success - */ - int fini (); - - /** - * Provide a status message for this service. - * <P> - *@return status message - */ - String info (); - - /** - * Return the name of this service. The name is typically set - * in ServiceConfig to a name supplied in a configuration file. - * <P> - *@return name of this service - */ - String name (); - - /** - * Set the name of this service. This is typically caled in - * ServiceConfig, setting the name to one supplied in a configuration - * file. - * <P> - *@param name new name for this service - */ - void name (String name); - - /** - * Returns whether or not this service is suspended. The result - * determines whether or not this service's resume() and suspend() - * methods will be called by ServiceConfig. (For instance, while - * a service returns true, its suspend() method will not be called.) - * <P> - *@return true if suspended, else false - */ - boolean suspended (); -} diff --git a/java/JACE/ServiceConfigurator/ServiceConfig.java b/java/JACE/ServiceConfigurator/ServiceConfig.java deleted file mode 100644 index 894cf415f06..00000000000 --- a/java/JACE/ServiceConfigurator/ServiceConfig.java +++ /dev/null @@ -1,482 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.ServiceConfigurator - * - * = FILENAME - * ServiceConfig.java - * - *************************************************/ -package JACE.ServiceConfigurator; - -import java.io.*; -import java.util.*; -import java.net.*; -import JACE.OS.*; -import JACE.Misc.*; - -/** - * Provide the base class that supplies common server daemon - * operations. Also provides a global point for interacting with - * the service repository. Services can be suspended, resumed, - * removed, and reloaded. - * <P> - * ServiceConfig files contain lines of the following forms: - * - * <PRE> - * load (Service Name) (Class Name) (Type) "argument list" (opt URL path) - * - * resume (Service Name) - * suspend (Service Name) - * remove (Service Name) - * - * where (Type) is currently only ServiceObject or Service_Object - * [Note: This is not enforced by the ServiceConfig program, but - * something must be there.] - * </PRE> - * <P> - * <B>Valid command line arguments:</B> - * <PRE> - * -f (filename) Specify name of the service config file - * -d Enable debugging - * -p (URL path) If not found locally, search this URL path - * for classes (multiple -p options allowed) - * </PRE> - * - *@author Prashant Jain - *@author Everett Anderson - */ -public class ServiceConfig -{ - /** Begins the process of loading a service configurator file: - * parses the command line and calls processDirectives - * - *@param args command line arguments to the Service Configurator - *@exception FileNotFoundException Couldn't find service config file - *@exception IOException Problem reading or parsing the config file - *@exception ClassNotFoundException Couldn't find a certain class - *@exception IllegalAccessException Inappropriate method call on a class - *@exception InstantiationException Couldn't create a certain class instance - *@return -1 on failure, 0 on success - */ - public static int open (String [] args) - throws FileNotFoundException, IOException, ClassNotFoundException, - IllegalAccessException, InstantiationException - { - // Parse the command line - if (ServiceConfig.parseArgs (args) < 0) { - printUsage (); - return -1; - } - - return ServiceConfig.processDirectives (); - } - - protected static void printUsage () - { - ACE.ERROR ("Valid options:\n"); - ACE.ERROR ("-f <filename> Specify name of the service config file"); - ACE.ERROR ("-d Enable debugging"); - ACE.ERROR ("-p <URL path> If not found locally, search this URL path"); - ACE.ERROR (" for classes (multiple -p options allowed)"); - } - - /** Parse the command line. - * <P> - * Currently, valid command line options are the following: - * <PRE> - * -d Debug mode - * -f (filename) Load services in the given file - * -p (URL path) If not found locally, search this URL path for classes - * (there can be multiple -p URL options) - * </PRE> - *@param args command line arguments - *@exception ClassNotFoundException Couldn't find a specified Service - *@exception IllegalAccessException Inappropriate method call on a Service - *@exception InstantiationException Couldn't create a Service instance - */ - protected static int parseArgs (String [] args) - throws ClassNotFoundException, IllegalAccessException, - InstantiationException - { - GetOpt getopt = new GetOpt (args, "df:p:", true); - for (int c; (c = getopt.next ()) != -1; ) - switch (c) - { - case 'p': - // Specify a URL path - try { - ServiceConfig.loader_.addURLPath (getopt.optarg ()); - } catch (MalformedURLException e) { - ACE.ERROR ("Invalid URL: " + getopt.optarg ()); - } - break; - /* - Not supported: - - case 'b': - ServiceConfig.beADaemon_ = true; - break; - case 'n': - break; - */ - case 'd': - ACE.enableDebugging (); - ACE.DEBUG ("Debugging is enabled"); - break; - case 'f': - // Specify the file name of the config file - ServiceConfig.serviceConfigFile_ = getopt.optarg (); - break; - default: - ACE.ERROR ((char ) c + " is not a ServiceConfig option"); - return -1; - } - - return 0; - } - - /** - * Uses the Service Repository to suspend a service with the given name. - * - *@param name name of the Service to suspend - *@return -1 on failure, 0 on success - */ - public static int suspend (String name) - { - return ServiceConfig.svcRep_.suspend (name); - } - - /** - * Uses the Service Repository to resume a service with the given name. - * - *@param name name of the Service to resume - *@return -1 on failure, 0 on success - */ - public static int resume (String name) - { - return ServiceConfig.svcRep_.resume (name); - } - - /** - * Removes the specified Service from the Service Repository. - * - *@param name name of the Service to remove - *@return -1 on failure, 0 on success - */ - public static int remove (String name) - { - return ServiceConfig.svcRep_.remove (name); - } - - /** - * Returns the info String from the specified Service. - * - *@param name name of the Service to query - *@return information about the Service - */ - public static String info (String name) - { - return ServiceConfig.svcRep_.info (name); - } - - /** - * Call fini on the specified Service. - * - *@param name name of the Service to shut down - *@return -1 on failure, 0 on success - */ - public static int fini (String name) - { - return ServiceConfig.svcRep_.fini (name); - } - - /** - * Call init on the specified Service. This is only needed - * when a user wants to add a Service to the repository without - * using service config files. - * - *@param name name of the Service to initialize - *@param args command line arguments to pass to the Service - *@return -1 on failure, 0 on success - *@see ServiceConfig#insert - */ - public static int init (String name, String [] args) - { - return ServiceConfig.svcRep_.init (name, args); - } - - /** - * Adds the given Service to the Service Repository. This is - * only needed when a user wants to add a Service to the repository - * without using service config files. - * - *@param service Service to insert - *@see ServiceConfig#init - */ - public static void insert (Service service) - { - ServiceConfig.svcRep_.insert (service); - } - - /** - * Check to see if the specified Service is suspended. - * - *@param name name of the Service to check - *@return true if it is suspended, else false - */ - public static boolean suspended (String name) - { - return ServiceConfig.svcRep_.suspended (name); - } - - /** - * Check to see if the repository contains a service with the given - * name. - * - *@param name name of the Service to check - *@return true if it is in the repository, else false - */ - public static boolean contains (String name) - { - return (ServiceConfig.svcRep_.find (name) == null ? false : true); - } - - /** - * Get an Enumeration of all of the names of the Services in the - * repository. - * - *@return Enumeration of Service names - */ - public static Enumeration serviceNames () - { - return ServiceConfig.svcRep_.serviceNames (); - } - - /** - * Get an Enumeration of all Services in the repository. - * - *@return Enumeration of Services - */ - public static Enumeration services () - { - return ServiceConfig.svcRep_.services (); - } - - /** - * Load a service of the given name, type, and arguments, then - * initialize it with the given arguments. - * - * Should be aware that this could also throw a class cast exception if - * the author of the service didn't implement the Service interface. - * - *@param serviceName name of the service to load - *@param className class name to load - *@param args command line arguments to initialize the service - *@exception ClassNotFoundException couldn't find the specified class file - *@exception IllegalAccessException problem calling a method on the service - *@exception InstantiationException problem creating an instance - *@exception IOException problem reading the class file - *@return -1 on failure, 0 on success - */ - public static int load (String serviceName, - String className, - String [] args) - throws ClassNotFoundException, IllegalAccessException, - InstantiationException, IOException - { - Class svcClass = ServiceConfig.loader_.loadClass (className); - - Service svc = (Service)(svcClass.newInstance()); - - svc.name (serviceName); - - ServiceConfig.svcRep_.insert (svc); - - return ServiceConfig.svcRep_.init (serviceName, args); - } - - /** - * Same as load (String, String, String[]) but creates the - * String array from the given args parameter using the space - * character as a delimiter. - * - */ - public static int load (String serviceName, - String className, - String args) - throws ClassNotFoundException, IllegalAccessException, - InstantiationException, IOException - { - return ServiceConfig.load (serviceName, - className, - OS.createStringArray (args, " ")); - } - - /** - * Parse a service configurator file, creating classes as necessary. - * - *@return -1 on failure, 0 on success - *@exception FileNotFoundException Couldn't find the file - *(default "svc.conf") - *@exception IOException Problem reading/parsing - *@exception ClassNotFoundException Couldn't find a certain class - *@exception IllegalAccessException Inappropriate method call - *@exception InstantiationException Couldn't create a class instance - */ - protected static int processDirectives () - throws FileNotFoundException, IOException, ClassNotFoundException, - IllegalAccessException, InstantiationException - { - ACE.DEBUG("Processing directives in file " + - ServiceConfig.serviceConfigFile_); - - File configFile = new File (ServiceConfig.serviceConfigFile_); - - // Check if file exists and is a normal file - if (!configFile.exists () || !configFile.isFile ()) - throw new FileNotFoundException ("File " + - ServiceConfig.serviceConfigFile_ + - " not found"); - - // Check if the file is readable - if (!configFile.canRead ()) - throw new IOException ("File " + - ServiceConfig.serviceConfigFile_ + - " not readable"); - - // Set up the stream - FileInputStream fileIn = new FileInputStream (configFile); - - // Parse the file - Reader r = new BufferedReader(new InputStreamReader(fileIn)); - StreamTokenizer in = new StreamTokenizer (r); - - // Set characters in ASCII range 32 to 47, ASCII range 91 to 96, - // and ASCII range 123 to 126 as ordinary characters - in.wordChars ('.', '/'); // ASCII range 32 to 47 - in.wordChars (':', '@'); // ASCII range 58 to 64 - in.wordChars ('[', '`'); // ASCII range 91 to 96 - in.wordChars ('{', '~'); // ASCII range 123 to 126 - in.quoteChar ('\"'); - in.commentChar ('#'); - in.eolIsSignificant(true); - in.lowerCaseMode(false); - - Vector strs = new Vector(); - int lineNumber = 1; - - while (in.nextToken () != StreamTokenizer.TT_EOF) { - - if (in.ttype == StreamTokenizer.TT_EOL) { - - String command = ((String)strs.elementAt(COMMAND_NAME)).toLowerCase(); - String name = (String)strs.elementAt(SERVICE_NAME); - - if (strs.size() == 2) { - if (command.equals("remove")) - ServiceConfig.remove(name); - else - if (command.equals("suspend")) - ServiceConfig.suspend(name); - else - if (command.equals("resume")) - ServiceConfig.resume(name); - } else { - - if (!command.equals("load")) - throw new IOException ("Unknown command: " + - command + - " at line " + - lineNumber); - - if (strs.size() < 5) - throw new IOException ("Line " + lineNumber + - " requires 5 values, not " + - strs.size()); - - // Type is currently unenforced since everything must descend - // from Service anyway. - //String type = (String)strs.elementAt (SERVICE_TYPE); - String className = (String)strs.elementAt (CLASS_NAME); - - if (strs.size () > CODE_BASE) { - try { - String url = (String)strs.elementAt (CODE_BASE); - - ServiceConfig.loader_.addURLPath (url); - - } catch (MalformedURLException e) { - ACE.ERROR("Bad code base on line " + lineNumber); - } - } - - ServiceConfig.load(name, - className, - (String)strs.elementAt(ARGS)); - } - - lineNumber++; - strs.removeAllElements(); - continue; - } - - // Skip over non-strings - if ((in.ttype == StreamTokenizer.TT_WORD) || - (in.ttype == '\"')) - strs.addElement(new String(in.sval)); - else - ACE.DEBUG ("Invalid string on line " + lineNumber + - " element " + strs.size() + - " type " + in.ttype); - } - - return 0; - } - - /** - * Close all services. - */ - public static void close () - { - ServiceConfig.svcRep_.close (); - } - - /** - * Return a reference to the ServiceLoader used to load - * classes. - * - *@return ServiceLoader used internally by ServiceConfig. - */ - public static ServiceLoader loader () - { - return ServiceConfig.loader_; - } - - /** - * Specify the ServiceLoader to be used by ServiceConfig. - * - *@param loader ServiceLoader instance to use (should support remote - * loading) - */ - public static void loader (ServiceLoader loader) - { - ServiceConfig.loader_ = loader; - } - - // Set by command line options - private static boolean beADaemon_ = false; - - private static String serviceConfigFile_ = "svc.conf"; - - private static ServiceRepository svcRep_ = new ServiceRepository (); - private static ServiceLoader loader_ = new ServiceLoader (); - - // Order for the commands on a line in the config file - private final static int COMMAND_NAME = 0; - private final static int SERVICE_NAME = 1; - private final static int CLASS_NAME = 2; - private final static int SERVICE_TYPE = 3; - private final static int ARGS = 4; - private final static int CODE_BASE = 5; -} diff --git a/java/JACE/ServiceConfigurator/ServiceLoader.java b/java/JACE/ServiceConfigurator/ServiceLoader.java deleted file mode 100644 index 75297f9631d..00000000000 --- a/java/JACE/ServiceConfigurator/ServiceLoader.java +++ /dev/null @@ -1,254 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.ServiceConfigurator - * - * = FILENAME - * ServiceLoader.java - * - * Implementation of a network-capable class loader - * - *@author Prashant Jain - *@author Everett Anderson - * - *************************************************/ -package JACE.ServiceConfigurator; - -import java.io.*; -import java.util.*; -import java.net.*; -import JACE.OS.*; -import JACE.Misc.*; - -/** - * ClassLoader that can load classes from across the network - * via provided URL search paths, or from the local machine. - * <P> - * This operates in the same way as the JDK 1.2 ClassLoader by - * first checking for preloaded classes, then trying to use the system - * loader, and finally trying to load it via the network. The user can also - * provide URL search paths, or explicitly call the loadClass method which - * takes a URL. - * - *@see java.lang.ClassLoader - *@see java.lang.Class - */ -public class ServiceLoader extends ClassLoader -{ - /** - * Creates a loader that will only search the local machine for classes - * until URL paths are registered via addURLPath. - */ - public ServiceLoader () - { - this.URLSearchPaths_ = new Vector(); - } - - /** - * Creates a loader that will search the local machine followed by - * this array of URL paths when loading classes. Note that additional - * paths can be added later with the addURLPath method. - *@param remotePaths array of URLs to search when loading classes, after - *attempts to load from the local machine have failed - */ - public ServiceLoader (URL remotePaths[]) - { - this(); - - if (remotePaths == null) - return; - - for (int i = 0; i < remotePaths.length; i++) - this.addURLPath(remotePaths[i]); - } - - /** - * Add the given URL to the list of URL paths to search when loading - * classes. - *@param url URL ending in '/' where classes can be found - */ - public void addURLPath (URL url) - { - if (!URLSearchPaths_.contains(url)) - URLSearchPaths_.addElement(url); - } - - /** - * Add the given URL to the list of URL paths to search when loading - * classes. - *@param String representation of a URL ending in '/' - *@exception MalformedURLException the given String wasn't a valid URL - */ - public void addURLPath (String url) throws MalformedURLException - { - URL resource = new URL (url); - this.addURLPath (resource); - } - - /** - * Tries to load the given class by following the example of JDK 1.2 - * ClassLoader. First check loaded classes, then try to use the system - * loader, and only then perform the user defined subclass behavior - * from findClass (in this case, it's searching over the network). - *@param name name of the class to load - *@param resolve whether or not to resolve the class - *@exception ClassNotFoundException if the class could not be found - *@return loaded Class instance - */ - protected Class loadClass(String name, - boolean resolve) - throws ClassNotFoundException - { - - Class c = null; - - // Has this class already been loaded once? - c = findLoadedClass(name); - if (c != null) - return c; - - try { - - // Can the system loader find it? - c = findSystemClass(name); - return c; - - } catch (ClassNotFoundException e2) { - // The system loader couldn't find it - } - - // If none of the above, try searching our way - return findClass(name); - } - - /** - * This should duplicate the behavior of this class in JDK 1.2. It is - * called by the protected loadClass method after trying to load the - * class in other ways. It simply calls loadClassData and then defines - * the class. - *@param name name of the class to load - *@exception ClassNotFoundException couldn't find the class - *@return loaded Class - */ - protected Class findClass(String name) throws ClassNotFoundException - { - byte[] b = loadClassData(name); - return defineClass(name, b, 0, b.length); - } - - /** - * Try loading a class with the given name, searching the remote - * URL paths that have been registered. Note that this will only - * be called after first checking to see if the class has already - * been loaded, then checking to see whether or not the system - * loader can find it. - * <P> - * This could be overriden by subclasses to define different - * loading behavior. - * - *@param className name of the class (not file name) of the class to load - *@exception ClassNotFoundException couldn't find the class - *@return bytes of a .class file - */ - private byte[] loadClassData(String className) throws ClassNotFoundException - { - byte data[] = null; - - // Try to load it by reading in the bytes from the net - Enumeration e = URLSearchPaths_.elements(); - - while (e.hasMoreElements()) - { - try - { - URL path = (URL)e.nextElement(); - URL classFileURL; - - try - { - classFileURL = new URL(path.toExternalForm() + - className + - ".class"); - } catch (MalformedURLException ex) { - ACE.ERROR("Bad URL: " + ex.getMessage()); - continue; - } - - ACE.DEBUG("Looking for " + classFileURL.toExternalForm()); - URLConnection urlConnection = classFileURL.openConnection (); - - // Get the input stream associated with the URL connection and - // pipe it to a newly created DataInputStream - DataInputStream i = new DataInputStream - (urlConnection.getInputStream ()); - - // Allocate a buffer big enough to hold the contents of the - // data we are about to read - data = new byte [urlConnection.getContentLength ()]; - - // Now read all the data into the buffer - i.readFully (data); - - } catch (IOException ex) { - // Either the URL wasn't there or we couldn't get the data - continue; - } - } - - // Couldn't find it or it loaded improperly - if (data == null) - throw new ClassNotFoundException("Can't obtain " + className); - - return data; - } - - /** - * Load a class from across the network - * - * The newer way to do this is similar to JDK 1.2 URLClassLoader: - * Add URLs that end in '/' via the addURLPath method - * Call loadClass (class name without .class extension) method - * - *@param url URL of the class to load - *@exception ClassNotFoundException Couldn't find the class - *@return loaded Class - */ - public Class loadClass (URL url) throws ClassNotFoundException - { - // Extract the name of the class from the URL - String URLPath = url.getFile(); - - // Get the class name by removing any directory information - int idx = URLPath.lastIndexOf("/"); - if (idx == -1) - throw new ClassNotFoundException("Can't find " + URLPath); - String className = URLPath.substring(idx + 1); - URLPath = URLPath.substring(0, idx + 1); - - // Get rid of the class suffix - idx = className.lastIndexOf(".class"); - if (idx != -1) - className = className.substring(0, idx); - - ACE.DEBUG("The name of the class about to load is " + className); - - try { - // Add the URL to the list of URL search paths - URL path = new URL(URLPath); - - this.addURLPath(path); - - } catch (MalformedURLException e) { - throw new ClassNotFoundException("Can't find " + URLPath); - } - - // Try to load the class - return loadClass(className); - } - - /** - * Collection of URLs which end in the HTTP path separator. Used - * for searching for classes across the network. - */ - protected Vector URLSearchPaths_; -} diff --git a/java/JACE/ServiceConfigurator/ServiceObject.java b/java/JACE/ServiceConfigurator/ServiceObject.java deleted file mode 100644 index 4538698e8a6..00000000000 --- a/java/JACE/ServiceConfigurator/ServiceObject.java +++ /dev/null @@ -1,130 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.ServiceConfigurator - * - * = FILENAME - * ServiceObject.java - * - *@author Prashant Jain - *@author Everett Anderson - * - *************************************************/ -package JACE.ServiceConfigurator; - -import java.io.*; -import JACE.ASX.*; -import JACE.Reactor.*; - -/** - * Provides a default implementation of the Service interface, and can also - * be registered with the Reactor. - * - *@see JACE.Reactor - *@see Service - */ -public class ServiceObject implements EventHandler, Service -{ - /** - * Initialize object when dynamic loading occurs. Overwrite this - * method to do anything useful. - *@return -1 (default implementation) - */ - public int init (String [] args) - { - return -1; - } - - /** - * Terminate the object. Note that an object can not be explicitly - * unloaded. Overwrite this method to do anything useful. - *@return -1 (default implementation) - */ - public int fini () - { - return -1; - } - - /** - * Get information on an active object. Overwrite this method to do - * anything useful. - *@return null (default implementation) - */ - public String info () - { - return null; - } - - /** - * Called when timer expires. Overwrite this method to do - * anything useful. - *@param tv Time Value for when timer expired - *@param obj An arbitrary object that was passed to the Timer Queue - * (Asynchronous Completion Token) - *@return -1 - */ - public int handleTimeout (TimeValue tv, Object obj) - { - return -1; - } - - /** - * Request that this service suspend activity. Overwrite this - * method to do anything useful. Currently, this sets an internal - * state variable to true. - */ - public int suspend () - { - this.suspended_ = true; - - return 0; - } - - /** - * Request that this service resume activity. Currently, this sets - * an internal state variable to false. - */ - public int resume () - { - this.suspended_ = false; - - return 0; - } - - /** - * Is this service suspended? - */ - public boolean suspended () - { - return this.suspended_; - } - - /** - * Return the name of the Service. Implementation provided. - */ - public String name () - { - return this.name_; - } - - /** - * Set the name of the Service. Should be called when a Service is - * created -- this is done automatically by ServiceConfig when loading - * from a file. Implementation provided. - */ - public void name (String name) - { - this.name_ = name; - } - - /** - * Name of this ServiceObject. - */ - protected String name_ = null; - - /** - * Status of whether this ServiceObject is suspended or not. - * (Initially false) - */ - protected boolean suspended_ = false; -} diff --git a/java/JACE/ServiceConfigurator/ServiceRepository.java b/java/JACE/ServiceConfigurator/ServiceRepository.java deleted file mode 100644 index 33f9a088077..00000000000 --- a/java/JACE/ServiceConfigurator/ServiceRepository.java +++ /dev/null @@ -1,274 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.ServiceConfigurator - * - * = FILENAME - * ServiceRepository.java - * - * The service repository stores the network services, allowing them to be - * removed, suspended, resumed, etc. - * - *@see JACE.ServiceConfigurator.ServiceConfig; - *@see JACE.ServiceConfigurator.Service; - * - *@author Everett Anderson - * - *************************************************/ -package JACE.ServiceConfigurator; - -import java.io.*; -import java.util.*; - -/** - * Stores Services, providing operations such as remove, suspend, resume, etc. - */ -public class ServiceRepository -{ - /** - * Constructor - */ - public ServiceRepository () - { - this.serviceMap_ = new Hashtable (); - this.serviceNames_ = new Vector (); - } - - /** - * Constructor - * - *@param initialSize Initial vector size for the repository - */ - public ServiceRepository (int initialSize) - { - this.serviceMap_ = new Hashtable (initialSize); - this.serviceNames_ = new Vector (initialSize); - } - - /** - * Shut down all the services, closing them in reverse order of insertion. - * This calls fini on each service. - *@return -1 on failure, 0 on sucess - */ - public int close() - { - int result = 0; - - for (int i = this.size() - 1; i >= 0; i--) { - - String name = (String)this.serviceNames_.elementAt (i); - - Service s = (Service)this.serviceMap_.get (name); - - result = (s.fini () == -1 ? -1 : result); - } - - this.serviceMap_.clear (); - this.serviceNames_.removeAllElements (); - - return result; - } - - /** - * Insert a Service into the repository. - * (If already in, calls fini() and replaces) - * - *@param service Service to add - */ - public void insert (Service service) - { - String name = service.name (); - Service alreadyIn = this.find (name); - - if (alreadyIn != null) { - - alreadyIn.fini (); - this.remove (alreadyIn); - - } else { - - this.serviceMap_.put (name, service); - this.serviceNames_.addElement (name); - - } - } - - /** - * Returns an enumeration of all the Service objects. - * - */ - public Enumeration services () - { - return this.serviceMap_.elements (); - } - - /** - * Returns an enumeration of all the Service names - */ - public Enumeration serviceNames () - { - return this.serviceMap_.keys (); - } - - /** - * Convenience method that returns null when the service isn't - * found. - */ - public Service find (String name) - { - Object serviceObj = this.serviceMap_.get (name); - - if (serviceObj == null) - return null; - - return (Service)serviceObj; - } - - /** - * Finds the Service associated with a given - * name. - * - *@param name Name of the service to find - *@exception NoSuchElementException if the given service is not found - */ - protected Service findService (String name) throws NoSuchElementException - { - Object serviceObj = this.serviceMap_.get (name); - - if (serviceObj == null) - throw new NoSuchElementException ("Service " + name + " not found."); - - return (Service)serviceObj; - } - - /** - * Removes the given Service and calls its fini () method. - *@param service Service to remove - *@return -1 on failure, 0 on success - */ - protected int remove (Service service) - { - String name = service.name (); - - this.serviceMap_.remove (name); - - int index = this.serviceNames_.indexOf (name); - - this.serviceNames_.removeElementAt (index); - - return service.fini (); - } - - /** - * Shut down the specified Service. - * - *@param name name of the Service to shut down - *@return -1 on failure, 0 on success - */ - public int fini (String name) - { - Service service = this.findService (name); - - return service.fini (); - } - - /** - * Remove the specified Service, calling its fini () method. - * - *@param name name of the Service to remove - *@return -1 on failure, 0 on success - */ - public int remove (String name) - { - Service service = this.findService (name); - - return this.remove (service); - } - - /** - * Resume a suspended service - *@param name Name of the service to resume - *@return -1 on failure, 0 on success - */ - public int resume (String name) - { - Service service = this.findService (name); - - return service.resume(); - } - - /** - * Suspend a service - *@param name Name of the service to suspend - *@return -1 on failure, 0 on success - */ - public int suspend (String name) - { - Service service = this.findService (name); - - if (service.suspended ()) - return 0; - - return service.suspend (); - } - - /** - * Returns status information about the specified Service. - * - *@param name name of the Service to query - *@return String of information about the Service's status - */ - public String info (String name) - { - Service service = this.findService (name); - - return service.info (); - } - - /** - * Check to see if the specified Service is suspended or not - */ - public boolean suspended (String name) - { - Service service = this.findService (name); - - return service.suspended (); - } - - /** - * Initialize the specified Service with the given command - * line arguments. - */ - public int init (String name, String [] args) - { - Service service = this.findService (name); - - return service.init (args); - } - - /** - * Returns the number of items in the repository - */ - public int size () - { - return this.serviceNames_.size(); - } - - /** - * Stores the Service names in order of insertion - */ - Vector serviceNames_; - - /** - * A mapping between Service names and Service objects - */ - Hashtable serviceMap_; -}; - - - - - - - - diff --git a/java/JACE/ServiceConfigurator/package.html b/java/JACE/ServiceConfigurator/package.html deleted file mode 100644 index 2092fc34f5a..00000000000 --- a/java/JACE/ServiceConfigurator/package.html +++ /dev/null @@ -1,10 +0,0 @@ -<!-- $Id$ --> -<HTML> -<BODY> -Point for loading and managing services. -<P> -See also: -<a href="http://www.cs.wustl.edu/~schmidt/ACE-papers.html#config"> -Documents on the ACE Service Configurator</a> -</BODY> -</HTML> diff --git a/java/JACE/Timers/ProfileTimer.java b/java/JACE/Timers/ProfileTimer.java deleted file mode 100644 index 210d8887907..00000000000 --- a/java/JACE/Timers/ProfileTimer.java +++ /dev/null @@ -1,46 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.Timers - * - * = FILENAME - * ProfileTimer.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.Timers; - -/** - * A Java wrapper for interval timers. - */ -public class ProfileTimer -{ - /** - * Start the timer. - */ - public void start () - { - this.startTime_ = java.lang.System.currentTimeMillis (); - } - - /** - * Stop the timer. - */ - public void stop () - { - this.stopTime_ = java.lang.System.currentTimeMillis (); - } - - /** - * Determine elapsed time between start and stop. - *@return Total elapsed time (stop - start). - */ - public long elapsedTime () - { - return this.stopTime_ - this.startTime_; - } - - private long startTime_; - private long stopTime_; -} diff --git a/java/JACE/Timers/package.html b/java/JACE/Timers/package.html deleted file mode 100644 index 4aa67ec1fd6..00000000000 --- a/java/JACE/Timers/package.html +++ /dev/null @@ -1,8 +0,0 @@ -<!-- $Id$ --> -<HTML> -<BODY> -Time related classes. - -@see JACE.ASX.TimeValue -</BODY> -</HTML> diff --git a/java/JACE/makebat.zip b/java/JACE/makebat.zip Binary files differdeleted file mode 100644 index a05c72f274e..00000000000 --- a/java/JACE/makebat.zip +++ /dev/null diff --git a/java/JACE/netsvcs/Handler.java b/java/JACE/netsvcs/Handler.java deleted file mode 100644 index 7bf73f01206..00000000000 --- a/java/JACE/netsvcs/Handler.java +++ /dev/null @@ -1,185 +0,0 @@ -package JACE.netsvcs; - -import java.io.*; -import java.net.*; -import JACE.OS.*; -import JACE.Connection.*; - -/** - * Abstract class representing a handler for a Server. Provides - * default implementations and template methods. - * - *@see Server - *@author Everett Anderson - */ -public abstract class Handler extends SvcHandler -{ - /** - * Initialize this Handler. The default implementation sets the - * done flag to false. - * - *@return -1 on failure, 0 on success - */ - public int open (Object obj) - { - done_ = false; - return 0; - } - - /** - * Shut down this handler. Default implementation calls close (). - */ - public int close (long flags) - { - return close (); - } - - /** - * Shut down this handler, setting the done flag, and removing it - * from the parent Server's handler list. - */ - public synchronized int close () - { - if (!done ()) { - try { - done_ = true; - parent_.removeHandler (this); - peer ().close (); - } catch (IOException e) { - return -1; - } - } - - return 0; - } - - /** - * Returns the name of the host that is connected to this handler, - * or null if not connected. - */ - public String hostName () - { - if (done ()) - return null; - else - return this.peer().socket().getInetAddress().getHostName(); - } - - /** - * Process a single request and handle any errors. The default - * implementation calls handleRequest with an Object from - * newRequest (). - */ - public void handleRequest () - { - handleRequest (newRequest ()); - } - - /** - * Process a single request and handle any errors. The default - * implementation calls processRequest with the given request - * Object, and then handles exceptions appropriately. Subclasses - * normally just implement processRequest rather than override - * this method. - * - *@param request request to process - */ - public void handleRequest (Object request) - { - try { - - processRequest (request); - - } catch (NullPointerException e) { - if (!done ()) { - ACE.ERROR("Failure: " + e); - close (); - } - } catch (SocketException e) { - if (!done ()) { - ACE.DEBUG (hostName () + " disconnected"); - close (); - } - } catch (EOFException e) { - if (!done ()) { - ACE.DEBUG (hostName () + " disconnected"); - close (); - } - } catch (IOException e) { - if (!done ()) { - ACE.ERROR ("Lost connection: " + e); - close (); - } - } - } - - /** - * Process a single request (including reading it from the wire) - * without handling errors. Subclasses must define the behavior. - * - *@param requestObject request to process - *@exception SocketException problem with the socket - *@exception EOFException end of connection, - * usually means client disconnected - *@exception IOException error during transmission - */ - protected abstract void processRequest (Object requestObject) - throws SocketException, EOFException, IOException; - - /** - * Returns a new instance of a request object. Subclasses must - * define the behavior. - */ - public abstract Object newRequest (); - - /** - * Called by the JVM when a Handler is run in its own Thread. The - * default implementation creates a single request object which is - * reused during multiple handleRequest calls. The loop exits - * when the Handler's done() method returns true. - */ - public void run() - { - Object request = newRequest (); - - while (!done ()) - handleRequest (request); - - close (); - } - - /** - * Set the Server parent of this Handler. - */ - public void parent (Server parent) - { - parent_ = parent; - } - - /** - * Return the Server parent of this Handler. - */ - public Server parent () - { - return parent_; - } - - /** - * Check to see if this Handler should shut down. - */ - protected synchronized boolean done () - { - return done_; - } - - /** - * Closes the handler, freeing resources. - */ - protected void finalize () throws Throwable - { - close (); - } - - private boolean done_ = true; - private Server parent_; -} diff --git a/java/JACE/netsvcs/Logger/LogRecord.java b/java/JACE/netsvcs/Logger/LogRecord.java deleted file mode 100644 index 972cf45af74..00000000000 --- a/java/JACE/netsvcs/Logger/LogRecord.java +++ /dev/null @@ -1,290 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.netsvcs.Logger - * - * = FILENAME - * LogRecord.java - * - *@author Chris Cleeland, Everett Anderson - * - *************************************************/ -package JACE.netsvcs.Logger; - -import java.util.*; -import java.io.*; -import JACE.OS.*; - -/** - * Communicates logging information. Compatible with the C++ ACE - * ACE_Log_Record class. - */ -public class LogRecord -{ - /** - * Maximum size of a LogRecord - */ - final public int MAXLOGMSGLEN = 4 * 1024; - - private int type_; - private int length_; - private long msec_; - private int pid_; - private byte[] msgData_; - private final static int numIntMembers = 5; - private final static int sizeofIntInBytes = 4; - - /** - * Create a default instance. - */ - public LogRecord() - { - type(0); - timeStamp((int)new Date().getTime()); - length(0); - pid(0); - } - - /** - * Create a LogRecord. This is the designated initializer. - * @param priority a numeric specification of the priority (ascending) - * @param milliseconds time attached to the log entry in Unix <pre>time_t</pre> format - * @param pid the process ID - */ - public LogRecord(int priority, - long milliseconds, - int pid) - { - type(priority); - timeStamp(milliseconds); - length(0); - pid(pid); - } - - /** - * Create a LogRecord with the current time and the given message. - * - *@param message message to log - */ - public LogRecord (String message) - { - this (); - - msgData (message); - } - - /** - * Conversion to string. Only includes the <pre>msgData_</pre> member. - */ - public String toString() - { - String result = null; - try { - result = new String (msgData_, - "US-ASCII"); - } catch (UnsupportedEncodingException e) { - result = new String (msgData_); - } - - return result; - } - - /** - * Place a textual representation of the record on a PrintStream. - * When verbose is specified to be true, the output takes the form - * <PRE>(Date)@(host name)@(PID)@(type)@(message)</PRE> - * Otherwise it just prints the message. - * @param hostname name of the host generating this record - * @param verbose specify how much information to print (see above) - * @param ps A PrintStream instance to which the output should go. - */ - public void print(String hostname, - boolean verbose, - PrintStream ps) - { - String toprint; - if (verbose) - { - Date now = new Date(this.timeStamp()); - - /* 01234567890123456789012345 */ - /* Wed Oct 18 14:25:36 1989n0 */ - toprint = now.toString().substring(4) + "@" - + hostname + "@" + pid_ + "@" + type_ + "@" - + this.toString(); - } - else - { - toprint = this.toString(); - } - ps.println(toprint); - } - - /** - * Read in the data for this LogRecord from the given InputStream. - * - *@param is InputStream to read from - *@exception IOException error during transmission - */ - public void streamInFrom (InputStream is) throws IOException - { - BufferedInputStream bis = new BufferedInputStream (is); - - DataInputStream dis = new DataInputStream (bis); - - streamInFrom (dis); - } - - /** - * Read in the data for this LogRecord from the given DataInputStream. - * - *@param dis DataInputStream to read from - *@exception IOException error during transmission - */ - public void streamInFrom(DataInputStream dis) throws IOException - { - // Order here must match layout order in the C++ class. - length(dis.readInt()); - type(dis.readInt()); - this.timeStamp((long)dis.readInt() * 1000); - - // Skip smaller time resolution info since we're lucky if Java's - // timer can handle more than millisecond precision, anyway - dis.skipBytes(4); - - pid(dis.readInt()); - - int dataLength = (int) (length_ - numIntMembers * sizeofIntInBytes); - - msgData_ = new byte[dataLength]; - - dis.readFully(msgData_, 0, dataLength); - } - - /** - * Write this LogRecord out to the given OutputStream. - * - *@param os OutputStream to write to - *@exception IOException error during transmission - */ - public void streamOutTo (OutputStream os) throws IOException - { - BufferedOutputStream bos = new BufferedOutputStream (os); - - DataOutputStream dos = new DataOutputStream (bos); - - streamOutTo (dos); - } - - /** - * Write this LogRecord out to the given DataOutputStream. - * - *@param dos OutputStream to write to - *@exception IOException error during transmission - */ - public void streamOutTo(DataOutputStream dos) throws IOException - { - dos.writeInt(length()); - dos.writeInt(type()); - dos.writeInt((int)(this.msec_ / 1000)); - dos.writeInt(0); - dos.writeInt(pid()); - - dos.write(msgData_); - - dos.flush (); - } - - /** - * Return the LogRecord type. - */ - public int type() { return type_; } - - /** - * Set the LogRecord type. - */ - public void type(int t) { type_ = t; } - - /** - * Return the length of this LogRecord. - */ - public int length() { return length_; } - - /** - * Set the length of this LogRecord. - */ - public void length(int l) { length_ = l; } - - /** - * Calculate the length of this LogRecord from the size of - * the message and the header. - */ - private void setLen(int msgLen) - { length(msgLen + numIntMembers * sizeofIntInBytes); } - - /** - * Return the millisec time stamp of this LogRecord. - */ - public long timeStamp() { return this.msec_; } - - /** - * Set the millisec time stamp of this LogRecord. - */ - public void timeStamp(long msec){ this.msec_ = msec; } - - /** - * Return the PID of this LogRecord. - */ - public int pid() { return pid_; } - - /** - * Set the PID of this LogRecord. - */ - public void pid(int p) { pid_ = p; } - - /** - * Return the message of this LogRecord as a byte array. - */ - public byte[] msgData() { return msgData_; } - - /** - * Set the message of this LogRecord to a given byte array. - */ - public void msgData(byte[] m) - { - int size = m.length; - - if (size > MAXLOGMSGLEN) - size = MAXLOGMSGLEN; - - this.msgData_ = new byte[size]; - - System.arraycopy(m, 0, msgData_, 0, size); - - setLen(size); - } - - /** - * Set the message of this LogRecord to a given byte array. First - * tries to use US-ASCII encoding, then uses the default encoding - * if that fails. The toString method is essentially the opposite - * version. - */ - public void msgData(String m) - { - byte temp[] = null; - try { - temp = m.getBytes("US-ASCII"); - } catch (UnsupportedEncodingException e) { - temp = m.getBytes (); - } - if (temp.length > MAXLOGMSGLEN) { - this.msgData_ = new byte[MAXLOGMSGLEN]; - - System.arraycopy(temp, 0, msgData_, 0, MAXLOGMSGLEN); - } else - this.msgData_ = temp; - - setLen(msgData_.length); - } -} diff --git a/java/JACE/netsvcs/Logger/LoggingStrategy.java b/java/JACE/netsvcs/Logger/LoggingStrategy.java deleted file mode 100644 index b7912499385..00000000000 --- a/java/JACE/netsvcs/Logger/LoggingStrategy.java +++ /dev/null @@ -1,35 +0,0 @@ -/************************************************* - * - * = PACKAGE - * netsvcs.Logger - * - * = FILENAME - * LogMessageReceiver.java - * - *@author Everett Anderson - * - *************************************************/ -package JACE.netsvcs.Logger; - -import java.io.*; - -/** - * Encapsulates the handling of a LogRecord from a given host, allowing - * easy swapping of behavior in the logging service. Strategies could - * be developed to save to a file, print on a certain stream, forward - * to another service, etc. - * - *@see StderrStrategy - *@see LogRecord - */ -public interface LoggingStrategy -{ - /** - * Process the given LogRecord. - * - *@param hostname host from which this LogRecord originated - *@param record LogRecord instance to process - */ - public void logRecord (String hostname, - LogRecord record); -} diff --git a/java/JACE/netsvcs/Logger/ServerLoggingAcceptor.java b/java/JACE/netsvcs/Logger/ServerLoggingAcceptor.java deleted file mode 100644 index c0ef8831fc6..00000000000 --- a/java/JACE/netsvcs/Logger/ServerLoggingAcceptor.java +++ /dev/null @@ -1,147 +0,0 @@ -package JACE.netsvcs.Logger; - -import java.util.*; -import java.io.*; -import java.net.*; -import JACE.SOCK_SAP.*; -import JACE.Connection.*; -import JACE.OS.*; -import JACE.Misc.*; -import JACE.netsvcs.Server; - -/** - * Server for the logging service. Sets the default logging strategy - * to StderrStrategy so that logging requests are printed on the - * System.err stream. Other strategies can be specified on the - * command line. - * <P> - * <B>Valid command line arguments:</B> - * <PRE> - * -r (class name) Specify a LoggingStrategy - * (Default is StdErrStrategy) - * -p (port) Port to listen on for clients - * -d Enable debugging messages - * -a (class name) Specify ActivateStrategy - * (Default is thread per connection) - * </PRE> - * - *@see LoggingStrategy - *@see StderrStrategy - */ -public class ServerLoggingAcceptor extends Server -{ - /** - * Default constructor. Sets the default LoggingStrategy to - * StderrStrategy. - */ - public ServerLoggingAcceptor () - { - name ("Logging Service"); - logStrategy_ = new StderrStrategy (); - } - - /** - * Simple main program for running the logging service without the - * service configurator. - * - *@param args command line arguments - */ - public static void main (String [] args) - { - ServerLoggingAcceptor sla = new ServerLoggingAcceptor(); - - sla.init(args); - } - - /** - * Accessor for the LoggingStrategy - */ - public LoggingStrategy loggingStrategy () - { - return this.logStrategy_; - } - - /** - * Creates a new ServerLoggingHandler instance. - */ - protected SvcHandler makeSvcHandler () - { - return new ServerLoggingHandler (); - } - - /** - * Prints out the valid command line arguments. See the class - * description for more information. Called by Server.init when - * parseArgs returns -1. - */ - protected void printUsage () - { - ACE.ERROR ("Valid options:\n"); - ACE.ERROR ("-r <class name> Specify a LoggingStrategy"); - ACE.ERROR (" (Default is StdErrStrategy"); - ACE.ERROR ("-p <port> Port to listen on for clients"); - ACE.ERROR ("-d Enable debugging messages"); - ACE.ERROR ("-a <class name> Specify ActivateStrategy"); - ACE.ERROR (" (Default is single threaded"); - } - - /** - * Parses the command line arguments. See the class description - * for more information. - * - *@param args command line arguments - *@return -1 on failure, 0 on success - */ - protected int parseArgs (String args[]) - { - String s; - Object strategy; - GetOpt opt = new GetOpt (args, "p:r:da:", true); - int c = 0; - - try { - - while ((c = opt.next ()) != -1) - { - switch (c) - { - case 'd': - ACE.enableDebugging (); - ACE.DEBUG ("Debugging is enabled"); - break; - case 'p': - if (!port (opt.optarg ())) - return -1; - break; - case 'a': - strategy = newStrategyInstance (opt.optarg (), - "ActivateStrategy"); - if (strategy == null) - return -1; - - activateStrategy ((ActivateStrategy) strategy); - break; - case 'r': - // Load the Strategy with the given name - strategy = newStrategyInstance (opt.optarg (), - "LoggingStrategy"); - if (strategy == null) - return -1; - - logStrategy_ = (LoggingStrategy)strategy; - break; - default: - ACE.ERROR ("Unknown argument: " + c); - return -1; - } - } - } catch (ArrayIndexOutOfBoundsException e) { - ACE.ERROR ("Option -" + (char)c + " requires an argument"); - return -1; - } - - return 0; - } - - private LoggingStrategy logStrategy_; -} diff --git a/java/JACE/netsvcs/Logger/ServerLoggingHandler.java b/java/JACE/netsvcs/Logger/ServerLoggingHandler.java deleted file mode 100644 index 88a564c2c34..00000000000 --- a/java/JACE/netsvcs/Logger/ServerLoggingHandler.java +++ /dev/null @@ -1,60 +0,0 @@ -/************************************************* - * - * = PACKAGE - * netsvcs.Logger - * - * = FILENAME - * ServerLoggingHandler.java - * - *@author Everett Anderson - * - *************************************************/ -package JACE.netsvcs.Logger; - -import java.io.*; -import java.util.*; -import java.net.*; -import JACE.SOCK_SAP.*; -import JACE.Connection.*; -import JACE.OS.*; -import JACE.netsvcs.Handler; - -/** - * - * Created by ServerLoggingAcceptor to handle logging requests. This - * simply reads the record and hands it to the registered LoggingStrategy. - * - * @see JACE.netsvcs.Logger.ServerLoggingAcceptor - */ -public class ServerLoggingHandler extends Handler -{ - /** - * Reads in the given LogRecord request and hands it to the - * LoggingStrategy registered with the ServerLoggingAcceptor parent. - * - *@param request LogRecord instance to use - */ - public void processRequest (Object request) - throws SocketException, EOFException, IOException - { - LogRecord rec = (LogRecord)request; - - rec.streamInFrom (this.peer ().dataInputStream ()); - - ServerLoggingAcceptor parent = (ServerLoggingAcceptor)parent (); - - parent.loggingStrategy ().logRecord (this.hostName (), rec); - } - - /** - * Creates a new instance of LogRecord. - */ - public Object newRequest () - { - return new LogRecord (); - } -} - - - - diff --git a/java/JACE/netsvcs/Logger/StderrStrategy.java b/java/JACE/netsvcs/Logger/StderrStrategy.java deleted file mode 100644 index ee927e19062..00000000000 --- a/java/JACE/netsvcs/Logger/StderrStrategy.java +++ /dev/null @@ -1,36 +0,0 @@ -/************************************************* - * - * = PACKAGE - * netsvcs.Logger - * - * = FILENAME - * DefaultLMR.java - * - * - *@author Everett Anderson - * - *************************************************/ -package JACE.netsvcs.Logger; - -import java.io.*; - -/** - * Default LoggingStrategy for the logging service. This prints out the - * LogRecord on the System.err stream. - * - * @see JACE.netsvcs.Logger.LogRecord - */ -public class StderrStrategy implements LoggingStrategy -{ - /** - * Process the given LogRecord by printing it on the System.err stream. - * - *@param hostname host from which this LogRecord originated - *@param record LogRecord instance to process - */ - public void logRecord (String hostname, - LogRecord record) - { - record.print(hostname, true, System.err); - } -} diff --git a/java/JACE/netsvcs/Logger/c.bat b/java/JACE/netsvcs/Logger/c.bat deleted file mode 100644 index 6600766df1d..00000000000 --- a/java/JACE/netsvcs/Logger/c.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -javac -d C:\Everett\JACE\classes *.java diff --git a/java/JACE/netsvcs/Logger/package.html b/java/JACE/netsvcs/Logger/package.html deleted file mode 100644 index 84bffb246d9..00000000000 --- a/java/JACE/netsvcs/Logger/package.html +++ /dev/null @@ -1,17 +0,0 @@ -<!-- $Id$ --> -<HTML> -<BODY> -Logging Service for processing logging records received from remote hosts. -<P> -The strategy for how to process the records can be easily changed via the -command line. -<P> -A simple test client is available in the tests directory under netsvcs\Logger. -The service itself can either be run on the command line (by running -ServerLoggingAcceptor) or by loading it with a ServiceConfig file (see -the tests for the service configurator). - -@see JACE.netsvcs.Logger.LoggingStrategy -@see <a href="http://www.cs.wustl.edu/~schmidt/ACE-netsvcs.html">ACE Network Services</a> -</BODY> -</HTML> diff --git a/java/JACE/netsvcs/Naming/NameAcceptor.java b/java/JACE/netsvcs/Naming/NameAcceptor.java deleted file mode 100644 index 7e7be457d70..00000000000 --- a/java/JACE/netsvcs/Naming/NameAcceptor.java +++ /dev/null @@ -1,313 +0,0 @@ -/************************************************* - * - * = PACKAGE - * netsvcs.Naming - * - * = FILENAME - * NameAcceptor.java - * - *************************************************/ -package JACE.netsvcs.Naming; - -import java.io.*; -import java.net.*; -import java.util.*; -import JACE.OS.*; -import JACE.Misc.*; -import JACE.Connection.*; -import JACE.Reactor.*; -import JACE.ASX.TimeValue; -import JACE.netsvcs.Server; - -/** - * Server for the naming service. - * Listens on the specified port (command line option) and launches - * NameHandlers when connections are made. - * <P> - * The hash table for the mapping and a timer queue are created here. - * Periodically, if it has been changed, the mapping is saved to a file. - * If the data file exists at load time, it is read from disk. Currently, - * the service stores the entire mapping in one Hashtable (which is probably - * kept in memory at all times). - * <P> - * <B>Valid command line arguments:</B> - * <PRE> - * -f (file name) File name of the database - * (Default is namedata.dat) - * -p (port number) Port to listen on for clients - * -d Enable debugging - * -t (time sec) How often to save the database (default 60 sec) - * -a (class name) Specify ActivateStrategy - * (Default is multi-threaded) - * </PRE> - * - *@see NameHandler - * - *@author Everett Anderson - * - */ -public class NameAcceptor extends Server -{ - /** - * Constructor - */ - public NameAcceptor () - { - // Set the name in case we are not using the service - // configurator - name ("Naming Service"); - - // Create the hash table and timer queue - this.mapping_ = new Hashtable (); - this.tq_ = new TimerQueue (true); - } - - /** - * Simple main program. See the class description for more - * information about command line arguments. - */ - public static void main (String [] args) - { - // Simple main program to get things rolling - NameAcceptor na = new NameAcceptor(); - - na.init(args); - } - - /** - * Check to see if the mapping has been modified since the last - * save. - */ - synchronized boolean modifiedMapping () - { - return mappingWasModified_; - } - - /** - * Set the modified state of the mapping. - */ - synchronized void modifiedMapping (boolean value) - { - mappingWasModified_ = value; - } - - /** - * Cancels the timer which was used to save the mapping, then delegates - * to Server.fini (). - * - *@return -1 on failure, 0 on success - */ - public int fini () - { - if (!done () && tq_ != null) - tq_.cancelTimer (this); - - return super.fini (); - } - - /** - * Read the data file (if it exists) and schedule a periodic timer - * to save it at intervals. At the end, this delegates to - * Server.initialize () (which currently sets the default - * activation scheme if it wasn't defined on the command line). - * - *@see Server#initialize - *@return -1 on failure, 0 on success - */ - protected int initialize () - { - this.loadTable (); - - this.tq_.scheduleTimer (this, - null, - new TimeValue (this.updateInterval_), - new TimeValue (this.updateInterval_)); - - // Use whatever default ActivateStrategy is defined in the - // Server class (unless specified in parseArgs) - return super.initialize (); - } - - /** - * Create a new NameHandler instance. - */ - protected SvcHandler makeSvcHandler () - { - return new NameHandler (mapping_); - } - - /** - * Prints out the valid command line arguments. See the class - * description for more information. Called by Server.init when - * parseArgs returns -1. - */ - protected void printUsage () - { - ACE.ERROR ("Valid options:\n"); - ACE.ERROR ("-f <file name> File name of the database"); - ACE.ERROR (" (Default is namedata.dat)"); - ACE.ERROR ("-p <port number> Port to listen on for clients"); - ACE.ERROR ("-d Enable debugging"); - ACE.ERROR ("-t <time sec> How often to save the database"); - ACE.ERROR (" (Default is 60 seconds)"); - ACE.ERROR ("-a <class name> Specify ActivateStrategy"); - ACE.ERROR (" (Default is multi-threaded"); - } - - /** - * Parses the command line arguments. See the class description - * for more information. - * - *@param args command line arguments - *@return -1 on failure, 0 on success - */ - protected int parseArgs (String [] args) - { - int c = 0; - String s; - GetOpt opt = new GetOpt (args, "p:f:t:da:", true); - - try { - - while ((c = opt.next ()) != -1) { - switch (c) - { - case 'f': - this.filename_ = opt.optarg (); - break; - case 't': - try { - this.updateInterval_ = Integer.parseInt (opt.optarg ()); - } catch (NumberFormatException e) { - ACE.ERROR ("Invalid interval specified: " + e.getMessage ()); - return -1; - } - break; - case 'd': - ACE.enableDebugging (); - ACE.DEBUG ("Debugging is enabled"); - break; - case 'p': - if (!port (opt.optarg ())) - return -1; - break; - case 'a': - Object strategy = newStrategyInstance (opt.optarg (), - "ActivateStrategy"); - if (strategy == null) - return -1; - - activateStrategy ((ActivateStrategy) strategy); - break; - default: - ACE.ERROR ("Unknown argument: " + (char)c); - return -1; - } - } - } catch (ArrayIndexOutOfBoundsException e) { - ACE.ERROR ("Option -" + (char)c + " requires an argument"); - return -1; - } - - return 0; - } - - /** - * Loads the hash table into memory from the specified - * file. Uses ObjectInputStream. - */ - protected void loadTable () - { - File file = new File(this.filename_); - FileInputStream fis; - ObjectInputStream ois; - - Hashtable ht = null; - - try { - - if ((file.exists()) && (file.canRead())) { - - fis = new FileInputStream (file); - - ois = new ObjectInputStream(fis); - - ht = (Hashtable)ois.readObject(); - } else - return; - } catch (ClassNotFoundException e) { - ACE.ERROR(e); - } catch (StreamCorruptedException e) { - ACE.ERROR(e); - } catch (SecurityException e) { - ACE.ERROR(e); - } catch (IOException e) { - ACE.ERROR(e); - } - - if (ht != null) - this.mapping_ = ht; - - } - - /** - * Writes the table out to the specified file if it has been modified. - */ - protected void saveTable () - { - if (!modifiedMapping ()) - return; - - FileOutputStream fos; - ObjectOutputStream oos; - - try { - - fos = new FileOutputStream(this.filename_); - oos = new ObjectOutputStream(fos); - - synchronized (this.mapping_) { - oos.writeObject(this.mapping_); - - modifiedMapping (false); - } - - oos.flush(); - - oos.close(); - - } catch (OptionalDataException e) { - ACE.ERROR(e); - } catch (NotSerializableException e) { - ACE.ERROR(e); - } catch (IOException e) { - ACE.ERROR(e); - } - } - - /** - * Call back for the TimerQueue. This calls the method to save the - * hash table. The default time out is 60 seconds. - */ - public int handleTimeout (TimeValue tv, Object obj) - { - this.saveTable(); - - return 0; - } - - // Mapping data structure - Hashtable mapping_ = null; - - // Default file name - String filename_ = "namedata.dat"; - - // How often to save the table (seconds) - int updateInterval_ = 60; - - // Calls handleTimeout at updateInterval_ intervals - TimerQueue tq_ = null; - - boolean mappingWasModified_ = false; -} - diff --git a/java/JACE/netsvcs/Naming/NameHandler.java b/java/JACE/netsvcs/Naming/NameHandler.java deleted file mode 100644 index 9989e925543..00000000000 --- a/java/JACE/netsvcs/Naming/NameHandler.java +++ /dev/null @@ -1,473 +0,0 @@ -/************************************************* - * - * = PACKAGE - * netsvcs.Naming - * - * = FILENAME - * NameHandler.java - * - *************************************************/ -package JACE.netsvcs.Naming; - -import java.net.SocketException; -import java.io.*; -import java.util.*; -import JACE.OS.*; -import JACE.Connection.*; -import JACE.Reactor.*; -import JACE.SOCK_SAP.*; -import JACE.netsvcs.Handler; - -/** - * Handlers interaction between a client (NameProxy) and the naming - * service database. Created by NameAcceptor to handle requests. - * <P> - * In general, the user binds a name to a (value, type) pair. The type is just - * treated as just another String (in the C++ version the name and value are - * arrays of 16 bit data types and the type is an array of 8 bit chars). - * <P> - * For this to work in the hash table scheme, the type and value are wrapped in - * a ValueType class defined as a nested top level class within the - * NameHandler. - * <P> - * This is compatible with the C++ ACE remote name service. - * - *@see JACE.netsvcs.Naming.NameAcceptor - *@see JACE.netsvcs.Naming.NameRequest - *@see JACE.netsvcs.Naming.NameReply - * - *@author Everett Anderson - */ -public class NameHandler extends Handler -{ - /** - * Constructor - * - * @param mapping Hash table created in NameAcceptor - */ - public NameHandler (Hashtable mapping) - { - this.mapping_ = mapping; - } - - /** - * Read in the given NameRequest and calls dispatch. - */ - public void processRequest (Object request) - throws SocketException, EOFException, IOException - { - NameRequest nameRequest = (NameRequest)request; - - nameRequest.streamInFrom (peer ().dataInputStream ()); - - this.dispatch (nameRequest); - } - - /** - * Create a new instance of NameRequest. - */ - public Object newRequest () - { - return new NameRequest (); - } - - /** - * This is the point at which a request is sent to the various methods - * that fulfill it. It switches on the request type -- bind, - * rebind, resolve, etc. - * - *@param nameRequest The request to respond to - */ - void dispatch (NameRequest nameRequest) throws IOException - { - NameAcceptor parent = (NameAcceptor)parent (); - - // Call the various other member functions based on the - // message type of the request -- bind, rebind, etc. - switch (nameRequest.requestType()) - { - case NameRequest.BIND: - this.bind(nameRequest, false); - parent.modifiedMapping (true); - break; - case NameRequest.REBIND: - this.bind(nameRequest, true); - parent.modifiedMapping (true); - break; - case NameRequest.RESOLVE: - this.resolve(nameRequest); - break; - case NameRequest.UNBIND: - this.unbind(nameRequest); - parent.modifiedMapping (true); - break; - case NameRequest.LIST_NAMES: - this.listByName(nameRequest.name(), false); - break; - case NameRequest.LIST_VALUES: - this.listByValue(nameRequest.name(), false); - break; - case NameRequest.LIST_TYPES: - this.listByType(nameRequest.name(), false); - break; - case NameRequest.LIST_NAME_ENTRIES: - this.listByName(nameRequest.name(), true); - break; - case NameRequest.LIST_VALUE_ENTRIES: - this.listByValue(nameRequest.name(), true); - break; - case NameRequest.LIST_TYPE_ENTRIES: - this.listByType(nameRequest.name(), true); - break; - default: - ACE.ERROR("Unknown type: " + nameRequest.requestType()); - - // Send a failure message. This will only work if the other - // side is expecting something like a NameReply rather than - // a NameRequest. It would've been better to have everything - // use NameRequests to avoid this kind of thing. - NameReply reply = new NameReply (NameReply.FAILURE, 0); - reply.streamOutTo(peer ().dataOutputStream ()); - break; - } - - } - - /** - * - * Bind a name and a (value, type) pair. All this data is given in the - * NameRequest from the client. Returns a NameReply back to the client - * with either Reply.SUCCESS or Reply.FAILURE as the type. - * - *@param request NameRequest given by the client - *@param rebind Is this a rebind or not? - */ - void bind (NameRequest request, - boolean rebind) throws IOException - { - // The hash table entries consists of (String name, ValueType data) - // pairs, so create the appropriate ValueType - ValueType vt = new ValueType(request.type(), - request.value()); - - // Reply to tell sender of success or failure - NameReply reply = new NameReply(); - - // If it's a rebind request, overwrite the old entry. If the key doesn't - // exist, add it. If it does exist and it's not a bind request, return - // a failure code via a NameReply. - if ((rebind) || (!this.mapping_.containsKey(request.name()))) { - - ACE.DEBUG ("Binding: " + request.name() + " and " + vt.value_); - - // Add/Update the entry in the hash table - this.mapping_.put(request.name(), vt); - - // Set the reply code to success - reply.type(NameReply.SUCCESS); - - } else { - - ACE.DEBUG ("Key " + request.name() + " already exists"); - - // Set reply code to failure - reply.type(NameReply.FAILURE); - - // reply error code unused as far as I know - } - - reply.streamOutTo(peer ().dataOutputStream ()); - } - - /** - * Given a name, this looks up and returns the type and value. This is - * done by sending back a full NameRequest with the correct info. If - * there is a problem, an "empty" NameRequest is returned -- it has no - * name, type, or value fields. - * - *@param request NameRequest sent by the client (has the name to lookup) - */ - void resolve (NameRequest request) throws IOException - { - // A NameRequest is also used in response - NameRequest result; - - // If the requested name is in the hash table, return the data - if (this.mapping_.containsKey(request.name())) { - - // Get the data pair based on the name - ValueType vt = (ValueType)this.mapping_.get(request.name()); - - ACE.DEBUG("Good resolve: " + vt.value_); - - // Fill the reply structure - result = new NameRequest(NameRequest.RESOLVE, - null, - vt.value_, - vt.type_, - null); - - } else { - - // Otherwise return a null response - result = new NameRequest(NameRequest.RESOLVE, - null, - null, - null, - null); - - } - - result.streamOutTo (peer ().dataOutputStream ()); - } - - /** - * - * Given a name, remove its entry in the mapping. Returns a NameReply - * to the client with NameReply.SUCCESS or NameReply.FAILURE. - * - *@param request NameRequest from the client (has the name to remove) - */ - void unbind (NameRequest request) throws IOException - { - NameReply reply = new NameReply(); - - // If the given key isn't in the table, return an error - // Otherwise remove it. Uses a NameReply to respond. - if (!this.mapping_.containsKey(request.name())) - reply.type(NameReply.FAILURE); - else { - this.mapping_.remove(request.name()); - reply.type(NameReply.SUCCESS); - } - - // Send the reply out to the socket - reply.streamOutTo (peer ().dataOutputStream ()); - } - - /** - * - * Given a pattern string (given in NameRequest's name field), this - * finds all the entries in the mapping which have a name that begins with - * the string. Each one is sent back separately via a NameRequest, and this - * sequence is followed by a blank NameRequest. - * - *@param pattern Pattern to find (what result names should - * begin with) - *@param completeLookup Should the value and type be returned as well? - */ - void listByName (String pattern, - boolean completeLookup) throws IOException - { - // Get a listing of all the keys in the hash table - Enumeration enum = this.mapping_.keys(); - - // References used in the loop - String name; - ValueType vt; - - // A NameRequest is used to return each item corresponding to the pattern. - NameRequest result = - new NameRequest((completeLookup ? NameRequest.LIST_NAMES : - NameRequest.LIST_NAME_ENTRIES), - null, - null, - null, - null); - - // Keep ourselves safe from null pointer exceptions - if (pattern == null) - pattern = new String(""); - - // Scan through all the elements - while (enum.hasMoreElements()) { - - // Get a key - name = (String)enum.nextElement(); - - // Does it fit the pattern? - if (name.startsWith(pattern)) { - - // Set the result name - result.name(name); - - // Only make another hash table request if the user - // wants all the data - if (completeLookup) { - - // Get data from the hash table - vt = (ValueType)mapping_.get(name); - - // Set the rest of the data - result.type(vt.type_); - result.value(vt.value_); - } - - // Send it to the socket - result.streamOutTo (peer ().dataOutputStream ()); - } - } - - // Send final null message - result.name(null); - result.type(null); - result.value(null); - result.requestType(NameRequest.MAX_ENUM); - result.streamOutTo (peer ().dataOutputStream ()); - } - - /** - * - * Given a pattern string (given in NameRequest's name field), this - * finds all the entries in the mapping which have a type that begins with - * the string. Each one is sent back separately via a NameRequest, and this - * sequence is followed by a blank NameRequest. - * - *@param pattern Pattern to find (what result types should - * begin with) - *@param completeLookup Should the value be returned as well? This is - * only used to decide between LIST_TYPES and - * LIST_TYPE_ENTRIES since we might as well send - * back both if we look them up together. - */ - void listByType (String pattern, - boolean completeLookup) throws IOException - { - // Get a listing of all the keys in the hash table - Enumeration enum = this.mapping_.keys(); - - // References used in the loop - String name; - ValueType vt; - - // A NameRequest is used to return each item corresponding to the pattern. - NameRequest result = - new NameRequest((completeLookup ? NameRequest.LIST_TYPES : - NameRequest.LIST_TYPE_ENTRIES), - null, - null, - null, - null); - // Keep ourselves safe from null pointer exceptions - if (pattern == null) - pattern = new String(""); - - // Scan through all the elements - while (enum.hasMoreElements()) { - - // Get a key - name = (String)enum.nextElement(); - - // Have to get all the data for this entry to compare - vt = (ValueType)mapping_.get(name); - - // Does it fit the pattern? - if (vt.type_ != null) - if (vt.type_.startsWith(pattern)) { - - // Set the result values - result.name(name); - result.type(vt.type_); - result.value(vt.value_); - - // Send it out to the socket - result.streamOutTo (peer ().dataOutputStream ()); - } - } - - // Send final null message - result.name(null); - result.type(null); - result.value(null); - result.requestType(NameRequest.MAX_ENUM); - result.streamOutTo (peer ().dataOutputStream ()); - } - /** - * - * Given a pattern string (given in NameRequest's name field), this - * finds all the entries in the mapping which have a value that begins with - * the string. Each one is sent back separately via a NameRequest, and this - * sequence is followed by a blank NameRequest. - * - *@param pattern Pattern to find (what result values should - * begin with) - *@param completeLookup Should the value be returned as well? This is - * only used to decide between LIST_TYPES and - * LIST_TYPE_ENTRIES since we might as well send - * back both if we look them up together. - */ - void listByValue (String pattern, - boolean completeLookup) throws IOException - { - // Get a listing of all the keys in the hash table - Enumeration enum = this.mapping_.keys(); - - // References used in the loop - String name; - ValueType vt; - - // A NameRequest is used to return each item corresponding to the pattern. - NameRequest result = - new NameRequest((completeLookup ? NameRequest.LIST_VALUES : - NameRequest.LIST_VALUE_ENTRIES), - null, - null, - null, - null); - // Keep ourselves safe from null pointer exceptions - if (pattern == null) - pattern = new String(""); - - // Scan through all the elements - while (enum.hasMoreElements()) { - - // Get a key - name = (String)enum.nextElement(); - - // Have to get all the data for this entry to compare - vt = (ValueType)mapping_.get(name); - - // Does it fit the pattern? - if (vt.value_ != null) - if (vt.value_.startsWith(pattern)) { - - // Set the result values - result.name(name); - result.type(vt.type_); - result.value(vt.value_); - - // Send it out to the socket - result.streamOutTo (peer ().dataOutputStream ()); - } - } - - // Send final null message - result.name(null); - result.type(null); - result.value(null); - result.requestType(NameRequest.MAX_ENUM); - result.streamOutTo (peer ().dataOutputStream ()); - } - - // References to the hash table and the timer queue - private Hashtable mapping_; - - /** - * A simple wrapper to keep the type and value together in - * the hash table. - */ - static class ValueType implements Serializable - { - /** - * Constructor - * - *@param type Type string to include - *@param value Value string to include - */ - ValueType(String type, String value) - { this.type_ = type; this.value_ = value; } - - public String type_; - public String value_; - } -} diff --git a/java/JACE/netsvcs/Naming/NameProxy.java b/java/JACE/netsvcs/Naming/NameProxy.java deleted file mode 100644 index 9b1b3102f1d..00000000000 --- a/java/JACE/netsvcs/Naming/NameProxy.java +++ /dev/null @@ -1,405 +0,0 @@ -/************************************************* - * - * = PACKAGE - * netsvcs.Naming - * - * = FILENAME - * NameProxy.java - * - *************************************************/ -package JACE.netsvcs.Naming; - -import java.io.*; -import java.net.*; -import java.util.*; -import JACE.OS.*; -import JACE.SOCK_SAP.*; -import JACE.Connection.*; - -/** - * Proxy which clients can use to interact with the naming service. - * Can be used with the Connector. - * - *@see JACE.Connection.Connector - *@see NameAcceptor - *@see NameHandler - * - *@author Everett Anderson - */ -public class NameProxy extends SvcHandler -{ - /** - * Constructor, connects itself using a Connector. - * - *@param host name of the host of the naming service - *@param port port to connect to on the host - */ - public NameProxy (String host, int port) - throws UnknownHostException, - SocketException, - InstantiationException, - IllegalAccessException, - IOException - { - Connector c = new Connector (); - c.open (host, port); - c.connect (this); - } - - /** - * Default constructor. Proxies created with this constructor must - * be connected to use. - */ - public NameProxy () - { - } - - /** - * Constructor taking a SOCKStream to use. - * - *@param sock SOCKStream already open to the naming service - */ - public NameProxy (SOCKStream sock) - { - this.stream_ = sock; - } - - /** - * Initialize this proxy. (Called by Connector) - */ - public int open (Object obj) - { - connected_ = true; - return 0; - } - - /** - * Close the proxy, shutting down the connection to the service. - */ - public int close () - { - if (!connected_) - return 0; - - try { - this.peer ().close (); - } catch (IOException e) { - return -1; - } finally { - connected_ = false; - } - - return 0; - } - - /** - * Attempt to bind the given data pair - * @param name Name/key - * @param value Value to bind - * - * @return True iff bind is successful - */ - public boolean bind(String name, String value) throws IOException - { - return this.bind(name, value, null, false); - } - - /** - * Attempt to bind the given data triplet - * @param name Name/key - * @param value Value to bind - * @param type Type to bind (another string) - * - * @return True iff the bind was successful - */ - public boolean bind(String name, String value, String type) - throws IOException - { - return this.bind(name, value, type, false); - } - - /** - * The most generic of the bind methods. Allows factoring out of - * common code. Not public. - */ - boolean bind (String name, String value, String type, boolean rebind) - throws IOException - { - // Create a new NameRequest with the desired info - NameRequest request = - new NameRequest(rebind ? NameRequest.REBIND : NameRequest.BIND, - name, - value, - type, - null); - - // Send it to the naming service - request.streamOutTo(this.stream_); - - // Create a reply - NameReply reply = new NameReply(); - - // Get the status of the bind from the naming service - reply.streamInFrom(this.stream_); - - // Return true on success - return (reply.type() == NameReply.SUCCESS ? true : false); - } - - /** - * Rebind a name and a value - * @param name Name/key - * @param value Bound value - * - * @return True if the rebind was successful - */ - public boolean rebind (String name, String value) throws IOException - { - return this.bind(name, value, null, true); - } - - /** - * Rebind a name, value, and type - * @param name Name/key - * @param value Bound value - * @param type Bound type - * - * @return True if rebind was successful - */ - public boolean rebind (String name, String value, String type) - throws IOException - { - return this.bind(name, value, type, true); - } - /** - * Look up information bound to the given key/name. - * - * @param name Name/key - * - * @return Vector with three elements: - * 0 Name/key - * 1 Value - * 2 Type - */ - public Vector resolve (String name) throws IOException - { - // Create a new NameRequest with the name & request type - NameRequest request = new NameRequest(NameRequest.RESOLVE, - name, - null, - null, - null); - - // Send it to the naming service - request.streamOutTo(this.stream_); - - // Get a response (hopefully with the value and type) - request.streamInFrom(this.stream_); - - // Dump the result into a vector - Vector result = new Vector(); - - result.addElement(request.name()); - result.addElement(request.value()); - result.addElement(request.type()); - - // Cut it down to the size we need - result.trimToSize(); - - return result; - } - - /** - * Remove the entry in the mapping corresponding to the given name/key. - * - * @param name Name/key - * - * @return True if the unbind was successful - */ - public boolean unbind (String name) throws IOException - { - NameRequest request = new NameRequest(NameRequest.UNBIND, - name, - null, - null, - null); - // Send the request to the naming service - request.streamOutTo(this.stream_); - - NameReply reply = new NameReply(); - - // Get reply - reply.streamInFrom(this.stream_); - - return (reply.type() == NameReply.SUCCESS ? true : false); - } - - /** - * Return a vector that's a list of names (Strings) that begin with - * the given pattern - * @param pattern Search pattern - * @return Vector List of names - */ - public Vector listNames (String pattern) throws IOException - { - return this.requestSimpleList(pattern, NameRequest.LIST_NAMES); - } - - /** - * Return a vector that's a list of types (Strings) that begin with - * the given pattern - * @param pattern Search pattern - * @return Vector List of types - */ - public Vector listTypes (String pattern) throws IOException - { - return this.requestSimpleList(pattern, NameRequest.LIST_TYPES); - } - - /** - * Return a vector that's a list of values (Strings) that begin with - * the given pattern - * @param pattern Search pattern - * @return Vector List of values - */ - public Vector listValues (String pattern) throws IOException - { - return this.requestSimpleList(pattern, NameRequest.LIST_VALUES); - } - - /** - * Non-public generic list gathering method - */ - Vector requestSimpleList (String pattern, int type) throws IOException - { - // Make request for a list of the given type - NameRequest request = new NameRequest(type, - pattern, - null, - null, - null); - request.streamOutTo(this.stream_); - - // Allocate and reuse the DIS here rather than each time we call - // streamInFrom - DataInputStream dis = new DataInputStream(this.stream_.inputStream()); - - request.streamInFrom(dis); - Vector result = new Vector(); - - // Add elements until there's a null message with the MAX_ENUM - // request type - while (request.requestType() != NameRequest.MAX_ENUM) { - if (type == NameRequest.LIST_NAMES) - result.addElement(new String(request.name())); - else - if (type == NameRequest.LIST_VALUES) - result.addElement(new String(request.value())); - else - result.addElement(new String(request.type())); - - request.streamInFrom(dis); - } - - // Adjust the vector to the minimal size - result.trimToSize(); - - return result; - } - - /** - * Get a vector with the entire data set for entries whose name begins with - * the given pattern. Each element in the vector is another vector - * with the following layout: - * 0 Name/key - * 1 Value - * 2 Type - * - * @param pattern Search pattern - * @return Vector of vectors - */ - public Vector listNameEntries (String pattern) throws IOException - { - return this.requestComplexList(pattern, NameRequest.LIST_NAME_ENTRIES); - } - - /** - * Get a vector with the entire data set for entries whose value begins with - * the given pattern. Each element in the vector is another vector - * with the following layout: - * 0 Name/key - * 1 Value - * 2 Type - * - * @param pattern Search pattern - * @return Vector of vectors - */ - public Vector listValueEntries (String pattern) throws IOException - { - return this.requestComplexList(pattern, NameRequest.LIST_VALUE_ENTRIES); - } - - /** - * Get a vector with the entire data set for entries whose type begins with - * the given pattern. Each element in the vector is another vector - * with the following layout: - * 0 Name/key - * 1 Value - * 2 Type - * - * @param pattern Search pattern - * @return Vector of vectors - */ - - public Vector listTypeEntries (String pattern) throws IOException - { - return this.requestComplexList(pattern, NameRequest.LIST_TYPE_ENTRIES); - } - - /** - * Non-public generic method for getting a a vector of vectors with the - * entire data set for entries fitting the given pattern. - */ - Vector requestComplexList (String pattern, int type) throws IOException - { - // Create request with desired type - NameRequest request = new NameRequest(type, - pattern, - null, - null, - null); - // Send it to the naming service - request.streamOutTo(this.stream_); - - // Allocate the DIS here and reuse - DataInputStream dis = new DataInputStream(this.stream_.inputStream()); - - // Get the first response - request.streamInFrom(dis); - Vector result = new Vector(); - - // Loop while we don't see a null response with the MAX_ENUM - //request type - while (request.requestType() != NameRequest.MAX_ENUM) { - Vector entry = new Vector(); - - // Create an element in the main vector - entry.addElement(request.name()); - entry.addElement(request.value()); - entry.addElement(request.type()); - entry.trimToSize(); - - // Add it to the result - result.addElement(entry); - - // Get another NameRequest - request.streamInFrom(dis); - } - - result.trimToSize(); - - return result; - } - - private boolean connected_ = false; -} diff --git a/java/JACE/netsvcs/Naming/NameReply.java b/java/JACE/netsvcs/Naming/NameReply.java deleted file mode 100644 index d20c9ed05f0..00000000000 --- a/java/JACE/netsvcs/Naming/NameReply.java +++ /dev/null @@ -1,169 +0,0 @@ -/************************************************* - * - * = PACKAGE - * netsvcs.Naming - * - * = FILENAME - * NameReply.java - * - *************************************************/ -package JACE.netsvcs.Naming; - -import java.io.*; -import java.util.*; -import JACE.OS.*; -import JACE.Connection.*; -import JACE.Reactor.*; -import JACE.ASX.*; -import JACE.SOCK_SAP.*; - -/** - * Used by the naming server to give quick status messages - * to the client. This is only used to signal the success or - * failure of bind and unbind requests. The error number seems - * to be unused in the C++ version. - * - *@see NameHandler - *@author Everett Anderson - * - */ -public class NameReply -{ - /** Successful operation indicator */ - public final static int SUCCESS = 0; - - /** Failed operation indicator */ - public final static int FAILURE = -1; - - /** - * Default Constructor (success, errno 0) - */ - public NameReply () - { - this.type_ = this.SUCCESS; - this.errno_ = 0; - } - - /** - * Constructor - * - *@param type Success or failure - *@param err Error number (unused) - */ - public NameReply (int type, int err) - { - this.type_ = type; - this.errno_ = err; - } - - /** - * Length accessor - */ - int length() - { return this.length_; } - - /** - * Type accessor -- success or failure - */ - int type() - { return this.type_; } - - /** - * Error number accessor - */ - int errno() - { return this.errno_; } - - /** - * Set type - * @param type New type - */ - void type(int type) - { this.type_ = type; } - - /** - * Set error number - * @param errno New error number - */ - void errno(int errno) - { this.errno_ = errno; } - - /** - * Send this data to the given SOCKStream. - * - *@param sock SOCKStream to send to - */ - public void streamOutTo (JACE.SOCK_SAP.SOCKStream sock) throws IOException - { - streamOutTo (sock.dataOutputStream ()); - } - - /** - * Send this instance to the given DataOutputStream. - */ - public void streamOutTo (DataOutputStream dos) throws IOException - { - dos.writeInt(this.length_); - dos.writeInt(this.type_); - dos.writeInt(this.errno_); - - dos.flush(); - } - - /** - * Send this instance to the given OutputStream. - */ - public void streamOutTo (OutputStream os) throws IOException - { - BufferedOutputStream bos = new BufferedOutputStream (os); - DataOutputStream dos = new DataOutputStream (bos); - - streamOutTo (dos); - } - - /** - * Fill the fields of this instance from data in the socket - * - *@param sock SOCKStream to read from - */ - public void streamInFrom (JACE.SOCK_SAP.SOCKStream sock) throws IOException - { - this.streamInFrom(sock.dataInputStream ()); - } - - /** - * Fill this instance from the DataInputStream (which should be buffered). - * - *@param dis DataInputStream to use - */ - public void streamInFrom (DataInputStream dis) throws IOException - { - int length = dis.readInt(); - - if (length != this.length_) - throw new IOException("Incorrect NameReply length"); - - type_ = dis.readInt(); - errno_ = dis.readInt(); - } - - /** - * Fill this instance from the given InputStream. - */ - public void streamInFrom (InputStream is) throws IOException - { - BufferedInputStream bis = new BufferedInputStream (is); - DataInputStream dis = new DataInputStream (bis); - - streamInFrom (dis); - } - - final static int length_ = 12; - - int type_; - int errno_; -} - - - - diff --git a/java/JACE/netsvcs/Naming/NameRequest.java b/java/JACE/netsvcs/Naming/NameRequest.java deleted file mode 100644 index 706b14728c5..00000000000 --- a/java/JACE/netsvcs/Naming/NameRequest.java +++ /dev/null @@ -1,373 +0,0 @@ -/************************************************* - * - * = PACKAGE - * netsvcs.Naming - * - * = FILENAME - * NameRequest.java - * - *@see netsvcs.Naming.NameHandler - * - *@author Everett Anderson - * - *************************************************/ -package JACE.netsvcs.Naming; - -import java.io.*; -import java.util.*; -import JACE.OS.*; -import JACE.Connection.*; -import JACE.Reactor.*; -import JACE.ASX.*; -import JACE.SOCK_SAP.*; - -/** - * Holds information including name, value, type, and request - * type. Used by both client and naming server as detailed in - * NameHandler. Compatible with the C++ ACE_Name_Request. - * - *@see NameHandler - */ -public class NameRequest -{ - /** Bind request type */ - public static final int BIND = 1; - - /** Rebind request type */ - public static final int REBIND = 2; - - /** Resolve request type */ - public static final int RESOLVE = 3; - - /** Unbind request type */ - public static final int UNBIND = 4; - - /** List Names request type */ - public static final int LIST_NAMES = 5; - - /** List Values request type */ - public static final int LIST_VALUES = 13; - - /** List Types request type */ - public static final int LIST_TYPES = 21; - - /** List Name Entries request type */ - public static final int LIST_NAME_ENTRIES = 6; - - /** List Value Entries request type */ - public static final int LIST_VALUE_ENTRIES = 14; - - /** List Type Entries request type */ - public static final int LIST_TYPE_ENTRIES = 22; - - /** Type used to send a final "null" request when returning - * a list of items */ - public static final int MAX_ENUM = 11; - /** - * Maximum length of a NameRequest instance. - * See C++ ACE Name_Request_Reply.h for the details of the - * value of this constant. - */ - public static final int MAX_LEN = 6182; - - /** - * Default constructor. - */ - public NameRequest () - { - this.name_ = this.value_ = this.type_ = null; - this.length_ = 32; - } - - /** - * Constructor - * - * @param requestType Type of request this is (BIND, REBIND, etc) - * @param name Key to bind - * @param value Value to bind - * @param type Type to couple with the value - * @param timeout Timer information (not really used in JACE yet) - */ - public NameRequest(int requestType, - String name, - String value, - String type, - TimeValue timeout) - { - this.requestType_ = requestType; - - if (timeout == null) { - - this.blockForever_ = 1; - this.secTimeout_ = 0; - this.usecTimeout_ = 0; - } else { - - this.blockForever_ = 0; - this.secTimeout_ = (int)timeout.sec(); - this.usecTimeout_ = (int)timeout.getMilliTime() * 1000; - } - - // This is necessary to make sure null pointer exceptions are - // avoided. It makes it more consistent later on - if (name == null) - this.name_ = new String(""); - else - this.name_ = new String(name); - if (value == null) - this.value_ = new String(""); - else - this.value_ = new String(value); - if (type == null) - this.type_ = new String(""); - else - this.type_ = new String(type); - - // Set the length - this.calculateLength(); - } - - /** - * Calculate the transmission length (bytes) of this structure - */ - private void calculateLength() - { - // The type is sent as an 8 bit data type (chars in the C++ version), - // but the name and value are sent as 16 bit chars (ACE_USHORT16's in C++) - - this.length_ = 34 + this.type_.length() + 2 * (this.name_.length() + - this.value_.length()); - } - - /** - * Return the transmission length - */ - public int length() - { return this.length_; } - - /** - * Return the name/key - */ - public String name() - { return new String(this.name_); } - - /** - * Set the name/key - * @param name Name to set to - */ - public void name(String name) - { - if (name == null) - this.name_ = new String(""); - else - this.name_ = new String(name); - - this.calculateLength(); - } - - /** - * Return the value - */ - public String value() - { return new String(this.value_); } - - /** - * Set the value - * @param value New value - */ - public void value(String value) - { - if (value == null) - this.value_ = new String(""); - else - this.value_ = new String(value); - - this.calculateLength(); - } - - /** - * Return the type - */ - public String type() - { return new String(this.type_); } - - /** - * Set the type - * @param type New type - */ - public void type(String type) - { - if (type == null) - this.type_ = new String(""); - else - this.type_ = new String(type); - - this.calculateLength(); - } - - /** - * Fill the fields of this instance with data from the InputStream. - */ - public void streamInFrom (InputStream is) throws IOException - { - BufferedInputStream bis = new BufferedInputStream (is); - - DataInputStream dis = new DataInputStream (bis); - - this.streamInFrom(dis); - } - - /** - * Fill the fields of this instance with data from the SOCKStream. - */ - public void streamInFrom (SOCKStream sock) throws IOException - { - streamInFrom (sock.dataInputStream ()); - } - - /** - * Fill the fields of this instance from the given DataInputStream - * - *@param dis DataInputStream to read from - */ - public void streamInFrom (DataInputStream dis) throws IOException - { - // Read the length (32 bits) - length_ = dis.readInt(); - - if (length_ > MAX_LEN) - throw new IOException ("Invalid NameRequest length " + length_); - - // Read the request type - requestType_ = dis.readInt(); - - // Can we block forever to fulfill this request? (unused) - blockForever_ = dis.readInt(); - - // How long until we should time out this request? (unused) - secTimeout_ = dis.readInt(); - usecTimeout_ = dis.readInt(); - - // The sizes are in bytes, and there are two bytes per char - // (ACE_USHORT16 in C++ land) - int nameLen = dis.readInt() / 2; - int valueLen = dis.readInt() / 2; - - int typeLen = dis.readInt(); - - // Read the name -- just read chars since they're 16 bits. - // Hopefully the SOCKStream has buffered the data - char buf[] = new char[nameLen]; - for (int i = 0; i < nameLen; i++) { - buf[i] = dis.readChar(); - } - this.name_ = new String(buf); - - // Read the value - buf = new char[valueLen]; - for (int i = 0; i < valueLen; i++) - buf[i] = dis.readChar(); - this.value_ = new String(buf); - - // Read the type -- now we can use readFully since - // the type was sent as 8 bit chars - byte tbuf[] = new byte[typeLen]; - dis.readFully(tbuf); - this.type_ = new String(tbuf); - - // Skip the null char at the end - dis.skipBytes(2); - } - - /** - * Write the data of this instance to the given SOCKStream. - */ - public void streamOutTo (SOCKStream sock) throws IOException - { - streamOutTo (sock.dataOutputStream ()); - } - - /** - * Write the data of this instance to the given OutputStream. - */ - public void streamOutTo (OutputStream os) throws IOException - { - BufferedOutputStream bos = new BufferedOutputStream (os); - DataOutputStream dos = new DataOutputStream (bos); - - streamOutTo (dos); - } - - /** - * Send this NameRequest out to the given DataOutputStream - */ - public void streamOutTo (DataOutputStream dos) throws IOException - { - dos.writeInt(length_); - dos.writeInt(requestType_); - dos.writeInt(blockForever_); - dos.writeInt(secTimeout_); - dos.writeInt(usecTimeout_); - - // Byte sizes are sent, and the name and value are stored as - // 16 bit char arrays (ACE_USHORT16 arrays in C++ version) - dos.writeInt(this.name_.length() * 2); - dos.writeInt(this.value_.length() * 2); - dos.writeInt(this.type_.length()); - - // Making sure the name_ wasn't null comes in handy - // in situations like this - dos.writeChars(this.name_); - dos.writeChars(this.value_); - dos.writeBytes(this.type_); - - // Null termination - dos.writeChar(0); - - // Send it for real - dos.flush(); - } - - /** - * Set the requestType - *@param type Type to set to - */ - public void requestType(int type) - { - this.requestType_ = type; - } - - /** - * Get requestType - */ - public int requestType() - { - return this.requestType_; - } - - /** - * Can we block forever to fulfill the request? (unused) - */ - public boolean blockForever() - { - return (this.blockForever_ != 0) ? true : false; - } - - /** - * Allowed timeout (unused) - */ - public int secTimeout() - { - return this.secTimeout_; - } - - int length_; - int requestType_; - int blockForever_; - int secTimeout_; - int usecTimeout_; - - String name_; - String value_; - String type_; -}; diff --git a/java/JACE/netsvcs/Naming/c.bat b/java/JACE/netsvcs/Naming/c.bat deleted file mode 100644 index 2b540b1b051..00000000000 --- a/java/JACE/netsvcs/Naming/c.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -javac -d c:\Everett\JACE\classes *.java diff --git a/java/JACE/netsvcs/Naming/package.html b/java/JACE/netsvcs/Naming/package.html deleted file mode 100644 index b7ee951fc2e..00000000000 --- a/java/JACE/netsvcs/Naming/package.html +++ /dev/null @@ -1,11 +0,0 @@ -<!-- $Id$ --> -<HTML> -<BODY> -Naming Service for associating names and values in a distributed system. -<P> -A simple test program for NameProxy and the naming service is in -the tests directory under netsvcs\Naming. - -@see <a href="http://www.cs.wustl.edu/~schmidt/ACE-netsvcs.html">ACE Network Services</a> -</BODY> -</HTML> diff --git a/java/JACE/netsvcs/Server.java b/java/JACE/netsvcs/Server.java deleted file mode 100644 index 199a830d0c5..00000000000 --- a/java/JACE/netsvcs/Server.java +++ /dev/null @@ -1,356 +0,0 @@ -package JACE.netsvcs; - -import java.io.*; -import java.net.*; -import java.util.*; -import JACE.OS.*; -import JACE.Connection.*; -import JACE.Misc.GetOpt; -import JACE.ServiceConfigurator.Service; - -/** - * Abstract class providing default implementations for several - * Service methods. Currently, all the network services - * descend from this class. The real work for a service is done - * by a Handler. - * <P> - * Inner classes are provided for thread per connection - * and single threaded server activation strategies. Currently, - * specifying a single threaded strategy means that the server will - * disconnect the client after handling one request. Acceptor and - * EventHandler may be changed later to incorporate handleInput to - * address this. Thus, the default activation strategy is thread - * per connection. - * - *@see Handler - *@see JACE.Connection.ActivateStrategy - *@author Everett Anderson - */ -public abstract class Server extends Acceptor implements Runnable -{ - /** - * Safely shuts down all the handlers as well as the accepting socket. - * - *@return -1 on failure, 0 on success - */ - public synchronized int fini () - { - if (!done ()) { - ACE.DEBUG ("Shutting down " + name ()); - try { - this.done_ = true; - for (int i = handlers_.size () - 1; i >= 0; i--) - ((Handler)handlers_.elementAt (i)).close (); - - this.sockAcceptor_.close(); - } catch (IOException e) { - ACE.ERROR(e); - return -1; - } - } - - return 0; - } - - /** - * Returns information about the state of the service such as - * suspended, not running, or running. - */ - public String info () - { - if (suspended ()) - return "suspended"; - else - if (done ()) - return "not running"; - else - return "running on port " + port_; - } - - /** - * Provided for extra initialization in subclasses after the - * command line arguments have been parsed but before starting the - * service. This is a good place to set the default ActivateStrategy - * since you can make sure it wasn't set in parseArgs. The default - * implementation sets the strategy to Server.ThreadPerConnection. - * - *@return -1 on error, 0 on success - */ - protected int initialize () - { - if (activateStrategy_ == null) - activateStrategy (new Server.ThreadPerConnection ()); - - return 0; - } - - /** - * Template method for initialization. Calls parseArgs, initialize, - * sets the done() state to false, and starts this Server in its own - * thread. If parseArgs fails, this calls printUsage. - * - *@param args command line arguments - *@return -1 on failure, 0 on success - */ - public int init (String [] args) - { - // Parse arguments - if (this.parseArgs (args) == -1) { - printUsage (); - return -1; - } - - if (initialize () < 0) { - ACE.ERROR (name () + " failed initializing"); - return -1; - } - - ACE.DEBUG ("Using " + activateStrategy_.getClass().getName ()); - ACE.DEBUG ("Starting " + name () + " on port: " + this.port_); - - done_ = false; - - // Run in own thread of control so that we don't block the caller - new Thread (this).start(); - return 0; - } - - /** - * Called by the JVM when this Server starts running in its own - * thread. - */ - public void run () - { - try { - this.open (this.port_); - while (!this.done ()) { - this.accept (); - } - } catch (InstantiationException e) { - ACE.ERROR (e); - } catch (IllegalAccessException e) { - ACE.ERROR (e); - } catch (IOException e) { - if (!done ()) - ACE.ERROR (e); - } finally { - fini (); - } - } - - /** - * Calls the appropriate activation strategy with the given - * service handler. This assumes the SvcHandler is an instance - * of type Handler, and sets its parent accordingly. - * - *@param sh SvcHandler (assumed to be a Handler) to activate - *@return -1 on failure, 0 on success - */ - protected int activateSvcHandler (SvcHandler sh) - { - if (done ()) - return -1; - - addHandler (sh); - ((Handler)sh).parent (this); - - while (suspended () && !done ()) - Thread.yield (); - - if (activateStrategy_.activateSvcHandler (sh) != 0) { - removeHandler (sh); - return -1; - } - - return 0; - } - - /** - * Add the given SvcHandler to this Servers list of handlers. - * @param sh service handler to add (assumed to be a Handler) - */ - protected void addHandler (SvcHandler sh) - { - handlers_.addElement (sh); - } - - /** - * Called by Handler instances during their close () method. - *@param sh service handler to remove - */ - public void removeHandler (SvcHandler sh) - { - handlers_.removeElement (sh); - } - - /** - * Parses the command line arguments. Subclasses must override - * this. - * - *@param args command line arguments - *@return -1 on failure, 0 on success - */ - protected abstract int parseArgs (String [] args); - - /** - * Create the appropriate Handler. Subclasses must override this, - * returning a new instance of the proper subclass of Handler. - * - *@return new Handler instance - */ - protected abstract SvcHandler makeSvcHandler (); - - /** - * Print out the correct syntax and meaning of the command line - * arguments. - */ - protected abstract void printUsage (); - - /** - * Set the ActivateStrategy for handlers. - * - *@param strategy new ActivateStrategy to use - *@see JACE.Connection.ActivateStrategy - */ - protected void activateStrategy (ActivateStrategy strategy) - { - activateStrategy_ = strategy; - } - - /** - * Return the current ActivateStrategy for handlers. - * - *@return current ActivateStrategy instance - */ - protected ActivateStrategy activateStrategy () - { - return activateStrategy_; - } - - /** - * Check to see if this Server has been shut down. - */ - protected synchronized boolean done () - { - return done_; - } - - /** - * Useful method for subclasses when parsing the port command - * line option. - * - *@param port String gathered from the command line representing the port - *@return false if there was an error, true if successful - */ - protected boolean port (String port) - { - try { - - this.port_ = Integer.parseInt (port); - - } catch (NumberFormatException e) { - ACE.ERROR("Invalid port specified: " + e.getMessage ()); - return false; - } catch (ArrayIndexOutOfBoundsException e) { - ACE.ERROR("Port option requires an argument"); - return false; - } - - return true; - } - - /** - * Useful method for subclasses when trying to load and instantiate - * a certain class from a command line argument. This can be used - * when a possible command line argument is what kind of activation - * strategy is used for handlers. - * - *@param classname name of the class to load and create an instance of - *@param descrption descrption of what type of class it is - *@return null if failed loading, a new instance of the class on success - */ - protected Object newStrategyInstance (String classname, - String description) - { - try { - Class factory = Class.forName (classname); - - return factory.newInstance (); - - } catch (ClassNotFoundException e) { - ACE.ERROR("Unable to find " + description + ": " - + e.getMessage ()); - } catch (InstantiationException e) { - ACE.ERROR ("Instantiating " + description + ": " - + e.getMessage ()); - } catch (IllegalAccessException e) { - ACE.ERROR ("Illegal access on " + description + ": " - + e.getMessage ()); - } - - return null; - } - - /** - * Shuts down the Server if it wasn't already done - */ - protected void finalize () throws Throwable - { - fini (); - } - - private boolean done_ = true; - - /** - * List of currently active Handlers - */ - protected Vector handlers_ = new Vector (); - private ActivateStrategy activateStrategy_ = null; - - /** - * Activation strategy in which each Handler is run in its own - * Thread. - */ - public static class ThreadPerConnection extends ActivateStrategy - { - /** - * Opens the given service handler, and runs it in its own - * Thread. - *@param sh service handler to activate - *@return -1 on failure, 0 on success - */ - public int activateSvcHandler (SvcHandler sh) - { - if (sh.open (null) < 0) - return -1; - - new Thread (sh).start (); - return 0; - } - } - - /** - * Activation strategy in which all Handlers are run in the - * Server Thread in sequence. This assumes that the given - * SvcHandler is a Handler instance. - */ - public static class SingleThreaded extends ActivateStrategy - { - /** - * Opens the given service handler, calls Handler.handleRequest, and - * then Handler.close before returning. - *@param sh service handler to activate (assumed to be a Handler) - *@return -1 on failure, 0 on success - */ - public int activateSvcHandler (SvcHandler sh) - { - if (sh.open (null) < 0) - return -1; - - ((Handler)sh).handleRequest (); - ((Handler)sh).close (); - - return 0; - } - } -} diff --git a/java/JACE/netsvcs/Time/TSClerkHandler.java b/java/JACE/netsvcs/Time/TSClerkHandler.java deleted file mode 100644 index e0a2290d81b..00000000000 --- a/java/JACE/netsvcs/Time/TSClerkHandler.java +++ /dev/null @@ -1,195 +0,0 @@ -package JACE.netsvcs.Time; - -import java.io.*; -import java.net.*; - -import JACE.OS.*; -import JACE.Connection.*; -import JACE.ASX.*; - -/** - * Requests a time update from a time server. This is used by the - * TSClerkProcessor to query a server. - */ -public class TSClerkHandler extends SvcHandler -{ - /** - * Constructor. - * - *@param parent TSClerkProcessor which is creating this instance - *@param host name of the machine this handler is connected to - *@param port port on the time server to connect to - */ - public TSClerkHandler (TSClerkProcessor parent, - String host, - int port) - { - parent_ = parent; - host_ = host; - port_ = port; - } - - /** - * Initialize this handler. Called automatically by Connector when a - * successful connection is made. - * - *@return -1 on failure, 0 on success - */ - public int open (Object obj) - { - ACE.DEBUG ("Successful connection to " + host ()); - connected (true); - return 0; - } - - /** - * Safely shut down this handler, closing the socket. - * - *@return -1 on failure, 0 on success - */ - public synchronized int close () - { - if (!connected ()) - return 0; - - ACE.DEBUG ("Shutting down connection to " + host ()); - try { - peer ().close (); - } catch (IOException e) { - return -1; - } finally { - connected (false); - } - - return 0; - } - - /** - * Accessor for the port number of the server. - */ - public int port () - { - return port_; - } - - /** - * Accessor for the host name of the server. - */ - public String host () - { - return host_; - } - - /** - * Check to see if this handler is currently connected to a server. - */ - public synchronized boolean connected () - { - return connected_; - } - - /** - * Set the connected state. - * - *@param state true if connected, false if not - */ - protected synchronized void connected (boolean state) - { - connected_ = state; - } - - /** - * (Isn't used, just fulfills the interface. Returns -1 by - * default) - */ - public int handleTimeout (TimeValue tv, Object obj) - { - return -1; - } - - /** - * (Isn't used, just fulfills the interface.) - */ - public void run () - { - ACE.ERROR ("TSClerkHandler is not setup to run in its own thread"); - } - - /** - * Sends a request to the server and waits for a reply. This is called - * by TSClerkProcessor. - * - *@return -1 on failure, 0 on success - */ - public int sendRequest () - { - // Ask the clerk processor to connect this handler if it isn't - // already. Thus, it tries to reconnect if the server has gone - // down. - if (!connected ()) - parent_.connectHandler (this, host_, port_); - - TimeRequest request = new TimeRequest (); - - long start, stop; - try { - - start = System.currentTimeMillis (); - request.streamOutTo (peer().outputStream ()); - - request.streamInFrom (peer().inputStream ()); - stop = System.currentTimeMillis (); - - } catch (NullPointerException e) { - close (); - return -1; - } catch (IOException e) { - close (); - return -1; - } - - // Compute the difference in the local time and the server time - // (in seconds) - long difference = request.time () - (stop / 1000); - - // Calculate the transmission time (in seconds) - long oneWayTime = (stop - start) / 2000; - - difference += oneWayTime; - - /* - ACE.DEBUG (host() + " reports:"); - ACE.DEBUG (" time difference: " + difference); - ACE.DEBUG (" trans. delay: " + oneWayTime); - */ - - // Set the time difference for this handler - delta (difference); - - return 0; - } - - /** - * Returns the current time difference between local time and - * the server (in seconds). - */ - public synchronized long delta () - { - return delta_; - } - - /** - * Sets the current time difference between local time and the - * server (in seconds). - */ - protected synchronized void delta (long delta) - { - delta_ = delta; - } - - private long delta_; - private TSClerkProcessor parent_; - private boolean connected_ = false; - private String host_; - private int port_; -} diff --git a/java/JACE/netsvcs/Time/TSClerkProcessor.java b/java/JACE/netsvcs/Time/TSClerkProcessor.java deleted file mode 100644 index bec3bd417df..00000000000 --- a/java/JACE/netsvcs/Time/TSClerkProcessor.java +++ /dev/null @@ -1,307 +0,0 @@ -package JACE.netsvcs.Time; - -import java.net.*; -import java.io.*; -import java.util.*; - -import JACE.ASX.TimeValue; -import JACE.Connection.*; -import JACE.OS.*; -import JACE.Reactor.*; -import JACE.Misc.*; - -/** - * Clerk used to query a number of time servers, compute the average - * of the time differences, and report it with a sequence number. This - * can be used to adjust the current local time accordingly. - * <P> - * <B>Valid command line arguments:</B> - * <PRE> - * -h (host name:port) Specify a time server to contact - * -t (time in seconds) Specify how often to query the servers - * (Defaults to five minutes) - * -d Enable debugging messages - * </PRE> - */ -public class TSClerkProcessor implements EventHandler, Runnable -{ - /** - * Prints out the valid command line arguments. See the class - * description for more information. - */ - public void printUsage () - { - ACE.ERROR ("Valid options:"); - ACE.ERROR ("-h <host name>:<port> Specify a time server to contact"); - ACE.ERROR ("-t <time in seconds> How often to query the servers"); - ACE.ERROR ("-d Enable debugging messages"); - } - - /** - * Parses the command line arguments. See the class description - * for more information. - */ - protected int parseArgs (String args[]) - { - GetOpt opt = new GetOpt (args, "h:t:d", true); - for (int c; (c = opt.next ()) != -1; ) - { - switch (c) - { - // Specify a hostname:port pair to query - case 'h': - if (newHandler (opt.optarg ()) == -1) { - printUsage (); - return -1; - } - break; - // Specify time interval to query servers - case 't': - int sec = Integer.parseInt (opt.optarg ()); - updateInterval_ = new TimeValue (sec); - break; - case 'd': - ACE.enableDebugging (); - ACE.DEBUG ("Debugging is enabled"); - break; - default: - ACE.ERROR ("Unknown argument: " + (char)c); - printUsage (); - return -1; - } - } - return 0; - } - - /** - * Safely shut down the clerk and all its handlers. - */ - public synchronized void close () - { - if (!done_) { - done_ = true; - tq_.cancelTimer (this); - - for (int i = 0; i < handlerSet_.size (); i++) { - TSClerkHandler h = (TSClerkHandler)handlerSet_.elementAt (i); - - h.close (); - } - } - } - - /** - * Called by the JVM when the clerk is run in its own thread. If the - * TimerQueue provided to (or created by) this TSClerkProcessor isn't - * running its event loop, it will be run in this thread (by calling - * handleEvents ()). - * - *@see JACE.Reactor.TimerQueue - */ - public void run () - { - if (handlerSet_.size () == 0) { - ACE.DEBUG ("No servers are registered. Call init first."); - return; - } - - if (!tq_.eventLoopRunning ()) - tq_.handleEvents (); - } - - /** - * Initialize this TSClerkProcessor with command line arguments. See - * the class description for more information. This also schedules - * a timeout with the timer queue for when to query the servers. - * - *@return -1 on failure, 0 on success - */ - public int init (String args[]) - { - if (args.length < 2) { - printUsage (); - return -1; - } - - if (parseArgs (args) == -1) - return -1; - - if (handlerSet_.size () == 0) { - ACE.ERROR ("No servers are registered."); - done_ = true; - return -1; - } - - if (tq_ == null) - tq_ = new TimerQueue (true); - - tq_.scheduleTimer (this, - "Time Service Processor", - TimeValue.zero, - updateInterval_); - - return 0; - } - - /** - * Called by TSClerkHandler instances when they need to connect - * (or reconnect) to a server. This uses Connector to make the - * connection. - * - *@param handler TSClerkHandler to connect to the server - *@param host name of the service - *@param port port to connect to on the server - */ - void connectHandler (TSClerkHandler handler, - String host, - int port) - { - // Don't let handlers reconnect if we are in the process of closing - if (done_) - return; - - ACE.DEBUG ("Connecting handler to " + host + " on port " + port); - try { - - Connector c = new Connector (); - c.open (host, port); - c.connect (handler); - - } catch (UnknownHostException e) { - synchronized (this) { - handlerSet_.removeElement (handler); - } - ACE.ERROR (e); - } catch (SocketException e) { - ACE.ERROR (e); - } catch (InstantiationException e) { - ACE.ERROR (e); - } catch (IllegalAccessException e) { - ACE.ERROR (e); - } catch (IOException e) { - ACE.ERROR (e); - } - } - - /** - * Create a new TSClerkHandler for the given (host name):(port) - * combination. See the class description for more information about - * providing a host names and ports on the command line. - * - *@param hostAndPort String with the host name and port separated by - * a colon. - *@return -1 on failure, 0 on success - */ - protected int newHandler (String hostAndPort) - { - int colon = hostAndPort.lastIndexOf (':'); - - if (colon < 1) { - ACE.ERROR ("Invalid -h <host>:<port> parameter: " + hostAndPort); - return -1; - } - - int port = Integer.parseInt (hostAndPort.substring (colon + 1)); - String host = hostAndPort.substring (0, colon); - - ACE.DEBUG ("New handler for server " + host + " on port " + port); - - TSClerkHandler handler = new TSClerkHandler (this, host, port); - handlerSet_.addElement (handler); - - return 0; - } - - /** - * Have each TSClerkHandler query its time server, average the results, - * and set the timeStatus accordingly. This is called by the - * TimerQueue when appropriate. The interval can be specified on the - * command line. - */ - public synchronized int handleTimeout (TimeValue tv, Object obj) - { - if (done_) - return -1; - - // Increment the sequence number - int sequenceNumber = status_.sequenceNumber () + 1; - Enumeration handlers = handlerSet_.elements (); - - long total = 0; - int count = 0; - - // Use each handler to query its server, collecting the time - // difference information. - while (handlers.hasMoreElements ()) { - TSClerkHandler h = (TSClerkHandler)handlers.nextElement (); - - if (h.sendRequest () < 0) - continue; - - total += h.delta (); - count++; - } - - if (count == 0) { - ACE.ERROR ("Could not reach any time servers, will keep trying."); - return 0; - } - - timeStatus (new TimeInfo (sequenceNumber, total / count)); - - ACE.DEBUG ("Status: " + timeStatus ()); - - return 0; - } - - /** - * Return the current sequence number and time difference pair. - */ - public synchronized TimeInfo timeStatus () - { - return status_; - } - - /** - * Set the current sequence number and time difference pair. - */ - protected synchronized void timeStatus (TimeInfo status) - { - status_ = status; - } - - /** - * Default constructor. Results in this TSClerkProcessor creating - * a new timer queue which runs in its own thread. Thus, this - * TSClerkProcessor runs in its own thread. - */ - public TSClerkProcessor () - { - // Effectively runs in its own thread because of the timer queue - } - - /** - * Constructor allowing the timer queue to be specified. If the timer - * queue isn't already running, the caller is responsible for calling - * handleEvents to start the clerk. Be careful since the querying - * process for the servers may take a while. - * - *@param queue TimerQueue to register with - */ - public TSClerkProcessor (TimerQueue queue) - { - tq_ = queue; - } - - private boolean done_ = false; - - // List of the TSClerkHandlers this uses to maintain its - // server connections. - private Vector handlerSet_ = new Vector (); - private TimerQueue tq_ = null; - - // Default is every five minutes - private TimeValue updateInterval_ = new TimeValue (300, 0); - - TimeInfo status_ = new TimeInfo (); -} diff --git a/java/JACE/netsvcs/Time/TSServerAcceptor.java b/java/JACE/netsvcs/Time/TSServerAcceptor.java deleted file mode 100644 index 7e8b9476c19..00000000000 --- a/java/JACE/netsvcs/Time/TSServerAcceptor.java +++ /dev/null @@ -1,116 +0,0 @@ -package JACE.netsvcs.Time; - -import java.io.*; -import java.net.*; -import java.util.*; -import JACE.OS.*; -import JACE.Misc.*; -import JACE.Connection.*; -import JACE.Reactor.*; -import JACE.ASX.TimeValue; -import JACE.Concurrency.ThreadManager; -import JACE.netsvcs.Server; - -/** - * Server for the time service. Creates TSServerHandlers as necessary - * to handle the requests. - * <P> - * <B>Valid command line arguments:</B> - * <PRE> - * -p (port) Port to listen on for clients"); - * -d Enable debugging messages"); - * -a (class name) Specify ActivateStrategy"); - * (Default is multi-threaded"); - * </PRE> - * - */ -public class TSServerAcceptor extends Server -{ - public TSServerAcceptor () - { - // Set the name in case we're not using the service configurator - name ("Time Service"); - } - - /** - * Simple main program for running the logging service without the - * service configurator. - * - *@param args command line arguments - */ - public static void main (String [] args) - { - // Simple main program to get things rolling - TSServerAcceptor ta = new TSServerAcceptor(); - - ta.init (args); - } - - /** - * Creates a new TSServerHandler instance. - */ - protected SvcHandler makeSvcHandler () - { - return new TSServerHandler (); - } - - /** - * Prints out the valid command line arguments. See the class - * description for more information. Called by Server.init when - * parseArgs returns -1. - */ - protected void printUsage () - { - ACE.ERROR ("Valid options:\n"); - ACE.ERROR ("-p <port> Port to listen on for clients"); - ACE.ERROR ("-d Enable debugging messages"); - ACE.ERROR ("-a <class name> Specify ActivateStrategy"); - ACE.ERROR (" (Default is multi-threaded"); - } - - /** - * Parses the command line arguments. See the class description - * for more information. - * - *@param args command line arguments - *@return -1 on failure, 0 on success - */ - protected int parseArgs (String [] args) - { - int c = 0; - GetOpt opt = new GetOpt(args, "p:da:", true); - - try { - - while ((c = opt.next ()) != -1) { - switch (c) - { - case 'd': - ACE.enableDebugging (); - ACE.DEBUG ("Debugging is enabled"); - break; - case 'p': - if (!port (opt.optarg ())) - return -1; - break; - case 'a': - Object strategy = newStrategyInstance (opt.optarg (), - "ActivateStrategy"); - if (strategy == null) - return -1; - - activateStrategy ((ActivateStrategy) strategy); - break; - default: - ACE.ERROR("Unknown argument: " + (char)c); - return -1; - } - } - } catch (ArrayIndexOutOfBoundsException e) { - ACE.ERROR ("Option -" + (char)c + " requires an argument"); - return -1; - } - - return 0; - } -} diff --git a/java/JACE/netsvcs/Time/TSServerHandler.java b/java/JACE/netsvcs/Time/TSServerHandler.java deleted file mode 100644 index 69bf4239280..00000000000 --- a/java/JACE/netsvcs/Time/TSServerHandler.java +++ /dev/null @@ -1,53 +0,0 @@ -package JACE.netsvcs.Time; - -import java.io.*; -import java.util.*; -import java.net.*; -import JACE.OS.*; -import JACE.Connection.*; -import JACE.Reactor.*; -import JACE.SOCK_SAP.*; -import JACE.netsvcs.Handler; - -/** - * Created by TSServerAcceptor to handle time update requests. Currently, - * this simply sends back the current time (in seconds). - * - * @see JACE.netsvcs.Logger.ServerLoggingAcceptor - */ -public class TSServerHandler extends Handler -{ - /** - * Reads in the given TimeRequest request and calls dispatch. - * - *@param request TimeRequest instance to use - */ - public void processRequest (Object requestObject) - throws SocketException, EOFException, IOException - { - TimeRequest request = (TimeRequest)requestObject; - - request.streamInFrom (peer ().dataInputStream ()); - - this.dispatch (request); - } - - /** - * Sets the time value of the request to be the local time (in sec) - * and sends it back to the client. - */ - void dispatch(TimeRequest request) throws IOException - { - request.time ((int)(System.currentTimeMillis () / 1000)); - - request.streamOutTo (peer().outputStream ()); - } - - /** - * Creates a new instance of TimeRequest. - */ - public Object newRequest () - { - return new TimeRequest (); - } -} diff --git a/java/JACE/netsvcs/Time/TimeInfo.java b/java/JACE/netsvcs/Time/TimeInfo.java deleted file mode 100644 index 4ebfc793adb..00000000000 --- a/java/JACE/netsvcs/Time/TimeInfo.java +++ /dev/null @@ -1,90 +0,0 @@ -package JACE.netsvcs.Time; - -/** - * Wrapper for use with the clerk, containing a sequence number and - * time offset pair. - */ -public class TimeInfo -{ - /** - * Default constructor. - */ - public TimeInfo () - { - this (0, 0); - } - - /** - * Constructor. - * - *@param seqNum sequence number - *@param delta time offset in seconds - */ - public TimeInfo (int seqNum, long delta) - { - sequenceNumber_ = seqNum; - delta_ = delta; - } - - /** - * Returns this TimeInfo's sequence number. - */ - public int sequenceNumber () - { - return sequenceNumber_; - } - - /** - * Sets this TimeInfo's sequence number. - */ - public void sequenceNumber (int num) - { - sequenceNumber_ = num; - } - - /** - * Returns the time offset represented by this TimeInfo instance. - * (in sec) - */ - public long delta () - { - return delta_; - } - - /** - * Sets the time offset (in sec). - */ - public void delta (long num) - { - delta_ = num; - } - - /** - * Returns an informative String about the time difference represented - * by this TimeInfo instance. The sequence number is included in - * brackets. - * <P> - * Example: - * <PRE> - * Local time is 3 sec slower [57] - * </PRE> - */ - public String toString () - { - String result = "Local time is "; - if (delta_ > 0) { - result += (delta_ + " sec slower"); - } else - if (delta_ < 0) { - result += (delta_ + " sec faster"); - } else - result += "the same as the average"; - - result += " [" + sequenceNumber_ + "]"; - - return result; - } - - private long delta_; - private int sequenceNumber_; -} diff --git a/java/JACE/netsvcs/Time/TimeRequest.java b/java/JACE/netsvcs/Time/TimeRequest.java deleted file mode 100644 index 1b0e691398a..00000000000 --- a/java/JACE/netsvcs/Time/TimeRequest.java +++ /dev/null @@ -1,121 +0,0 @@ -package JACE.netsvcs.Time; - -import java.io.*; -import java.net.*; - -/** - * Request for a time update (and its reply). This is compatible with - * C++ ACE_Time_Request. Currently, the Java version always specifies to - * block forever for requests. - */ -public class TimeRequest -{ - /** - * Type for requesting updates. - */ - public static int TIME_UPDATE = 01; - - /** - * Default constructor, specifies block forever for an update. - */ - public TimeRequest () - { - messageType_ = TIME_UPDATE; - blockForever_ = 1; - } - - /** - * Constructor specifying the type of request, the current - * time, and to block forever. - */ - public TimeRequest (int messageType, - int timeSec) - { - time_ = timeSec; - messageType_ = messageType; - blockForever_ = 1; - } - - /** - * Dump all class information to a String. - */ - public String toString () - { - return "TimeRequest (" + messageType_ + - ", " + blockForever_ + ", " + secTimeout_ + ", " + - usecTimeout_ + ", " + time_ + ")"; - } - - /** - * Read the TimeRequest in from a given InputStream. - */ - public void streamInFrom (InputStream is) - throws IOException, EOFException - { - BufferedInputStream bis = new BufferedInputStream (is, 25); - DataInputStream dis = new DataInputStream (bis); - - streamInFrom (dis); - } - - /** - * Read the TimeRequest in from a given DataInputStream. - */ - public void streamInFrom (DataInputStream dis) - throws IOException, EOFException - { - messageType_ = dis.readInt (); - blockForever_ = dis.readInt (); - secTimeout_ = dis.readInt (); - usecTimeout_ = dis.readInt (); - time_ = dis.readInt (); - } - - /** - * Write this TimeRequest out to a given OutputStream. - */ - public void streamOutTo (OutputStream os) - throws IOException - { - BufferedOutputStream bos = new BufferedOutputStream (os, 25); - DataOutputStream dos = new DataOutputStream (bos); - - streamOutTo (dos); - } - - /** - * Write this TimeRequest out to a given DataOutputStream. - */ - public void streamOutTo (DataOutputStream dos) throws IOException - { - dos.writeInt (messageType_); - dos.writeInt (blockForever_); - dos.writeInt (secTimeout_); - dos.writeInt (usecTimeout_); - dos.writeInt (time_); - - dos.flush (); - } - - /** - * Return the time value in seconds. - */ - public int time () - { - return time_; - } - - /** - * Set the time value in seconds. - */ - public void time (int value) - { - time_ = value; - } - - private int messageType_; - private int blockForever_; - private int secTimeout_; - private int usecTimeout_; - private int time_; -} diff --git a/java/JACE/netsvcs/Time/c.bat b/java/JACE/netsvcs/Time/c.bat deleted file mode 100644 index 5e9e99f5807..00000000000 --- a/java/JACE/netsvcs/Time/c.bat +++ /dev/null @@ -1 +0,0 @@ -javac -d C:\Everett\JACE\classes *.java diff --git a/java/JACE/netsvcs/Time/package.html b/java/JACE/netsvcs/Time/package.html deleted file mode 100644 index 96fff45b643..00000000000 --- a/java/JACE/netsvcs/Time/package.html +++ /dev/null @@ -1,10 +0,0 @@ -<!-- $Id$ --> -<HTML> -<BODY> -Time Service for synchronizing clocks of collaborating network computers. -<P> -A simple test client is available under the tests directory in netsvcs\Time. - -@see <a href="http://www.cs.wustl.edu/~schmidt/ACE-netsvcs.html">ACE Network Services</a> -</BODY> -</HTML> diff --git a/java/JACE/netsvcs/Time/r.bat b/java/JACE/netsvcs/Time/r.bat deleted file mode 100644 index 7c89fbddd77..00000000000 --- a/java/JACE/netsvcs/Time/r.bat +++ /dev/null @@ -1 +0,0 @@ -java JACE.netsvcs.Time.%1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/java/JACE/netsvcs/Token/LockHandler.java b/java/JACE/netsvcs/Token/LockHandler.java deleted file mode 100644 index 8e3612efb42..00000000000 --- a/java/JACE/netsvcs/Token/LockHandler.java +++ /dev/null @@ -1,38 +0,0 @@ -package JACE.netsvcs.Token; - -/** - * Defines a handler for a certain type of lock. This allows new types - * of synchronization mechanisms to be added to the Token service without - * any modification of existing code. Implementing class instances that - * are registered (via the command line or another way) - * with the token service can be created as requests for that type of - * lock come into the service. - * - *@see LockHandlerAdapter - *@see MutexHandler - *@author Everett Anderson - */ -public interface LockHandler -{ - /** - * Process a given TokenRequest and construct the appropriate - * reply. The request has already been read from the connection, - * and the reply will be sent without the LockHandler having to - * worry about the details. - * - *@param caller TokenRequestHandler which is accessing this LockHandler - *@param request request read from the connection - *@return appropriate TokenReply (success, failure, etc) - */ - TokenReply handleRequest(TokenRequestHandler caller, - TokenRequest request); - - /** - * Release any claim the client represented with the given ID - * has on this handler's lock. This is used when a client - * disconnects. - * - *@param clientID ID of the client whose claims to abandon - */ - void abandonLock (String clientID); -} diff --git a/java/JACE/netsvcs/Token/LockHandlerAdapter.java b/java/JACE/netsvcs/Token/LockHandlerAdapter.java deleted file mode 100644 index e240000161c..00000000000 --- a/java/JACE/netsvcs/Token/LockHandlerAdapter.java +++ /dev/null @@ -1,380 +0,0 @@ -package JACE.netsvcs.Token; - -import java.util.*; -import JACE.ASX.*; -import JACE.OS.*; -import JACE.Concurrency.*; - -/** - * LockHandler implementation for any AbstractLock. - * <P> - * Provides the dispatching to appropriate methods on an AbstractLock - * as requests come in. - */ -public class LockHandlerAdapter implements LockHandler -{ - /** - * Constructor taking an AbstractLock to use as the locking - * mechanism the requests work on. - */ - public LockHandlerAdapter (AbstractLock lock) - { - lock_ = lock; - } - - /** - * Default constructor. - */ - public LockHandlerAdapter () - { - lock_ = null; - } - - /** - * Dispatch the request according to its type, calling the - * appropriate methods on the AbstractLock member. - * - *@param caller TokenRequestHandler which called handleRequest (unused) - *@param request request to process - *@return appropriate reply to send to the client - */ - public TokenReply handleRequest (TokenRequestHandler caller, - TokenRequest request) - { - String client = request.clientID (); - String token = request.tokenName (); - TokenReply result = null; - - // Dispatch according to operation type - switch (request.operationType ()) - { - case LockOperations.ACQUIRE: - ACE.DEBUG (client + " begins ACQUIRE for " + token); - result = acquireDispatcher (request); - break; - case LockOperations.RELEASE: - ACE.DEBUG (client + " begins RELEASE for " + token); - result = release (request); - break; - case LockOperations.RENEW: - ACE.DEBUG (client + " begins RENEW for " + token); - result = renew (request); - break; - case LockOperations.REMOVE: - ACE.DEBUG (client + " begins REMOVE for " + token); - result = remove (request); - break; - case LockOperations.TRY_ACQUIRE: - ACE.DEBUG (client + " begins TRY_ACQUIRE for " + token); - result = tryAcquireDispatcher (request); - break; - default: - ACE.ERROR ("Unknown operation: " + request.operationType ()); - break; - } - - ACE.DEBUG (client + " result: " + result); - - return result; - } - - /** - * Create a TimeValue from the given request's timeout information. Note - * that the time in the request is an absolute time timeout. - * - *@param request request to obtain the timeout info from - *@return null if useTimeout is false, otherwise a TimeValue - * representing the appropriate time period - */ - protected TimeValue getTimeout (TokenRequest request) - { - if (request.useTimeout ()) - return new TimeValue (request.sec (), - request.usec () * 1000); - else - return null; - } - - /** - * Call acquireWrite on the lock, returning its return value. - * - *@see AbstractLock#acquireWrite - *@return value from the lock's operation - */ - protected int acquireWrite (TokenRequest request, TimeValue timeout) - throws LockException, TimeoutException, InterruptedException - { - int result; - - if (timeout != null) - result = lock_.acquireWrite (timeout); - else - result = lock_.acquireWrite (); - - return result; - } - - /** - * Call acquireRead on the lock, returning its return value. - * - *@see AbstractLock#acquireRead - *@return value from the lock's operation - */ - protected int acquireRead (TokenRequest request, TimeValue timeout) - throws LockException, TimeoutException, InterruptedException - { - int result; - - if (timeout != null) - result = lock_.acquireRead (timeout); - else - result = lock_.acquireRead (); - - return result; - } - - /** - * Call acquire on the lock, returning its return value. - * - *@see AbstractLock#acquire - *@return value from the lock's operation - */ - protected int acquire (TokenRequest request, TimeValue timeout) - throws LockException, TimeoutException, InterruptedException - { - int result; - - if (timeout != null) - result = lock_.acquire (timeout); - else - result = lock_.acquire (); - - return result; - } - - /** - * Dispatch to the appropriate acquire method. In C++ ACE, when - * the type is LockTypes.RWLOCK and the proxy type is - * LockTypes.WRITE_LOCK_PROXY, then this calls acquireWrite. - * If it's RWLOCK and the proxy is READ_LOCK_PROXY, it calls - * acquireRead. In the normal case, it just calls acquire. - * - *@return reply to be sent back to the client (values for errno - * include constants in TokenReply such as EFAULT, ETIME, - * EINTR, or NO_ERRORS) - */ - protected TokenReply acquireDispatcher (TokenRequest request) - { - int result; - TimeValue timeout = getTimeout (request); - - try { - - /* - ACE specifies that when requesting a reader lock, the - token type will be RWLOCK and the proxy type is 0. - When it's a writer lock, the proxy type is 1. - */ - if (request.tokenType () == LockTypes.RWLOCK) { - if (request.proxyType () == LockTypes.READ_LOCK_PROXY) - result = acquireRead (request, timeout); - else - result = acquireWrite (request, timeout); - } else - result = acquire (request, timeout); - - } catch (LockException e) { - return new TokenReply (TokenReply.EFAULT, - request.arg ()); - } catch (TimeoutException e) { - return new TokenReply (TokenReply.ETIME, - request.arg ()); - } catch (InterruptedException e) { - return new TokenReply (TokenReply.EINTR, - request.arg ()); - } - - if (result == AbstractLock.FAILURE) { - return new TokenReply (TokenReply.EFAULT, - request.arg ()); - } else { - return new TokenReply (TokenReply.NO_ERRORS, - request.arg ()); - } - } - - /** - * Process a release request and construct a reply. The values - * for errno include TokenReply constants EFAULT, EACCES, or - * NO_ERRORS. - */ - protected TokenReply release (TokenRequest request) - { - int result; - - try { - result = lock_.release (); - } catch (LockException e) { - return new TokenReply (TokenReply.EFAULT, - request.arg ()); - } - - if (result == AbstractLock.FAILURE) { - return new TokenReply (TokenReply.EACCES, - request.arg ()); - } else { - return new TokenReply (TokenReply.NO_ERRORS, - request.arg ()); - } - } - - /** - * Process a renew request and construct a reply. The values for - * errno include TokenReply constants EFAULT, ETIME, EINTR, EACCES, - * or NO_ERRORS. - */ - protected TokenReply renew (TokenRequest request) - { - int result = AbstractLock.FAILURE; - TimeValue timeout = getTimeout (request); - - try { - - if (timeout != null) { - result = lock_.renew (request.requeuePosition (), - timeout); - } else { - result = lock_.renew (request.requeuePosition ()); - } - - } catch (LockException e) { - return new TokenReply (TokenReply.EFAULT, - request.arg ()); - } catch (TimeoutException e) { - return new TokenReply (TokenReply.ETIME, - request.arg ()); - } catch (InterruptedException e) { - return new TokenReply (TokenReply.EINTR, - request.arg ()); - } - - if (result == AbstractLock.FAILURE) { - return new TokenReply (TokenReply.EACCES, - request.arg ()); - } else { - return new TokenReply (TokenReply.NO_ERRORS, - request.arg ()); - } - } - - /** - * Process a remove request and construct a reply. This currently - * is not supported in the normal AbstractLock interface, so the - * default implementation returns a reply with errno set to - * TokenReply.ENOTSUP. - */ - protected TokenReply remove (TokenRequest request) - { - ACE.ERROR ("Remove is unimplemented"); - return new TokenReply (TokenReply.ENOTSUP, - request.arg ()); - } - - /** - * Call tryAcquireWrite on the lock, returning the result. - */ - protected int tryAcquireWrite (TokenRequest request) - throws LockException - { - return lock_.tryAcquireWrite (); - } - - /** - * Call tryAcquireRead on the lock, returning the result. - */ - protected int tryAcquireRead (TokenRequest request) - throws LockException - { - return lock_.tryAcquireRead (); - } - - /** - * Call tryAcquire on the lock, returning the result. - */ - protected int tryAcquire (TokenRequest request) throws LockException - { - return lock_.tryAcquire (); - } - - /** - * Dispatch to the appropriate tryAcquire method. In C++ ACE, when - * the type is LockTypes.RWLOCK and the proxy type is - * LockTypes.WRITE_LOCK_PROXY, then this calls acquireWrite. - * If it's RWLOCK and the proxy is READ_LOCK_PROXY, it calls - * acquireRead. In the normal case, it just calls acquire. - * - *@return reply to be sent back to the client (values for errno - * include constants in TokenReply such as EFAULT, - * EWOULDBLOCK, or NO_ERRORS). - */ - protected TokenReply tryAcquireDispatcher (TokenRequest request) - { - int result; - - try { - - /* - ACE specifies that when requesting a reader lock, the - token type will be RWLOCK and the proxy type is 0. - When it's a writer lock, the proxy type is 1. - */ - if (request.tokenType () == LockTypes.RWLOCK) { - if (request.proxyType () == LockTypes.READ_LOCK_PROXY) - result = tryAcquireRead (request); - else - result = tryAcquireWrite (request); - } else - result = tryAcquire (request); - - } catch (LockException e) { - return new TokenReply (TokenReply.EFAULT, - request.arg ()); - } - - if (result == AbstractLock.FAILURE) { - return new TokenReply (TokenReply.EWOULDBLOCK, - request.arg ()); - } else { - return new TokenReply (TokenReply.NO_ERRORS, - request.arg ()); - } - } - - /** - * Abandon any claim the specified client has on the lock. - * - *@param clientID identification of the client - */ - public void abandonLock (String clientID) - { - ACE.DEBUG (clientID + " abandoning lock"); - try { - int nesting_level = 0; - while (lock_.release () != AbstractLock.FAILURE) - { - nesting_level++; - // Loop until not the owner in case the lock - // supports nested acquires - } - if (nesting_level == 0) - ACE.DEBUG (clientID + " was not the owner"); - else - ACE.DEBUG (clientID + " had " + nesting_level + " locks"); - } catch (LockException e) { - ACE.ERROR ("While abandoning lock: " + e.getMessage ()); - // Don't need to send a reply to the client - } - } - - protected AbstractLock lock_; -} diff --git a/java/JACE/netsvcs/Token/LockOperations.java b/java/JACE/netsvcs/Token/LockOperations.java deleted file mode 100644 index f5dfa5bc486..00000000000 --- a/java/JACE/netsvcs/Token/LockOperations.java +++ /dev/null @@ -1,16 +0,0 @@ -package JACE.netsvcs.Token; - -/** - * Constants defining the operation types available on a lock. - * For information on specifying a read/write style lock, see LockTypes. - * - *@see LockTypes - */ -public interface LockOperations -{ - int ACQUIRE = 0; - int RELEASE = 1; - int RENEW = 2; - int REMOVE = 3; - int TRY_ACQUIRE = 4; -} diff --git a/java/JACE/netsvcs/Token/LockTypes.java b/java/JACE/netsvcs/Token/LockTypes.java deleted file mode 100644 index f377529367a..00000000000 --- a/java/JACE/netsvcs/Token/LockTypes.java +++ /dev/null @@ -1,19 +0,0 @@ -package JACE.netsvcs.Token; - -/** - * Constants related to the default lock and proxy types. New types - * of LockHandlers and lock types can be created and registered with - * the token service on the command line without modifying this. - * <P> - * C++ ACE handles RWLOCK in this way: - * When a request comes through for a RWLOCK, the proxy type is - * 0 for a read lock request and 1 for a write lock request. - */ -public interface LockTypes -{ - int MUTEX = 0; - int RWLOCK = 1; - - int READ_LOCK_PROXY = 0; - int WRITE_LOCK_PROXY = 1; -} diff --git a/java/JACE/netsvcs/Token/MutexHandler.java b/java/JACE/netsvcs/Token/MutexHandler.java deleted file mode 100644 index 82f79fe5a76..00000000000 --- a/java/JACE/netsvcs/Token/MutexHandler.java +++ /dev/null @@ -1,51 +0,0 @@ -package JACE.netsvcs.Token; - -import JACE.Concurrency.*; - -/** - * LockHandler implementation for a mutex lock. - * <P> - * Currently, this uses JACE.Concurrency.Token as the actual lock since - * it supports nested acquires. - * - *@see LockHandler - */ -public class MutexHandler extends LockHandlerAdapter -{ - // Uses token since it supports nested acquires. - static class ExtendedMutex extends Token - { - // This is so that we don't make any assumptions about previous - // implementations of LockAdapter, and enable owner checking with - // the client ID from TokenRequest. The thread name is set in - // handleRequest. - protected Object accessorID () - { - return Thread.currentThread().getName(); - } - } - - /** - * Default constructor. - */ - public MutexHandler () - { - super (new ExtendedMutex ()); - } - - public TokenReply handleRequest (TokenRequestHandler caller, - TokenRequest request) - { - Thread.currentThread().setName (request.clientID ()); - - return super.handleRequest (caller, request); - } - - public void abandonLock (String clientID) - { - Thread.currentThread().setName (clientID); - - super.abandonLock (clientID); - } -} - diff --git a/java/JACE/netsvcs/Token/RWMutexHandler.java b/java/JACE/netsvcs/Token/RWMutexHandler.java deleted file mode 100644 index 89dc679dd8d..00000000000 --- a/java/JACE/netsvcs/Token/RWMutexHandler.java +++ /dev/null @@ -1,54 +0,0 @@ -package JACE.netsvcs.Token; - -import JACE.Concurrency.*; - -/** - * LockHandler implementation for a reader/writer mutex lock. - * <P> - * Since it uses RWMutex as the actual lock, it doesn't support - * nested acquires. - * - *@see LockHandler - */ -public class RWMutexHandler extends LockHandlerAdapter -{ - static class ExtendedRWMutex extends RWMutex - { - // This is so that we don't make any assumptions about previous - // implementations of LockAdapter, and enable owner checking with - // the client ID from TokenRequest. The thread name is set in - // handleRequest. - protected Object accessorID () - { - return Thread.currentThread().getName(); - } - } - - /** - * Default constructor. - */ - public RWMutexHandler () - { - super (new ExtendedRWMutex ()); - } - - public TokenReply handleRequest (TokenRequestHandler caller, - TokenRequest request) - { - // Set the name of this thread to the client ID to perform - // proper owner checking. - Thread.currentThread().setName (request.clientID ()); - - // process the request - return super.handleRequest (caller, request); - } - - public void abandonLock (String clientID) - { - // Set the name of this thread to the client ID to perform - // proper owner checking. - Thread.currentThread().setName (clientID); - - super.abandonLock (clientID); - } -} diff --git a/java/JACE/netsvcs/Token/RemoteLock.java b/java/JACE/netsvcs/Token/RemoteLock.java deleted file mode 100644 index 824e05a31f0..00000000000 --- a/java/JACE/netsvcs/Token/RemoteLock.java +++ /dev/null @@ -1,543 +0,0 @@ -package JACE.netsvcs.Token; - -import java.io.*; -import JACE.Concurrency.*; -import JACE.ASX.*; -import JACE.Connection.*; -import JACE.OS.*; - -/** - * Proxy used by clients to connect to the token service. This - * implements the AbstractLock interface, so can be used like any - * other synchronization mechanism. The user can either use this - * class directly, or use a proxy which already inputs its type. - * <P> - * Currently, a separate instance (and thus a separate socket connection) - * must be used for each thread which accesses the service. The token - * service itself could handle multiple client IDs and token names per - * connection with the following requirement -- since the service blocks - * in its operations, a shadow mutex would have to be used in the proxy. - * <P> - * It would be best if the user called the close () method after finishing - * up with a RemoteLock, but that is not absolutely necessary. The socket - * will be closed when the JVM exits or finalize is called. (That will also - * free the actual token in the token service in case release was never - * called.) - * <P> - * The SLEEPHOOK result is never returned, only SUCCESS or FAILURE. (C++ - * version doesn't seem to indicate the sleep hook result.) - * - *@see MutexHandler - *@see RWMutexHandler - *@see JACE.Concurrency.AbstractLock - * - *@author Everett Anderson - */ -public class RemoteLock extends SvcHandler implements AbstractLock -{ - /** - * Accessor for the token name. - * - *@return name of the token - */ - public String tokenName () - { - return request_.tokenName (); - } - - /** - * Set the name of the token. - */ - public void tokenName (String name) - { - request_.tokenName (name); - } - - /** - * Accessor for the client ID. - */ - public String clientID () - { - return request_.clientID (); - } - - /** - * Set the client ID. - */ - public void clientID (String clientID) - { - request_.clientID (clientID); - } - - /** - * Constructor. - * - *@see LockTypes - *@param tokenType type of token to create in the token service - *@param proxyType type of proxy to define this RemoteLock as - *@param tokenName name of the token to connect to in the token service - *@param clientID clientID to use to refer to this client - *@param host host name of the token service - *@param port port to connect to for the token service - */ - public RemoteLock (int tokenType, - int proxyType, - String tokenName, - String clientID, - String host, - int port) - { - host_ = host; - port_ = port; - - // Only allocates one reply and one request - reply_ = new TokenReply (); - - request_ = new TokenRequest (tokenType, - proxyType, - 0, - tokenName, - clientID); - } - - /** - * Reconnect this proxy to the token service. - * - *@exception LockException problem occured in reconnecting - */ - protected void reconnect () throws LockException - { - Connector c = new Connector (); - c.open (host_, port_); - - try { - c.connect (this); - } catch (InstantiationException e) { - throw new LockException (e.getMessage()); - } catch (IllegalAccessException e) { - throw new LockException (e.getMessage()); - } catch (IOException e) { - throw new LockException (e.getMessage()); - } - } - - /** - * Check to see if this RemoteLock is connected. - */ - public boolean connected () - { - return connected_; - } - - /** - * Initialize this RemoteLock. Called by Connector. - */ - public int open (Object obj) - { - connected_ = true; - return 0; - } - - /** - * Shut down the connection to the server. Current implementation - * calls close (). - */ - public int close (long flags) - { - return close (); - } - - /** - * Shut down the connection to the server and mark this lock - * as disconnected. - */ - public int close () - { - if (connected ()) { - try { - connected_ = false; - peer ().close (); - } catch (IOException e) { - return -1; - } - } - - return 0; - } - - /** - * Send the given request to the token service, throwing a - * LockException on error. - */ - protected void sendRequest (TokenRequest request) throws LockException - { - try { - if (!connected ()) - reconnect (); - - request.streamOutTo (peer ().dataOutputStream ()); - - } catch (IOException e) { - close (); - throw new LockException (e.getMessage ()); - } - } - - /** - * Receive a reply from the token service, throwing a LockException - * on error. - */ - protected void receiveReply (TokenReply reply) throws LockException - { - if (!connected ()) - throw new LockException ("Proxy wasn't connected, any replies lost"); - - try { - - reply.streamInFrom (peer ().dataInputStream ()); - - } catch (IOException e) { - close (); - throw new LockException (e.getMessage ()); - } - } - - /** - * For errors that shouldn't generate exceptions, return the - * appropriate result code as defined in AbstractLock. - * - *@return AbstractLock.SUCCESS or AbstractLock.FAILURE - */ - protected int processErrno (TokenReply reply) - { - switch (reply.errno ()) - { - case TokenReply.NO_ERRORS: - return AbstractLock.SUCCESS; - case TokenReply.EIO: - close (); - return AbstractLock.FAILURE; - default: - return AbstractLock.FAILURE; - } - } - - /** - * Make a request to the token service with the given operation - * type and arguments. - * - *@see LockOperations - *@see LockTypes - *@param operationType type of operation to perform - *@param proxyType type of proxy this is - *@param requeuePosition put this owner at this position in the - * waiting queue (only makes sense if the - * operation is renew) - *@return AbstractLock.SUCCESS or AbstractLock.FAILURE - *@exception LockException remote access error occured - */ - protected int makeRequest (int operationType, - int proxyType, - int requeuePosition) - throws LockException - { - request_.operationType (operationType); - request_.proxyType (proxyType); - request_.requeuePosition (requeuePosition); - request_.useTimeout (false); - - sendRequest (request_); - receiveReply (reply_); - - // make sure that if someone does send a magic cookie arg back, - // to keep it going - request_.arg (reply_.arg ()); - - return processErrno (reply_); - } - - /** - * Make a request to the token service with the given arguments - * that must be performed by the given absolute time timeout. - * Currently, the timeout is managed by the remote service. - * - *@see LockOperations - *@see LockTypes - *@param operationType type of operation to perform - *@param proxyType type of proxy this is - *@param requeuePosition put this owner at this position in the - * waiting queue (only makes sense if the - * operation is renew) - *@param timeout absolute time timeout to accomplish the operation by - *@return AbstractLock.SUCCESS or AbstractLock.FAILURE - *@exception LockException remote access error occured - */ - protected int makeRequest (int operationType, - int proxyType, - int requeuePosition, - TimeValue timeout) - throws LockException, TimeoutException - { - request_.operationType (operationType); - request_.proxyType (proxyType); - request_.requeuePosition (requeuePosition); - request_.useTimeout (timeout); - - sendRequest (request_); - receiveReply (reply_); - - request_.arg (reply_.arg ()); - - if (reply_.errno () == TokenReply.ETIME) - throw new TimeoutException (timeout, "Remote Lock"); - - return processErrno (reply_); - } - - /** - * Acquire ownership of the lock, blocking indefinitely if necessary. - * <P> - *@return AbstractLock.FAILURE or AbstractLock.SUCCESS - *@exception LockException a remote error occured - */ - public int acquire () throws LockException - { - return makeRequest (LockOperations.ACQUIRE, 0, 0); - } - - /** - * Acquire ownership of the lock by the given absolute time time-out. - * A value of null for the timeout parameter results in a blocking - * acquire. - * A value of TimeValue.zero throws a TimeoutException if the - * acquire would block. - * <P> - *@param timeout absolute time by which the lock must be acquired - *@return appropriate Lock return value (AbstractLock.FAILURE, - * AbstractLock.SUCCESS or AbstractLock.SLEEPHOOK) - *@exception LockException a remote error occured - *@exception JACE.ASX.TimeoutException thrown when the lock is not - * obtained by the desired time - *@see #tryAcquire - */ - public int acquire (TimeValue timeout) - throws LockException, TimeoutException - { - return makeRequest (LockOperations.ACQUIRE, 0, 0, timeout); - } - - /** - * Acquire a read lock, blocking indefinitely if necessary. - * - *@return AbstractLock.FAILURE or AbstractLock.SUCCESS - *@exception LockException a remote error occured - */ - public int acquireRead () throws LockException - { - return makeRequest (LockOperations.ACQUIRE, - LockTypes.READ_LOCK_PROXY, - 0); - } - - /** - * Acquire a read lock by the given absolute time time-out. - * - *@param timeout absolute time by which the lock must be acquired - *@return appropriate lock return value (AbstractLock.FAILURE, - * AbstractLock.SUCCESS or AbstractLock.SLEEPHOOK) - *@exception LockException a remote error occured - *@exception JACE.ASX.TimeoutException thrown when the lock is not - * obtained by the desired time - *@see #tryAcquireRead - */ - public int acquireRead (TimeValue timeout) - throws LockException, TimeoutException - { - return makeRequest (LockOperations.ACQUIRE, - LockTypes.READ_LOCK_PROXY, - 0, - timeout); - } - - /** - * Acquire a write lock, blocking indefinitely if necessary. - * - *@return AbstractLock.FAILURE or AbstractLock.SUCCESS - *@exception LockException a remote error occured - */ - public int acquireWrite () - throws LockException - { - return makeRequest (LockOperations.ACQUIRE, - LockTypes.WRITE_LOCK_PROXY, - 0); - } - - /** - * Acquire a write lock by the given absolute time time-out. - * - *@param timeout absolute time by which the lock must be acquired - *@return appropriate lock return value (AbstractLock.FAILURE, - * AbstractLock.SUCCESS or AbstractLock.SLEEPHOOK) - *@exception LockException a remote error occured - *@exception JACE.ASX.TimeoutException thrown when the lock is not - * obtained by the desired time - *@see #tryAcquireWrite - */ - public int acquireWrite (TimeValue timeout) - throws LockException, TimeoutException - { - return makeRequest (LockOperations.ACQUIRE, - LockTypes.WRITE_LOCK_PROXY, - 0, - timeout); - } - - - /** - * Give up the lock to some number of waiting threads (if any), then - * reacquire, blocking indefinitely if necessary. - * <P> - * An optimized method that efficiently reacquires the token if no - * other threads are waiting. This is useful for situations where - * you don't want to degrade the quality of service if there are - * other threads waiting to get the token. - * <P> - *@param requeuePosition position in the waiters queue to insert - * this thread. If this value is -1 and there are other - * threads waiting to obtain the token, this thread is queued - * at the end. If this value is greater than -1, then it - * indicates how many entries to skip over before inserting - * our thread into the queue. (For example, if it is 0, - * this thread is put at the front of the queue.) If this - * value is greater than the number of waiters, this thread is - * simply put at the end of the current waiters queue. - *@return AbstractLock.FAILURE or AbstractLock.SUCCESS - *@exception LockException a remote error occured - */ - public int renew (int requeuePosition) - throws LockException - { - return makeRequest (LockOperations.RENEW, - 0, - requeuePosition); - } - - /** - * Give up the lock to some waiting threads (if any), then reacquire - * by the given absolute time time-out. - * <P> - * An optimized method that efficiently reacquires the token if no - * other threads are waiting. This is useful for situations where - * you don't want to degrade the quality of service if there are - * other threads waiting to get the token. - * <P> - * A value of null for the timeout indicates a blocking renew. - * <P> - *@param requeuePosition position in the waiters queue to insert - * this thread. If this value is -1 and there are other - * threads waiting to obtain the token, this thread is queued - * at the end. If this value is greater than -1, then it - * indicates how many entries to skip over before inserting - * our thread into the queue. (For example, if it is 0, - * this thread is put at the front of the queue.) If this - * value is greater than the number of waiters, this thread is - * simply put at the end of the current waiters queue. - * - *@param timeout absolute time by which the lock must be reacquired - * - *@return appropriate AbstractLock return value - * (AbstractLock.FAILURE or AbstractLock.SUCCESS) - *@exception LockException a remote error occured - *@exception JACE.ASX.TimeoutException thrown when the lock is not - * obtained by the desired time - */ - public int renew (int requeuePosition, TimeValue timeout) - throws LockException, TimeoutException - { - return makeRequest (LockOperations.RENEW, - 0, - requeuePosition, - timeout); - } - - /** - * Try to acquire the lock without blocking. - * <P> - *@return appropriate AbstractLock return value - * (AbstractLock.FAILURE or AbstractLock.SUCCESS) - *@exception LockException a remote error occured - */ - public int tryAcquire () throws LockException - { - return makeRequest (LockOperations.TRY_ACQUIRE, 0, 0); - } - - /** - * Try to acquire a read lock without blocking. - * <P> - *@return appropriate AbstractLock return value - * (AbstractLock.FAILURE or AbstractLock.SUCCESS) - *@exception LockException a remote error occured - */ - public int tryAcquireRead () throws LockException - { - return makeRequest (LockOperations.TRY_ACQUIRE, - LockTypes.READ_LOCK_PROXY, - 0); - } - - /** - * Try to acquire a write lock without blocking. - * - *@return appropriate AbstractLock return value - * (AbstractLock.FAILURE or AbstractLock.SUCCESS) - *@exception LockException a remote error occured - */ - public int tryAcquireWrite () throws LockException - { - return makeRequest (LockOperations.TRY_ACQUIRE, - LockTypes.WRITE_LOCK_PROXY, - 0); - } - - /** - * Release ownership of this lock. - * - *@return appropriate AbstractLock return value - * (AbstractLock.FAILURE or AbstractLock.SUCCESS) - *@exception LockException a remote error occured - */ - public int release () throws LockException - { - return makeRequest (LockOperations.RELEASE, 0, 0); - } - - /** - * Closes the connection to the server (if it is still open). - */ - protected void finalize () throws Throwable - { - close (); - } - - /** - * No-op implementation for the sleep hook (unused). - */ - public void sleepHook () {} - - /** Status of whether this RemoteLock is connected to the server or not */ - protected boolean connected_ = false; - - /** Request object for transmissions to the server */ - protected TokenRequest request_; - - /** Reply object for receiving transmissions from the server */ - protected TokenReply reply_; - - /** Host name of the token service */ - protected String host_; - - /** Port number of the token service */ - protected int port_; -} diff --git a/java/JACE/netsvcs/Token/RemoteMutex.java b/java/JACE/netsvcs/Token/RemoteMutex.java deleted file mode 100644 index 7f2a4311116..00000000000 --- a/java/JACE/netsvcs/Token/RemoteMutex.java +++ /dev/null @@ -1,28 +0,0 @@ -package JACE.netsvcs.Token; - -/** - * Proxy used by clients for accessing a mutex at the token service. - */ -public class RemoteMutex extends RemoteLock -{ - /** - * Constructor. - * - *@param tokenName name of the mutex to access - *@param clientID identification of this client - *@param host host of the token service - *@param port port number of the token service - */ - public RemoteMutex (String tokenName, - String clientID, - String host, - int port) - { - super (LockTypes.MUTEX, - 0, - tokenName, - clientID, - host, - port); - } -} diff --git a/java/JACE/netsvcs/Token/RemoteRWMutex.java b/java/JACE/netsvcs/Token/RemoteRWMutex.java deleted file mode 100644 index cc666bfd70f..00000000000 --- a/java/JACE/netsvcs/Token/RemoteRWMutex.java +++ /dev/null @@ -1,29 +0,0 @@ -package JACE.netsvcs.Token; - -/** - * Proxy used by clients for accessing a reader/writer mutex - * at the token service. - */ -public class RemoteRWMutex extends RemoteLock -{ - /** - * Constructor. - * - *@param tokenName name of the reader/writer lock to access - *@param clientID identification of this client - *@param host host of the token service - *@param port port number of the token service - */ - public RemoteRWMutex (String tokenName, - String clientID, - String host, - int port) - { - super (LockTypes.RWLOCK, - 0, - tokenName, - clientID, - host, - port); - } -} diff --git a/java/JACE/netsvcs/Token/TokenAcceptor.java b/java/JACE/netsvcs/Token/TokenAcceptor.java deleted file mode 100644 index 53adf08753b..00000000000 --- a/java/JACE/netsvcs/Token/TokenAcceptor.java +++ /dev/null @@ -1,353 +0,0 @@ -package JACE.netsvcs.Token; - -import java.io.*; -import java.net.*; -import java.util.*; -import JACE.OS.*; -import JACE.Misc.*; -import JACE.Connection.*; -import JACE.netsvcs.Server; - -/** - * Server for the token service. Launches TokenRequestHandlers as - * connections are made. Currently, the activation strategy must be - * thread per connection since the operations are allowed to block - * during acquires, etc. - * <P> - * Two types of locks are supported by default -- Mutex and RWMutex. - * New lock types can be added from the command line without changing - * any code in the service. To do this, just create a class which - * implements the LockHandler interface. - * <P> - * When a request for a new lock comes in, a LockHandler of the corresponding - * type is created and a mapping is created between the lock name and the - * handler. Later requests reuse that mapping. - * <P> - * <B>Valid command line arguments:</B> - * <PRE> - * -f (class name):(type) Specify a LockHandler for a type of lock"); - * -p (port number) Port to listen on for clients"); - * -d Enable debugging messages"); - * </PRE> - * - *@see JACE.netsvcs.Server - *@see TokenRequestHandler - *@see LockHandler - *@see LockTypes - */ -public class TokenAcceptor extends Server -{ - protected void addDefaultFactories() throws ClassNotFoundException { - addHandlerFactory(LockTypes.MUTEX, - Class.forName("JACE.netsvcs.Token.MutexHandler")); - addHandlerFactory(LockTypes.RWLOCK, - Class.forName("JACE.netsvcs.Token.RWMutexHandler")); - } - - /** - * Default constructor. - */ - public TokenAcceptor() { - - // Set the name in case we aren't using the service configurator. - name ("Token Service"); - - lockHandlerMap_ = new Hashtable(); - handlerFactoryMap_ = new Hashtable(); - clientHandlerMap_ = new Hashtable (); - } - - /** - * Add a map between a type of lock and the factory which - * creates LockHandler instances that handle it. - * - *@see LockTypes - *@param type number representing the type of lock - *@param factory Class object for a LockHandler class - */ - public void addHandlerFactory(Integer type, Class factory) { - handlerFactoryMap_.put(type, factory); - } - - /** - * Add a map between a type of lock and the factory which - * creates LockHandler instances that handle it. - * - *@see LockTypes - *@param type number representing the type of lock - *@param factory Class object for a LockHandler class - */ - public void addHandlerFactory(int type, Class factory) { - addHandlerFactory(new Integer(type), factory); - } - - /** - * Remove the LockHandler factory which handles locks - * of the specified type. - * - *@param type type of LockHandler to cease supporting - *@return the LockHandler instance (or null if not found) - */ - public Object removeHandlerFactory(Integer type) { - return handlerFactoryMap_.remove(type); - } - - /** - * Remove the LockHandler factory which handles locks - * of the specified type. - * - *@param type type of LockHandler to cease supporting - *@return the LockHandler instance (or null if not found) - */ - public Object removeHandlerFactory(int type) { - return handlerFactoryMap_.remove(new Integer(type)); - } - - /** - * Retrieve the LockHandler corresponding to the given name - * or create a new one if it doesn't exist. This is called by - * TokenRequestHandlers. - * - *@param lockName name of the lock to retrieve or create a LockHandler for - *@param lockType type of the lock - *@return LockHandler which handles the lock with that name - */ - public LockHandler getLockHandler (String lockName, - int lockType) { - synchronized (lockHandlerMap_) { - - Object obj = lockHandlerMap_.get(lockName); - - if (obj != null) - return (LockHandler)obj; - else { - LockHandler handler = newHandler (lockType); - lockHandlerMap_.put (lockName, handler); - return handler; - } - } - } - - /** - * Create a new LockHandler of the specified type. - * - *@param type type of LockHandler to create - *@return a new LockHandler instance - */ - protected LockHandler newHandler (int type) { - ACE.DEBUG ("Creating new handler of type " + type); - Object factoryObj = handlerFactoryMap_.get(new Integer(type)); - if (factoryObj == null) - return null; - - Class factory = (Class)factoryObj; - LockHandler handler = null; - - try { - handler = (LockHandler)factory.newInstance(); - } catch (InstantiationException e) { - ACE.ERROR("Can't create a handler of type " + type); - } catch (IllegalAccessException e) { - ACE.ERROR("Handler of type " + type + - " must have a default constructor"); - } - return handler; - } - - /** - * Simple main program. See the class description for more - * information about command line arguments. - */ - public static void main(String args[]) { - TokenAcceptor ta = new TokenAcceptor(); - - ta.init(args); - } - - /** - * Create a new TokenRequestHandler instance. - */ - protected SvcHandler makeSvcHandler() - { - return new TokenRequestHandler(); - } - - /** - * Sets up the default factories so the user can override them on - * the command line, then delegates back to Server.init (String[]). - * - *@see JACE.netsvcs.Server#init - *@param args command line arguments - *@return -1 on failure, 0 on success - */ - public int init(String [] args) { - try { - addDefaultFactories (); - } catch (ClassNotFoundException e) { - ACE.ERROR ("Can't find default factory " + e.getMessage ()); - return -1; - } - - return super.init (args); - } - - /** - * Prints out the valid command line arguments. See the class - * description for more information. Called by Server.init when - * parseArgs returns -1. - */ - protected void printUsage () - { - ACE.ERROR ("Valid options:\n"); - ACE.ERROR ("-f <class name>:<type> Specify a handler for a type of lock"); - ACE.ERROR ("-p <port number> Port to listen on for clients"); - ACE.ERROR ("-d Enable debugging messages"); - } - - /** - * Parses the command line arguments. See the class description - * for more information. - * - *@param args command line arguments - *@return -1 on failure, 0 on success - */ - protected int parseArgs(String [] args) - { - int c = 0; - GetOpt opt = new GetOpt(args, "p:f:d", true); - - try { - - while ((c = opt.next ()) != -1) { - switch (c) - { - case 'd': - ACE.enableDebugging (); - ACE.DEBUG ("Debugging is enabled"); - break; - case 'p': - if (!port (opt.optarg ())) - return -1; - break; - case 'f': - if (newHandlerFactory (opt.optarg ()) < 0) - return -1; - break; - default: - ACE.ERROR("Unknown argument: " + (char)c); - return -1; - } - } - } catch (ArrayIndexOutOfBoundsException e) { - ACE.ERROR ("Option -" + (char)c + " requires an argument"); - return -1; - } - - return 0; - } - - /** - * Load the Class for the specified LockHandler and create a mapping - * from its type to the Class instance. Used to parse the command - * line pair of (class name):(type). - * - *@param nameAndType (class name):(type) pair from the command line - *@return -1 on failure, 0 on success - */ - protected int newHandlerFactory (String nameAndType) - { - int colon = nameAndType.lastIndexOf (':'); - - if (colon < 1) { - ACE.ERROR ("Invalid -f <class name>:<type num> for handler: " + - nameAndType); - return -1; - } - - int type = 0; - try { - type = Integer.parseInt (nameAndType.substring (colon + 1)); - } catch (NumberFormatException e) { - ACE.ERROR ("Invalid token type: " + e.getMessage ()); - return -1; - } - - String name = nameAndType.substring (0, colon); - - Class factory; - try { - factory = Class.forName (name); - } catch (ClassNotFoundException e) { - ACE.ERROR (e.getMessage ()); - return -1; - } - - addHandlerFactory (type, factory); - ACE.DEBUG ("New handler " + name + " with type " + type); - - return 0; - } - - /** - * Create a mapping between a client ID and a LockHandler. This is - * only used by TokenRequestHandlers in order to keep track of which - * locks a client touches. That way, if/when a client disconnects, - * all its locks can be abandoned successfully. - * - *@param clientID client identification (key in the mapping) - *@param handler LockHandler to map to (value in the mapping) - * - */ - void addClientLockHandler (String clientID, - LockHandler handler) - { - Object obj = clientHandlerMap_.get (clientID); - if (obj == null) { - // Probably won't have more than 10 locks per client ID, and the Vector - // should resize automatically even if someone does. - Vector handlerList = new Vector (10); - handlerList.addElement (handler); - clientHandlerMap_.put (clientID, handlerList); - } else { - Vector handlerList = (Vector)obj; - int alreadyThereIndex = handlerList.indexOf (handler); - if (alreadyThereIndex == -1) - handlerList.addElement (handler); - } - } - - /** - * Called by TokenRequestHandlers to remove a specified client ID - * from the client ID to LockHandler mapping. - */ - void removeClient (String clientID) - { - clientHandlerMap_.remove (clientID); - } - - /** - * Called by TokenRequestHandlers to obtain a list of all LockHandlers - * accessed by a particular client. Useful for abandoning the locks. - */ - Enumeration getClientLockHandlers (String clientID) - { - Object obj = clientHandlerMap_.get (clientID); - if (obj == null) - return null; - else - return ((Vector)obj).elements (); - } - - // These should be replaced by weak hash maps when available - - // Map consisting of (token name) to (LockHandler instance) pairs - private Hashtable lockHandlerMap_; - - // Map consisting of (Integer token type) to (Class instance for - // corresponding LockHandler class) - private Hashtable handlerFactoryMap_; - - // Map consisting of (client ID) to (Vector of LockHandler) pairs - private Hashtable clientHandlerMap_; -} - diff --git a/java/JACE/netsvcs/Token/TokenReply.java b/java/JACE/netsvcs/Token/TokenReply.java deleted file mode 100644 index 35f50901610..00000000000 --- a/java/JACE/netsvcs/Token/TokenReply.java +++ /dev/null @@ -1,171 +0,0 @@ -package JACE.netsvcs.Token; - -import java.io.*; -import JACE.ASX.*; -import JACE.OS.*; - -/** - * Reply from a lock operation, and constants involved in it. - * This is compatible with the C++ ACE version. The user probably - * never deals directly with the constant errno values in Java ACE since - * the proxy (RemoteLock) should hide those details. - */ -public class TokenReply -{ - - /** indicates success */ - public static final int NO_ERRORS = 0; - - /** indicates a timeout */ - public static final int ETIME = 62; - - /** indicates the operation was interrupted */ - public static final int EINTR = 4; - - /** deadlock indication errno (JACE currently doesn't implement a - * deadlock detection system, but C++ ACE does and JACE proxies - * act appropriately). - */ - public static final int EDEADLK = 45; - - /** indicates the operation would block, used in tryAcquire */ - public static final int EWOULDBLOCK = 11; - - /** indicates a token name or client ID was too long */ - public static final int ENAMETOOLONG = 78; - - /** indicates an operation type was not supported */ - public static final int ENOTSUP = 48; - - /** indicates that this client was not the owner of the lock, - * so couldn't perform the desired operation */ - public static final int EACCES = 13; - - /** indicates an IO error occured during transmission of the request */ - public static final int EIO = 5; - - /** indicates a generic failure to complete the request */ - public static final int EFAULT = 14; - - /** indicates an operation was requested on an unknown type of token */ - public static final int EINVAL = 22; - - /** constant length of a valid token reply */ - private final static int LENGTH = 12; - - /** error code */ - private int errno_; - - /** argument (unused in JACE) */ - private int arg_; - - /** Dump the state of this TokenReply to a String */ - public String toString () - { - return "TokenReply(" + this.length() + ", " + this.errno_ - + ", " + this.arg_ + ")"; - } - - /** Default constructor (NO_ERRORS) */ - public TokenReply () - { - errno_ = NO_ERRORS; - arg_ = 0; - } - - /** Constructor which takes the error code and argument */ - public TokenReply (int errno, int arg) - { - errno_ = errno; - arg_ = arg; - } - - /** - * Accessor for the length of this TokenReply. - */ - public int length () - { - return LENGTH; - } - - /** Accessor for the error code of this TokenReply. */ - public int errno () - { - return errno_; - } - - /** - * Set the error code of this TokenReply. - */ - public void errno (int value) - { - errno_ = value; - } - - /** - * Accessor of the argument of this TokenReply. (Unused in JACE) - */ - public int arg () - { - return arg_; - } - - /** - * Set the argument of this TokenReply. (Unused in JACE) - */ - public void arg (int value) - { - arg_ = value; - } - - /** - * Read this TokenReply in from the given InputStream. - */ - public void streamInFrom (InputStream is) - throws IOException, EOFException - { - BufferedInputStream bis = new BufferedInputStream (is, LENGTH); - DataInputStream dis = new DataInputStream (bis); - - streamInFrom (dis); - } - - /** - * Read this TokenReply in from the given DataInputStream. - */ - public void streamInFrom (DataInputStream dis) - throws IOException, EOFException - { - int length = dis.readInt (); - if (length != LENGTH) - throw new IOException ("Invalid TokenReply length " + length); - - this.errno_ = dis.readInt (); - this.arg_ = dis.readInt (); - } - - /** - * Write this TokenReply out to the given OutputStream. - */ - public void streamOutTo (OutputStream os) - throws IOException - { - BufferedOutputStream bos = new BufferedOutputStream (os, LENGTH); - DataOutputStream dos = new DataOutputStream (bos); - - streamOutTo (dos); - } - - /** - * Write this TokenReply out to the given DataOutputStream. - */ - public void streamOutTo (DataOutputStream dos) - throws IOException - { - dos.writeInt (LENGTH); - dos.writeInt (this.errno_); - dos.writeInt (this.arg_); - - dos.flush (); - } -} diff --git a/java/JACE/netsvcs/Token/TokenRequest.java b/java/JACE/netsvcs/Token/TokenRequest.java deleted file mode 100644 index eb1113428c5..00000000000 --- a/java/JACE/netsvcs/Token/TokenRequest.java +++ /dev/null @@ -1,426 +0,0 @@ -package JACE.netsvcs.Token; - -import java.io.*; -import JACE.ASX.*; -import JACE.OS.*; - -/** - * Request for an operation on a lock. This is compatible with the - * C++ ACE version. The US-ASCII character encoding is used for - * String to byte conversions (and vice versa). If - * that encoding isn't supported, it attempts to use the default - * encoding (but prints a message). Users probably never need to - * deal with this class directly. The notify field isn't used - * in JACE (or in C++ ACE as far as I can tell). - * - *@author Everett Anderson - */ -public class TokenRequest -{ - /** Maximum length for a token name */ - public final static int MAX_TOKEN_NAME_LEN = 40; - - /** Maximum length for a client ID */ - public final static int MAX_CLIENT_ID_LEN = 276; - - /** Length of the fixed size header */ - protected final static int HEADER_LEN = 40; - - /** Maximum length of any TokenRequest (total) */ - protected final static int MAX_LEN = 359; - - /** - * Dump this TokenRequest's state out to a String. - */ - public String toString() - { - return "TokenRequest(" + this.length() + ", " + - this.tokenType_ + ", " + - this.proxyType_ + ", " + - this.operationType_ + ", " + - this.requeuePosition_ + ", " + - this.notify_ + ", " + - this.useTimeout_ + ", " + - this.sec_ + ", " + - this.usec_ + ", " + - this.arg_ + ", " + - this.tokenName_ + ", " + - this.clientID_ + ")"; - } - - /** Default constructor. */ - public TokenRequest() - { - // Remember that the length is transmitted first - tokenType_ = 0; - proxyType_ = 0; - operationType_ = 0; - requeuePosition_ = 0; - notify_ = 0; - useTimeout_ = 0; - sec_ = 0; - usec_ = 0; - arg_ = 0; - tokenName_ = ""; - clientID_ = ""; - // Transmission is "<10 ints><token name>(null):<clientID>(null)" - - charEncoding_ = "US-ASCII"; - - buffer_ = new byte[MAX_LEN]; - } - - /** - * Create a request which doesn't use timeouts. - * - *@param tokenType type of token (usually a constant in LockTypes) - *@param proxyType type of proxy (usually a constant in LockTypes) - *@param operationType type of operation (usually a constant in - * LockOperations) - *@param tokenName name of the token to operate on - *@param clientID name of the client requesting an operation - * - *@see LockTypes - *@see LockOperations - */ - public TokenRequest(int tokenType, - int proxyType, - int operationType, - String tokenName, - String clientID) - { - this(); - - this.tokenType_ = tokenType; - this.proxyType_ = proxyType; - this.operationType_ = operationType; - this.tokenName_ = tokenName; - this.clientID_ = clientID; - } - - /** - * Create a request which uses the given absolute time timeout. - * - *@param tokenType type of token (usually a constant in LockTypes) - *@param proxyType type of proxy (usually a constant in LockTypes) - *@param operationType type of operation (usually a constant in - * LockOperations) - *@param tokenName name of the token to operate on - *@param clientID name of the client requesting an operation - *@param tv absolute time timeout to process the request by - * - *@see LockTypes - *@see LockOperations - */ - public TokenRequest(int tokenType, - int proxyType, - int operationType, - String tokenName, - String clientID, - TimeValue tv) - { - this(tokenType, - proxyType, - operationType, - tokenName, - clientID); - - this.useTimeout_ = 1; - this.sec_ = (int)tv.sec(); - this.usec_ = tv.nanos() / 1000; - } - - /** - * Return the length of this TokenRequest. - * <P> - * Details: - * <PRE> - * Fixed size header of length HEADER_LEN - * token name - * null - * : - * client ID - * null - * </PRE> - */ - public int length() - { - return (HEADER_LEN + - this.tokenName_.length() + - this.clientID_.length() + 3); - } - - /** Accessor for the token type. */ - public int tokenType() - { - return this.tokenType_; - } - /** Set the token type. */ - public void tokenType(int type) - { - this.tokenType_ = type; - } - /** Accessor for the proxy type. */ - public int proxyType() - { - return this.proxyType_; - } - /** Set the proxy type. */ - public void proxyType(int type) - { - this.proxyType_ = type; - } - /** Accessor for the operation type. */ - public int operationType() - { - return this.operationType_; - } - /** Set the operation type. */ - public void operationType(int type) - { - this.operationType_ = type; - } - /** Accessor for the requeue position. This only makes - * sense for a renew operation. */ - public int requeuePosition() - { - return this.requeuePosition_; - } - /** Set the requeue position. This only makes sense for - * a renew operation. */ - public void requeuePosition(int position) - { - this.requeuePosition_ = position; - } - /** Accessor for the flag to determine if a timeout should be used. */ - public boolean useTimeout() - { - return (this.useTimeout_ == 1 ? true : false); - } - /** Set the flag to enable or disable use of timeouts. - */ - public void useTimeout(boolean useIt) - { - this.useTimeout_ = (useIt == true ? 1 : 0); - } - - /** - * Set the absolute time timeout to the given TimeValue's value, and - * enable the useTimeout flag. - */ - public void useTimeout (TimeValue timeout) - { - this.useTimeout_ = 1; - this.sec_ = (int)timeout.sec (); - this.usec_ = timeout.nanos () / 1000; - } - - /** - * Accessor for the seconds component of the absolute time timeout. - */ - public int sec() - { - return this.sec_; - } - /** Set the seconds component of the timeout. */ - public void sec(int sec) - { - this.sec_ = sec; - } - /** Accessor for the usec component of the timeout. */ - public int usec() - { - return this.usec_; - } - /** Set the usec component of the timeout. */ - public void usec(int usec) - { - this.usec_ = usec; - } - /** Accessor for the arg value. (unused in JACE) */ - public int arg() - { - return this.arg_; - } - /** Set the arg value. (unused in JACE) */ - public void arg(int arg) - { - this.arg_ = arg; - } - - /** Accessor for the name of the token. */ - public String tokenName() - { - return this.tokenName_; - } - - /** Set the name of the token. */ - public void tokenName(String name) - { - this.tokenName_ = name; - } - - /** Accessor for the client identification string. */ - public String clientID() - { - return this.clientID_; - } - - /** Set the client identification string. */ - public void clientID(String ID) - { - this.clientID_ = ID; - } - - /** - * Construct a String from a specific subset of the byte array. - * The string begins at the start index and ends at either the - * end of the buffer or the first byte with value 0 (null). - * Tries to use the specified encoding, but uses the default - * platform encoding if it isn't available. - * - *@param start beginning index in the buffer - *@param bufferLength total length of the buffer - */ - protected String stringFromBuffer(int start, int bufferLength) - { - int end = start; - String result = null; - - while (end < bufferLength && this.buffer_[end] != 0) - end++; - - try { - result = new String(this.buffer_, - start, - end - start, - this.charEncoding_); - } catch (UnsupportedEncodingException e) { - ACE.ERROR(this.charEncoding_ + " is not supported!"); - result = new String (this.buffer_, start, end - start); - } - - return result; - } - - /** - * Read the request in from the given InputStream. - */ - public void streamInFrom(InputStream is) - throws IOException, EOFException - { - BufferedInputStream bis = new BufferedInputStream(is, - MAX_LEN); - DataInputStream dis = new DataInputStream(bis); - - streamInFrom (dis); - } - - /** - * Read the request in from the given DataInputStream. - */ - public void streamInFrom (DataInputStream dis) - throws IOException, EOFException - { - int length = dis.readInt(); - if (length > MAX_LEN || length < HEADER_LEN + 5) - throw new IOException ("Invalid TokenRequest length: " + length); - - this.tokenType_ = dis.readInt(); - this.proxyType_ = dis.readInt(); - this.operationType_ = dis.readInt(); - this.requeuePosition_ = dis.readInt(); - this.notify_ = dis.readInt(); - this.useTimeout_ = dis.readInt(); - this.sec_ = dis.readInt(); - this.usec_ = dis.readInt(); - this.arg_ = dis.readInt(); - - int total = dis.read(this.buffer_, 0, length - HEADER_LEN); - - this.tokenName_ = this.stringFromBuffer(0, total); - - this.clientID_ = this.stringFromBuffer(this.tokenName_.length() + 2, - total); - - if (this.tokenName_.length() > MAX_TOKEN_NAME_LEN || - this.clientID_.length() > MAX_CLIENT_ID_LEN) - throw new IOException("Exceeds maximum token name or client ID"); - } - - /** - * Write the request out to the given OutputStream. - */ - public void streamOutTo (OutputStream os) - throws IOException - { - BufferedOutputStream bos = new BufferedOutputStream(os); - DataOutputStream dos = new DataOutputStream(bos); - - streamOutTo (dos); - } - - /** - * Write the request out to the given DataOutputStream. Tries to use - * the specified encoding to the convert the token name and client ID - * to bytes, but uses the platform default encoding if necessary. - */ - public void streamOutTo (DataOutputStream dos) - throws IOException - { - dos.writeInt(this.length()); - dos.writeInt(this.tokenType_); - dos.writeInt(this.proxyType_); - dos.writeInt(this.operationType_); - dos.writeInt(this.requeuePosition_); - - dos.writeInt(this.notify_); - dos.writeInt(this.useTimeout_); - dos.writeInt(this.sec_); - dos.writeInt(this.usec_); - dos.writeInt(this.arg_); - - StringBuffer data = new StringBuffer(this.tokenName_.length() + - this.clientID_.length() + - 3); - - data.append(this.tokenName_); - data.append('\0'); - data.append(':'); - data.append(this.clientID_); - data.append('\0'); - - byte buf [] = null; - String dataString = data.toString (); - try { - buf = dataString.getBytes (this.charEncoding_); - } catch (UnsupportedEncodingException e) { - ACE.ERROR (charEncoding_ + " is unsupported, trying to use default"); - buf = dataString.getBytes (); - } - - dos.write(buf, 0, buf.length); - dos.flush(); - } - - private int tokenType_; - private int proxyType_; - private int operationType_; - private int requeuePosition_; - private int notify_; - private int useTimeout_; - private int sec_; - private int usec_; - private int arg_; - - private String tokenName_; - private String clientID_; - - private byte buffer_[]; - - /** - * Character encoding to use for converting the token name and - * client ID to/from bytes. - */ - protected String charEncoding_; -} diff --git a/java/JACE/netsvcs/Token/TokenRequestHandler.java b/java/JACE/netsvcs/Token/TokenRequestHandler.java deleted file mode 100644 index cb6d729f3bd..00000000000 --- a/java/JACE/netsvcs/Token/TokenRequestHandler.java +++ /dev/null @@ -1,180 +0,0 @@ -package JACE.netsvcs.Token; - -import java.io.*; -import java.net.SocketException; -import java.util.*; -import JACE.Connection.*; -import JACE.OS.*; -import JACE.netsvcs.Handler; - -/** - * Created by TokenAcceptor to handle token requests. Delegates to - * the appropriate LockHandler. This is fairly robust, and can handle - * multiple clients and locks (meaning requests can come in to this - * handle with varying client IDs and token names and still be processed - * and released appropriately.) Compatible with the C++ ACE token service. - * - *@author Everett Anderson - */ -class TokenRequestHandler extends Handler -{ - /** - * Default constructor. - */ - public TokenRequestHandler() { - this.clients_ = new Vector (10); - } - - /** - * Creates a new TokenRequest instance. - */ - public Object newRequest () - { - return new TokenRequest (); - } - - /** - * Sends an error message to a client with the TokenReply.EIO - * errno before abandoning the connection. This is used when an IO - * error occured while receiving the request. - * - *@param lastRequest request object to get the arg from - */ - protected void sendAbortMessage (TokenRequest lastRequest) - { - TokenReply reply = new TokenReply (TokenReply.EIO, - lastRequest.arg ()); - try { - reply.streamOutTo (this.peer ().dataOutputStream ()); - } catch (Exception e) { - // Doesn't matter if there is an error here, we've abandoned - // the connection. - } - } - - /** - * Safely shuts down this handler, making sure to release any locks - * that were touched by clients from this TokenRequestHandler. - * - *@return -1 on failure, 0 on success - */ - public synchronized int close () - { - // For every client X that has used this handler - // for every LockHandler that X has used - // release the lock until it fails because X isn't the owner - // remove the client entries - // Call Handler.close () - if (!done ()) { - - TokenAcceptor parent = (TokenAcceptor) parent (); - Enumeration clientEnum = clients_.elements (); - - while (clientEnum.hasMoreElements ()) { - String clientID = (String)clientEnum.nextElement (); - - Enumeration handlers = parent.getClientLockHandlers (clientID); - if (handlers == null) - continue; - - int num = 0; - - while (handlers.hasMoreElements ()) { - LockHandler handler = (LockHandler)handlers.nextElement (); - - handler.abandonLock (clientID); - - num++; - } - - parent.removeClient (clientID); - } - - return super.close (); - } - - return 0; - } - - /** - * Read in the given TokenRequest and delegates to the appropriate - * LockHandler. - * - *@see JACE.netsvcs.Handler - *@param requestObject TokenRequest object to use - */ - public void processRequest (Object requestObject) - throws SocketException, EOFException, IOException - { - TokenRequest request = (TokenRequest)requestObject; - TokenAcceptor parent = (TokenAcceptor) parent (); - - try { - request.streamInFrom (this.peer ().dataInputStream ()); - - if (!request.tokenName ().equals (lastTokenName_)) { - // Switched tokens: - // - // Either find a handler that's already been made (which would - // mean this token has been accessed before), or create a new - // one with a new token - handler_ = parent.getLockHandler(request.tokenName(), - request.tokenType()); - - if (handler_ == null) { - // The client asked for an operation on a type of token - // that we don't know about. - ACE.ERROR ("Unknown lock type: " + request.tokenType ()); - TokenReply error = new TokenReply (TokenReply.EINVAL, - request.arg ()); - error.streamOutTo(this.peer ().dataOutputStream ()); - return; - } - - // Add this LockHandler to the list of those accessed by - // this clientID - parent.addClientLockHandler (request.clientID (), - handler_); - } - - if (!request.clientID ().equals (lastClientID_)) { - // Switched clients - - if (!clients_.contains (request.clientID ())) - clients_.addElement (request.clientID ()); - - parent.addClientLockHandler (request.clientID (), - handler_); - } - - lastClientID_ = request.clientID (); - lastTokenName_ = request.tokenName (); - - TokenReply reply = handler_.handleRequest(this, request); - - reply.streamOutTo(this.peer ().dataOutputStream ()); - - } catch (NullPointerException e) { - sendAbortMessage (request); - throw e; - } catch (IOException e) { - sendAbortMessage (request); - throw e; - } - } - - // List of clientIDs that have been processed by this instance - // of TokenRequestHandler. This is useful when abandoning the - // locks of any clients that have been using this socket. - private Vector clients_; - - // Name of the last token accessed - private String lastTokenName_ = null; - - // Last client ID which accessed a token from this handler - private String lastClientID_ = null; - - // Current LockHandler - private LockHandler handler_ = null; -} - diff --git a/java/JACE/netsvcs/Token/package.html b/java/JACE/netsvcs/Token/package.html deleted file mode 100644 index 80777aecc0a..00000000000 --- a/java/JACE/netsvcs/Token/package.html +++ /dev/null @@ -1,16 +0,0 @@ -<!-- $Id$ --> -<HTML> -<BODY> -Token Service for remote mutexes and reader/writer locks. -<P> -New types of lock can be easily added on the command line to the service -without changing existing code by implementing a LockHandler for the new -type. -<P> -A simple test client is available in the tests directory under -netsvcs\Token. - -@see JACE.netsvcs.Token.LockHandler -@see <a href="http://www.cs.wustl.edu/~schmidt/ACE-netsvcs.html">ACE Network Services</a> -</BODY> -</HTML> diff --git a/java/JACE/netsvcs/package.html b/java/JACE/netsvcs/package.html deleted file mode 100644 index a806080aece..00000000000 --- a/java/JACE/netsvcs/package.html +++ /dev/null @@ -1,11 +0,0 @@ -<!-- $Id$ --> -<HTML> -<BODY> -Bases classes for the network services and two activation strategies. -<P> -Services can be loaded and managed via the Service Configurator. - -@see JACE.ServiceConfigurator -@see <a href="http://www.cs.wustl.edu/~schmidt/ACE-netsvcs.html">ACE Network Services</a> -</BODY> -</HTML> diff --git a/java/JACE/overview.html b/java/JACE/overview.html deleted file mode 100644 index a0c2fdabd73..00000000000 --- a/java/JACE/overview.html +++ /dev/null @@ -1,84 +0,0 @@ -<!-- $Id$ --> -<HTML> -<BODY> -Java ACE is a collection of Java packages containing classes that have been -converted from the C++ version of the -<A HREF="http://www.cs.wustl.edu/~schmidt/ACE.html">ADAPTIVE Communication -Environment</A> (ACE). -<P> -The C++ version of ACE is a large object-oriented network programming toolkit -which contains over 125,000 lines of C++ code and uses advanced C++ features -like templates. -</P> -<P>The goal of converting ACE from C++ to Java is to provide a portable -programming toolkit with a similar interface and functionality to the original - version of ACE. This allows new and current users of C++ ACE an easy transition -to Java and also adds significant value to programming concurrent Java -networking applications. Note that applications written using Java ACE can -communicate seamlessly over sockets with applications written using C++ ACE. -</P> -<P> -The following diagram illustrates the architecture of the Java version of ACE: -</P> - -<P ALIGN="CENTER"> -<IMG SRC="images/java-ace.gif" WIDTH="735" HEIGHT="339" ALIGN="BOTTOM" BORDER="0"> -</P> - -<P> -The Java ACE architecture has fewer components than the diagram illustrating -the architecture for the -<A HREF="http://www.cs.wustl.edu/~schmidt/ACE-overview.html">C++ version -of ACE </A>. This reduction in size occurs for two reasons. First, the Java -Virtual Machine (JVM) handles many of the portability issues provided by C++ -ACE. Therefore, the OS adaptation layer is unnecessary. Second, -Java doesn't support certain OS features provided by Win32, UNIX, and other -OS platforms that C++ ACE is ported to. For example, Java doesn't support -shared memory and memory-mapped files and therefore the memory management -wrappers (such as <CODE>Mem_Map</CODE> and <CODE>Shared_Malloc</CODE>) are -omitted from Java ACE. -</P> - -<P> -The process of converting ACE from C++ to Java provided us with an excellent -source of insights on the strengths and weaknesses of using Java for -industrial-strength software system frameworks. We've written a paper -documenting our -<A HREF="http://www.cs.wustl.edu/~schmidt/C++2java.html">experiences</A> -converting the C++ version of ACE to Java. -</P> - -<H3>Copyright Information for Java ACE</H3> - -<P> -Java ACE is copyrighted by -<A HREF="http://www.cs.wustl.edu/~schmidt">Douglas C. Schmidt</A> and his -research group at -<A HREF="http://www.wustl.edu">Washington University</A>. -You are free to do anything you like with the Java ACE source code such -as including it in commercial software, as long as you include this copyright -statement along with code built using Java ACE. -</P> -<P> -You are under no obligation to freely redistribute any of your source -code that is built using Java ACE. Please note, however, that you may -not do anything to the Java ACE code that will prevent it from being -distributed freely (such as copyrighting it yourself). Naturally, I am not -responsible for any problems caused by using Java ACE. -</P> -<P> -My goal is to see Java ACE continue to evolve and become a more -comprehensive, robust, and well-documented Java toolkit that is freely -available to researchers and developers. If you have any -improvements, suggestions, and or comments, I'd like to hear about it. -</P> -<P> -Thanks, -</P> -<P> -Douglas C. Schmidt -<BR> -<A HREF="mailto@schmidt@cs.wustl.edu">schmidt@cs.wustl.edu</A> -</P> -</BODY> -</HTML> diff --git a/java/JACE/package.html b/java/JACE/package.html deleted file mode 100644 index 72d43449ea7..00000000000 --- a/java/JACE/package.html +++ /dev/null @@ -1,32 +0,0 @@ -<!-- $Id$ --> -<HTML> -<BODY> - -<H3>Overview of Java ACE</H3> -<P>Java ACE is a collection of Java packages containing classes that have been converted from the C++ version of -the <A HREF="http://www.cs.wustl.edu/~schmidt/ACE.html">ADAPTIVE Communication Environment</A> (ACE). The C++ version -of ACE is a large object-oriented network programming toolkit which contains over 125,000 lines of C++ code and -uses advanced C++ features like templates.</P> -<P>The goal of converting ACE from C++ to Java is to provide a portable programming toolkit with a similar interface -and functionality to the original version of ACE. This allows new and current users of C++ ACE an easy transition -to Java and also adds significant value to programming concurrent Java networking applications. Note that applications -written using Java ACE can communicate seamlessly over sockets with applications written using C++ ACE.</P> -<P>The following diagram illustrates the architecture of the Java version of ACE:</P> -<CENTER> -<IMG SRC="java-ace.gif" ALIGN="BOTTOM" BORDER="0"></CENTER> -<P> -The Java ACE architecture has fewer components than the diagram illustrating the architecture for the <A HREF="http://www.cs.wustl.edu/~schmidt/ACE-overview.html">C++ -version of ACE </A>. This reduction in size occurs for two reasons. First, the Java Virtual Machine (JVM) handles -many of the portability issues provided by C++ ACE. Therefore, the OS adaptation layer is unnecessary. Second, -Java doesn't support certain OS features provided by Win32, UNIX, and other OS platforms that C++ ACE is ported -to. For example, Java doesn't support shared memory and memory-mapped files and therefore the memory management -wrappers (such as <CODE>Mem_Map</CODE> and <CODE>Shared_Malloc</CODE>) are omitted from Java ACE.</P> - -<P>The process of converting ACE from C++ to Java provided us with an excellent source of insights on the strengths -and weaknesses of using Java for industrial-strength software system frameworks. We've written a paper documenting -our <A HREF="http://www.cs.wustl.edu/~schmidt/C++2java.html">experiences</A> converting the C++ version of ACE -to Java. - -</BODY> -</HTML> - diff --git a/java/JACE/tests/ASX/BufferStreamTest.java b/java/JACE/tests/ASX/BufferStreamTest.java deleted file mode 100644 index a9600da19dc..00000000000 --- a/java/JACE/tests/ASX/BufferStreamTest.java +++ /dev/null @@ -1,189 +0,0 @@ -// ============================================================================ -// -// = PACKAGE -// tests.ASX -// -// = FILENAME -// BufferStreamTest.java -// -// = AUTHOR -// Prashant Jain -// -// ============================================================================ -package JACE.tests.ASX; - -import java.io.*; -import JACE.OS.*; -import JACE.ASX.*; - -/** - * This short program copies stdin to stdout via the use of an ASX - * STREAM. It illustrates an implementation of the classic "bounded - * buffer" program using an ASX STREAM containing two Modules. Each - * Module contains two Tasks. - */ -public class BufferStreamTest -{ - - static class CommonTask extends Task - { - // ACE_Task hooks - public int open (Object obj) - { - if (this.activate (0, 1, false) == -1) - ACE.ERROR ("spawn"); - return 0; - } - - public int close (long exitStatus) - { - ACE.DEBUG (Thread.currentThread () + " thread is exiting with status " + - exitStatus + " in module " + this.name () + "\n"); - return 0; - } - - public int put (MessageBlock mb, TimeValue tv) - { - return 0; - } - - public int handleTimeout (TimeValue tv, Object obj) - { - return 0; - } - } - - // Define the Producer interface. - - static class Producer extends CommonTask - { - // Read data from stdin and pass to consumer. - // The Consumer reads data from the stdin stream, creates a message, - // and then queues the message in the message list, where it is - // removed by the consumer thread. A 0-sized message is enqueued when - // there is no more data to read. The consumer uses this as a flag to - // know when to exit. - - public int svc () - { - // Keep reading stdin, until we reach EOF. - - BufferedReader in = new BufferedReader(new InputStreamReader(System.in)); - - String msg = null; - try - { - while (true) - { - System.out.print ("Enter input: "); - System.out.flush (); - msg = in.readLine (); - if (msg == null) - { - // Send a shutdown message to the other thread and exit. - if (this.putNext (new MessageBlock (0), null) == -1) - ACE.ERROR ("putNext"); - break; - } - else - { - // Send the message to the other thread. - if (this.putNext (new MessageBlock (msg), null) == -1) - ACE.ERROR ("putNext"); - } - } - } - catch (IOException e) - { - } - return 0; - } - } - - static class Consumer extends CommonTask - // = TITLE - // Define the Consumer interface. - { - // Enqueue the message on the MessageQueue for subsequent - // handling in the svc() method. - public int put (MessageBlock mb, TimeValue tv) - { - try - { - return this.putq (mb, tv); - } - catch (InterruptedException e) - { - } - return 0; - } - - // The consumer dequeues a message from the ACE_Message_Queue, writes - // the message to the stderr stream, and deletes the message. The - // Consumer sends a 0-sized message to inform the consumer to stop - // reading and exit. - - public int svc () - { - MessageBlock mb = null; - - // Keep looping, reading a message out of the queue, until we - // timeout or get a message with a length == 0, which signals us to - // quit. - try - { - while (true) - { - // Wait for upto 4 seconds - mb = this.getq (TimeValue.relativeTimeOfDay (4, 0)); - - if (mb == null) - break; - - int length = mb.length (); - - if (length > 0) - System.out.println ("\n" + mb.base ()); - - if (length == 0) - break; - } - } - catch (InterruptedException e) - { - } - if (mb == null) - { - ACE.ERROR ("timed out waiting for message"); - System.exit (1); - } - return 0; - } - } - - // Spawn off a new thread. - - public static void main (String args[]) - { - ACE.enableDebugging (); - - // Control hierachically-related active objects - Stream stream = new Stream (); - Module pm = new Module ("Consumer", new Consumer (), null, null); - Module cm = new Module ("Producer", new Producer (), null, null); - - // Create Producer and Consumer Modules and push them onto the - // STREAM. All processing is performed in the STREAM. - - if (stream.push (pm) == -1) - { - ACE.ERROR ("push"); - return; - } - else if (stream.push (cm) == -1) - { - ACE.ERROR ("push"); - return; - } - } -} diff --git a/java/JACE/tests/ASX/MessageQueueTest.java b/java/JACE/tests/ASX/MessageQueueTest.java deleted file mode 100644 index 38f098c1bb7..00000000000 --- a/java/JACE/tests/ASX/MessageQueueTest.java +++ /dev/null @@ -1,54 +0,0 @@ -// ============================================================================ -// -// = PACKAGE -// tests.ASX -// -// = FILENAME -// MessageQueueTest.java -// -// = AUTHOR -// Prashant Jain -// -// ============================================================================ -package JACE.tests.ASX; - -import java.io.*; -import JACE.OS.*; -import JACE.ASX.*; - -public class MessageQueueTest -{ - public static void main (String args[]) - { - ACE.enableDebugging (); - - try - { - MessageBlock conMb; - MessageQueue msgQueue = new MessageQueue (); - MessageBlock mb1 = new MessageBlock ("hello"); - MessageBlock mb2 = new MessageBlock ("world"); - mb1.msgPriority (5); - mb2.msgPriority (7); - - // Enqueue in priority order. - if (msgQueue.enqueue (mb1) == -1) - ACE.ERROR ("put_next"); - - if (msgQueue.enqueue (mb2) == -1) - ACE.ERROR ("put_next"); - - // Now try to dequeue - if ((conMb = msgQueue.dequeueHead ()) == null) - ACE.ERROR ("dequeueHead"); - else - ACE.DEBUG ("Consumer: removed item " + conMb.base () - + " of priority " + conMb.msgPriority ()); - } - catch (InterruptedException e) - { - ACE.ERROR (e); - } - } -} - diff --git a/java/JACE/tests/ASX/PriorityBufferTest.java b/java/JACE/tests/ASX/PriorityBufferTest.java deleted file mode 100644 index 37f0370522d..00000000000 --- a/java/JACE/tests/ASX/PriorityBufferTest.java +++ /dev/null @@ -1,118 +0,0 @@ -// ============================================================================ -// -// = PACKAGE -// tests.ASX -// -// = FILENAME -// PriorityBufferTest.java -// -// = AUTHOR -// Prashant Jain -// -// ============================================================================ -package JACE.tests.ASX; - -import java.io.*; -import JACE.OS.*; -import JACE.ASX.*; - -class consumer extends Thread -{ - public void run () - { - MessageBlock mb = null; - long curPriority = 0; - int length = 0; - - try - { - // Keep looping, reading a message out of the queue, until we - // get a message with a length == 0, which signals us to quit. - for (;;) - { - if ((mb = PriorityBufferTest.msgQueue.dequeueHead ()) == null) - break; - - length = mb.length (); - curPriority = mb.msgPriority (); - - if (length > 0) - ACE.DEBUG ("Consumer: removed item \"" + mb.base () + "\" of priority: " + curPriority); - - if (length == 0) - break; - } - } - catch (InterruptedException e) - { - } - } -} - -class producer extends Thread -{ - producer (int delay) - { - this.delay_ = delay; - } - - public void run () - { - try - { - long count = 0; - for (char c = 'a'; c <= 'z'; c++) - { - count++; - // Allocate a new message - MessageBlock mb = new MessageBlock (new Character (c).toString ()); - // Set the priority - mb.msgPriority (count); - - // Enqueue in priority order. - if (PriorityBufferTest.msgQueue.enqueue (mb) == -1) - ACE.ERROR ("put_next"); - else - { - ACE.DEBUG ("Producer: inserted item \"" + mb.base () + "\" of priority: " + count); - if (this.delay_ > 0) - this.sleep (this.delay_); - } - } - - // Now send a 0-sized shutdown message to the other thread - if (PriorityBufferTest.msgQueue.enqueueTail (new MessageBlock (0)) == -1) - ACE.ERROR ("put_next"); - } - catch (InterruptedException e) - { - } - } - - private int delay_; -} - -public class PriorityBufferTest -{ - public static MessageQueue msgQueue = new MessageQueue (); - - public static void main (String args[]) - { - ACE.enableDebugging (); - - int delay = 0; - if (args.length == 1) - { - try - { - delay = Integer.parseInt (args[0]); - } - catch (NumberFormatException e) - { - ACE.ERROR ("Illegal argument."); - } - } - new producer (delay).start (); - new consumer ().start (); - } -} diff --git a/java/JACE/tests/ASX/TaskTest.java b/java/JACE/tests/ASX/TaskTest.java deleted file mode 100644 index 09ebfe22a1f..00000000000 --- a/java/JACE/tests/ASX/TaskTest.java +++ /dev/null @@ -1,95 +0,0 @@ -// ============================================================================ -// -// = PACKAGE -// tests.ASX -// -// = FILENAME -// TaskTest.java -// -// = AUTHOR -// Prashant Jain -// -// ============================================================================ -package JACE.tests.ASX; - -import java.io.*; -import JACE.OS.*; -import JACE.ASX.*; -import JACE.Reactor.*; - -public class TaskTest extends Task -{ - int nThreads_; - int nIterations_; - - public TaskTest (int nThreads, int nIterations) - { - this.nIterations_ = nIterations; - this.nThreads_ = nThreads; - } - - public void beginTest () - { - if (this.activate (0, this.nThreads_, true) == -1) - ACE.ERROR ("activate failed"); - } - - public int open (Object obj) - { - return 0; - } - - public int close (long flags) - { - return 0; - } - - public int put (MessageBlock mb, TimeValue tv) - { - return 0; - } - - public int handleTimeout (TimeValue tv, Object obj) - { - return 0; - } - - public int svc () - { - for (int i = 1; i <= this.nIterations_; i++) - { - ACE.DEBUG (Thread.currentThread ().toString () + - " in iteration " + i); - // Allow other threads to run - Thread.yield (); - } - return 0; - } - - public static void main (String args[]) - { - int nThreads = 1; - int nIterations = 1; - - ACE.enableDebugging (); - - try - { - if (args.length == 2) - { - nThreads = Integer.parseInt (args[0]); - nIterations = Integer.parseInt (args[1]); - } - else if (args.length == 1) - { - nThreads = Integer.parseInt (args[0]); - } - } - catch (NumberFormatException e) - { - ACE.ERROR ("Illegal argument."); - } - TaskTest tt = new TaskTest (nThreads, nIterations); - tt.beginTest (); - } -} diff --git a/java/JACE/tests/ASX/ThreadPoolTest.java b/java/JACE/tests/ASX/ThreadPoolTest.java deleted file mode 100644 index c48b0caf3c2..00000000000 --- a/java/JACE/tests/ASX/ThreadPoolTest.java +++ /dev/null @@ -1,187 +0,0 @@ -// ============================================================================ -// -// = PACKAGE -// tests.ASX -// -// = FILENAME -// ThreadPoolTest.java -// -// = AUTHOR -// Prashant Jain -// -// ============================================================================ -package JACE.tests.ASX; - -import java.io.*; -import JACE.OS.*; -import JACE.ASX.*; -import JACE.Reactor.*; - -public class ThreadPoolTest extends Task -{ - int nThreads_; - int nIterations_; - - public static int MAX_MB_SIZE = 1024; - - public ThreadPoolTest (int nThreads, int nIterations) - { - this.nIterations_ = nIterations; - this.nThreads_ = nThreads; - if (this.activate (0, nThreads, true) == -1) - ACE.ERROR ("activate failed"); - } - - public int handleTimeout (TimeValue tv, Object obj) - { - return 0; - } - - public int open (Object obj) - { - return 0; - } - - public int close (long flags) - { - return 0; - } - - public int put (MessageBlock mb, TimeValue tv) - { - try - { - return this.putq (mb, tv); - } - catch (InterruptedException e) - { - } - return 0; - } - - public int svc () - { - int count = 1; - - // Keep looping, reading a message out of the queue, until we get a - // message with a length == 0, which signals us to quit. - try - { - for (;; count++) - { - MessageBlock mb = this.getq (null); - if (mb == null) - { - ACE.ERROR (Thread.currentThread ().toString () + " in iteration " + count + ", got result -1, exiting"); - break; - } - int length = mb.length (); - - if (length > 0) - ACE.DEBUG (Thread.currentThread ().toString () + - " in iteration " + count + ", length = " + - length + ", text = \"" + mb.base () + "\""); - - if (length == 0) - { - ACE.DEBUG (Thread.currentThread ().toString () + - " in iteration " + count + - ", got NULL message, exiting"); - break; - } - Thread.yield (); - } - } - catch (InterruptedException e) - { - } - return 0; - } - - public static void produce (ThreadPoolTest threadPool, int nIterations) - { - int count = 0; - for (int n = 0;;) - { - // Allocate a new message. - MessageBlock mb = new MessageBlock (new Integer (count).toString ()); - - if (count == nIterations) - n = 1; // Indicate that we need to shut down. - else - count++; - - if (count == 0 || (count % 20 == 0)) - { - try - { - Thread.sleep (1); - } - catch (InterruptedException e) - { - } - } - if (n != 1) - { - ACE.DEBUG ("Producing..."); - // Pass the message to the Thread_Pool. - if (threadPool.put (mb, null) == -1) - ACE.ERROR ("put"); - } - else - { - // Send a shutdown message to the waiting threads and exit. - ACE.DEBUG ("start loop, dump of task"); - - for (int i = threadPool.thrCount (); i > 0; i--) - { - ACE.DEBUG (Thread.currentThread ().toString () + - "EOF, enqueueing NULL block for thread " + i); - - // Enqueue a NULL message to flag each consumer to - // shutdown. - if (threadPool.put (new MessageBlock (0), null) == -1) - ACE.ERROR ("put"); - } - - break; - } - } - } - - public static void main (String args[]) - { - int nThreads = 1; - int nIterations = 100; - - ACE.enableDebugging (); - - try - { - if (args.length == 2) - { - nThreads = Integer.parseInt (args[0]); - nIterations = Integer.parseInt (args[1]); - } - else if (args.length == 1) - { - nThreads = Integer.parseInt (args[0]); - } - } - catch (NumberFormatException e) - { - ACE.ERROR ("Illegal argument."); - } - ACE.DEBUG ("Threads = " + nThreads + " Iterations = " + nIterations); - - // Create the worker tasks. - ThreadPoolTest threadPool = new ThreadPoolTest (nThreads, - nIterations); - - // Create work for the worker tasks to process in their own threads. - produce (threadPool, nIterations); - ACE.DEBUG ("exiting..."); - } -} - - diff --git a/java/JACE/tests/Concurrency/Condition/Consumer.java b/java/JACE/tests/Concurrency/Condition/Consumer.java deleted file mode 100644 index e43a28f00e0..00000000000 --- a/java/JACE/tests/Concurrency/Condition/Consumer.java +++ /dev/null @@ -1,75 +0,0 @@ -//File: Consumer.java -//Seth Widoff 8/8/96 -//This class attempts at random intervals to dequeue random elements -//from a queue. If the queue is empty the thread waits until an element -//has been enqueued and another thread has invoked the notify() method. -package JACE.tests.Concurrency.Condition; - -import java.lang.Math; -import JACE.ASX.TimeValue; -import java.util.Random; - -public class Consumer implements Runnable -{ - //Maximum pause between dequeues (in milliseconds) - private static final int MAX_PAUSE = 1000; - - private SimpleMessageQueue queue_; - private boolean stop_requested_ = false; - private String name_; - private int iterations_; - private TimeValue timeout_; - - public Consumer(String name, - SimpleMessageQueue queue, - int iterations, - TimeValue timeout) - { - name_ = "Consumer " + name; - queue_ = queue; - iterations_ = iterations; - timeout_ = timeout; - } - - public void run() - { - //Set the random number generator seed to the current time in - //milliseconds. - - Random random = new Random(System.currentTimeMillis()); - Integer element; - - for (int i = 0; i < iterations_; ) - { - try - { - TimeValue absTv = TimeValue.relativeTimeOfDay (timeout_); - element = (Integer)queue_.dequeue(absTv); - if (element != null) - { - - System.out.println("Consumer::run() " + name_ + " dequeued " - + element.toString() + - " Queue size: " + queue_.size()); - - Thread.sleep(Math.abs (random.nextLong()) % MAX_PAUSE); - } - else - { - System.out.println ("Null"); - } - i++; - } - catch(Exception excp) - { - System.out.print ("Consumer::run() Exception: "); - System.out.println(excp); - } - } - } - - public void requestStop() - { - stop_requested_ = true; - } -} diff --git a/java/JACE/tests/Concurrency/Condition/JoinableThreadGroup.java b/java/JACE/tests/Concurrency/Condition/JoinableThreadGroup.java deleted file mode 100644 index 908da33f9f9..00000000000 --- a/java/JACE/tests/Concurrency/Condition/JoinableThreadGroup.java +++ /dev/null @@ -1,24 +0,0 @@ -package JACE.tests.Concurrency.Condition; - -public class JoinableThreadGroup extends ThreadGroup -{ - public JoinableThreadGroup(String name) - { - super(name); - } - - public JoinableThreadGroup(ThreadGroup parent, String name) - { - super(parent, name); - } - - public void join() throws InterruptedException - { - Thread list[] = new Thread[activeCount()]; - - enumerate(list, true); - - for (int i = 0; i < list.length; i++) - list[i].join(); - } -} diff --git a/java/JACE/tests/Concurrency/Condition/Producer.java b/java/JACE/tests/Concurrency/Condition/Producer.java deleted file mode 100644 index cda5063ceed..00000000000 --- a/java/JACE/tests/Concurrency/Condition/Producer.java +++ /dev/null @@ -1,70 +0,0 @@ -//File: Producer.java -//Seth Widoff 8/8/96 -//This class attempts at random intervals to enqueue random elements -//into a queue. If the queue is full the thread waits until an element -//has been dequeued and another thread has invoked the notify() method. - -package JACE.tests.Concurrency.Condition; - -import JACE.ASX.TimeValue; -import java.lang.Math; -import java.util.Random; - -public class Producer implements Runnable -{ - //Maximum pause between enqueues (in milliseconds) - private static final int MAX_PAUSE = 1000; - - private SimpleMessageQueue queue_; - private boolean stop_requested_ = false; - private String name_; - private int iterations_; - private TimeValue timeout_; - - public Producer(String name, - SimpleMessageQueue queue, - int iterations, - TimeValue timeout) - { - name_ = "Producer " + name; - queue_ = queue; - iterations_ = iterations; - timeout_ = timeout; - } - - public void run() - { - //Set the random number generator seed to the current time in milliseconds. - Random random = new Random(System.currentTimeMillis()); - int element = 1; - - for (int i = 0; i < iterations_; ) - { - try - { - // element = random.nextInt(); - TimeValue absTv = TimeValue.relativeTimeOfDay (timeout_); - queue_.enqueue((Object)new Integer(element), absTv); - - System.out.println("Producer::run() " + name_ - + " enqueued " + element + - " Queue size: " + queue_.size()); - - Thread.sleep(Math.abs (random.nextLong()) % MAX_PAUSE); - i++; - element++; - } - catch(Exception excp) - { - System.out.print("Producer::run() Exception: "); - System.out.println(excp); - } - } - } - - public void requestStop() - { - stop_requested_ = true; - } -} - diff --git a/java/JACE/tests/Concurrency/Condition/QueueTest.java b/java/JACE/tests/Concurrency/Condition/QueueTest.java deleted file mode 100644 index 7d6560b11a7..00000000000 --- a/java/JACE/tests/Concurrency/Condition/QueueTest.java +++ /dev/null @@ -1,68 +0,0 @@ -//File: QueueTest.java -//Seth Widoff, 8/8/96 -//This class is a test method for the Producer and Consumer classes. -//The main method takes as arguments the number of producers, the -//number of consumers and the number of elements in the queue. It then -//spawn the specified threads and starts them. - -package JACE.tests.Concurrency.Condition; - -import JACE.ASX.TimeValue; - -public class QueueTest -{ - public static void main(String[] args) - { - if (args.length < 5) - { - System.out.println("Usage: java QueueTest <# producers> <# consumers> " + - "<# elements> <#iterations> <#timeout secs> <#timeout nano secs>"); - System.exit(1); - } - - int num_producers = Integer.parseInt(args[0]), - num_consumers = Integer.parseInt(args[1]), - num_elements = Integer.parseInt(args[2]), - num_iterations = Integer.parseInt(args[3]), - num_timeout_secs = Integer.parseInt(args[4]), - num_timeout_nano_secs = Integer.parseInt(args[5]); - - if (num_elements < 1 - || num_consumers < 1 - || num_producers < 1) - { - System.out.println("All the parameters must be larger than zero."); - System.exit(1); - } - - SimpleMessageQueue queue = new SimpleMessageQueue(num_elements); - Consumer[] consumers = new Consumer[num_consumers]; - Producer[] producers = new Producer[num_producers]; - JoinableThreadGroup thread_group = new JoinableThreadGroup("Producer Consumer"); - - for (int i = 0; i < num_producers; i++) - { - producers[i] = new Producer("Number " + (i + 1), - queue, - num_iterations, - new TimeValue (num_timeout_secs, num_timeout_nano_secs)); - new Thread(thread_group, producers[i]).start(); - } - - for (int i = 0; i < num_consumers; i++) - { - consumers[i] = new Consumer("Number " + (i + 1), queue, num_iterations, new TimeValue (num_timeout_secs, num_timeout_nano_secs)); - new Thread(thread_group, consumers[i]).start(); - } - - try - { - thread_group.join(); - } - catch(InterruptedException excp) - { - System.out.println("QueueTest::main"); - System.out.println(excp); - } - } -} diff --git a/java/JACE/tests/Concurrency/Condition/SimpleMessageQueue.java b/java/JACE/tests/Concurrency/Condition/SimpleMessageQueue.java deleted file mode 100644 index f2a465a9025..00000000000 --- a/java/JACE/tests/Concurrency/Condition/SimpleMessageQueue.java +++ /dev/null @@ -1,86 +0,0 @@ -package JACE.tests.Concurrency.Condition; - -import JACE.ASX.TimeoutException; -import JACE.ASX.TimeValue; -import JACE.Concurrency.*; - -public class SimpleMessageQueue -{ - private int num_items_ = 0; - private int head_ = 0, tail_ = 0; - private Object[] queue_; - - private Mutex lock_ = new Mutex (); - private Condition notFull_ = new Condition (lock_); - private Condition notEmpty_ = new Condition (lock_); - - public SimpleMessageQueue(int size) - { - queue_ = new Object[size]; - } - - public void enqueue(Object element, TimeValue timeout) - throws TimeoutException, InterruptedException - { - try - { - lock_.acquire (); - while (this.isFull ()) - notFull_.Wait (timeout); - - if (tail_ == queue_.length) - tail_ = 0; - queue_[tail_] = element; - tail_++; - - num_items_++; - notEmpty_.signal (); - } - finally - { - lock_.release (); - } - } - - public Object dequeue (TimeValue timeout) - throws TimeoutException, InterruptedException - { - Object return_value = null; - - try - { - lock_.acquire (); - while (this.isEmpty ()) - notEmpty_.Wait (timeout); - - return_value = queue_[head_]; - head_++; - if (head_ == queue_.length) - head_ = 0; - - num_items_--; - notFull_.signal (); - } - finally - { - lock_.release (); - } - return return_value; - } - - public boolean isEmpty() - { - return num_items_ == 0; - } - - public boolean isFull() - { - return num_items_ == queue_.length; - } - - public int size() - { - return num_items_; - } -} - diff --git a/java/JACE/tests/Concurrency/IterationTest.java b/java/JACE/tests/Concurrency/IterationTest.java deleted file mode 100644 index 79e083e7f7a..00000000000 --- a/java/JACE/tests/Concurrency/IterationTest.java +++ /dev/null @@ -1,235 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.tests.Concurrency - * - * = FILENAME - * IterationTest.java - * - *@author Prashant Jain - *@author Everett Anderson - * - *************************************************/ -package JACE.tests.Concurrency; - -import java.io.*; -import JACE.OS.*; -import JACE.Concurrency.*; - -/** - * Test which uses an AbstractLock to prevent threads from mangling - * shared data. This currently tests the four local concurrency - * mechanisms -- Token, Mutex, RWMutex, and Semaphore. - */ -public class IterationTest -{ - static class LockReader extends Thread - { - LockReader (int nIterations, AbstractLock lock) - { - this.nIterations_ = nIterations; - this.lock_ = lock; - } - - public void run () - { - for (int i = 1; i <= this.nIterations_; i++) - { - // Acquire the lock (will block until it gets it) - try - { - this.lock_.acquire (); - } - catch (InterruptedException e) - { - ACE.ERROR (e); - } - catch (LockException e) - { - ACE.ERROR (e); - } - - IterationTest.count++; - ACE.DEBUG (Thread.currentThread ().toString () + - " reader acquired lock in iteration " + i + - ", count = " + IterationTest.count); - - try - { - Thread.sleep (1); - } - catch (InterruptedException e) - { - } - // Release the lock - try - { - this.lock_.release (); - } - catch (LockException e) - { - ACE.ERROR (e); - } - try - { - Thread.sleep (1); - } - catch (InterruptedException e) - { - } - - } - } - - int nIterations_; - AbstractLock lock_; - } - - static class LockWriter extends Thread - { - LockWriter (int nIterations, AbstractLock lock) - { - this.nIterations_ = nIterations; - this.lock_ = lock; - } - - public void run () - { - for (int i = 1; i <= this.nIterations_; i++) - { - // Acquire the lock (will block until it gets it) - try - { - this.lock_.acquire (); - } - catch (InterruptedException e) - { - ACE.ERROR (e); - } - catch (LockException e) - { - ACE.ERROR (e); - } - - - IterationTest.count++; - ACE.DEBUG (Thread.currentThread ().toString () + - " writer acquired lock in iteration " + i + - ", count = " + IterationTest.count); - - try - { - Thread.sleep (1); - } - catch (InterruptedException e) - { - } - - // Release the lock - try - { - this.lock_.release (); - } - catch (LockException e) - { - ACE.ERROR (e); - } - - try - { - Thread.sleep (1); - } - catch (InterruptedException e) - { - } - - } - } - - int nIterations_; - AbstractLock lock_; - } - - final static int TOKEN = 0; - final static int MUTEX = 1; - final static int RWMUTEX = 2; - final static int SEMAPHORE = 3; - - /** - * Command line arguments: - * - * (number of readers) (number of writers) (number of iterations) - */ - public static void main (String args[]) throws InterruptedException - { - int nReaders = 1; - int nWriters = 1; - int nIterations = 100; - int i; - - ACE.enableDebugging (); - - try - { - if (args.length == 3) - { - nReaders = Integer.parseInt (args[0]); - nWriters = Integer.parseInt (args[1]); - nIterations = Integer.parseInt (args[2]); - } - } - catch (NumberFormatException e) - { - ACE.ERROR ("Illegal argument."); - } - - AbstractLock lock = null; - Thread threads[] = new Thread [nReaders + nWriters]; - - for (int state = TOKEN; state <= SEMAPHORE; state++) { - - count = 0; - - switch (state) - { - case TOKEN: - ACE.DEBUG ("--------\nTesting Token:"); - lock = new Token (); - break; - case MUTEX: - ACE.DEBUG ("--------\nTesting Mutex:"); - lock = new Mutex (); - break; - case RWMUTEX: - ACE.DEBUG ("--------\nTesting RWMutex:"); - lock = new RWMutex (); - break; - case SEMAPHORE: - ACE.DEBUG ("--------\nTesting Semaphore:"); - lock = new Semaphore (); - break; - } - - int numThreads = 0; - - // Spawn off the readers and writers - for (i = 0; i < nReaders; i++) { - threads[numThreads] = new LockReader (nIterations, lock); - threads[numThreads].start (); - numThreads++; - } - - for (i = 0; i < nWriters; i++) { - threads[numThreads] = new LockWriter (nIterations, lock); - threads[numThreads].start (); - numThreads++; - } - - for (i = 0; i < numThreads; i++) - threads[i].join (); - - } - } - - public static int count; -} diff --git a/java/JACE/tests/Concurrency/RWMutexTest.java b/java/JACE/tests/Concurrency/RWMutexTest.java deleted file mode 100644 index ff2bbc1f396..00000000000 --- a/java/JACE/tests/Concurrency/RWMutexTest.java +++ /dev/null @@ -1,137 +0,0 @@ -/************************************************* - * - * = PACKAGE - * JACE.tests.Concurrency - * - * = FILENAME - * RWMutexTest.java - * - *@author Ross Dargahi (rossd@krinfo.com) - * - *************************************************/ -package JACE.tests.Concurrency; - -import JACE.OS.*; -import JACE.Concurrency.*; - -public class RWMutexTest -{ - static class TestThread extends Thread - { - TestThread(String name, - boolean writer, - AbstractLock lock) - { - super (name); - mWriter = writer; - mLock = lock; - } - - public void output (String msg) - { - synchronized (iosynch) { - ACE.DEBUG (msg); - } - } - - public void run() - { - for (int i = 0; i < 10; i++) - { - try - { - if (!mWriter) - { - mLock.acquireRead(); - output (getName() + ": Acquired Read Lock"); - - int sleepTime = 10; - sleep (sleepTime); - - mLock.release (); - output (getName () + ": Released Read Lock"); - } - else - { - mLock.acquireWrite (); - output (getName () + ": Acquired Write Lock"); - - int sleepTime = 10; - sleep (sleepTime); - - mLock.release (); - output (getName () + ": Released Write Lock"); - } - } - catch (InterruptedException ex) - { - ACE.ERROR ("InterruptedException"); - } - catch (LockException ex) - { - ACE.ERROR ("LockException: " + ex.getMessage ()); - } - } - } - - AbstractLock mLock; - boolean mWriter; - - static Object iosynch = new Object (); - } - - /** - * Command line arguments: - * - * Optional class name to use for the tests (must implement the - * AbstractLock interface). Followed by an optional number of - * iterations. - */ - public static void main(String [] args) - throws ClassNotFoundException, - IllegalAccessException, - InstantiationException, - InterruptedException, - NumberFormatException - { - AbstractLock lock; - int iterations = 1; - - ACE.enableDebugging (); - - if (args.length > 0) { - ACE.DEBUG("Using class " + args[0] + " as the Lock"); - - lock = (AbstractLock)(Class.forName (args[0]).newInstance ()); - - if (args.length > 1) - iterations = Integer.parseInt (args[1]); - - } else - lock = new RWMutex (); - - for (int i = 0; i < iterations; i++) { - - ACE.DEBUG("Iteration " + (i + 1)); - - TestThread t1 = new TestThread ("1", false, lock); - TestThread t2 = new TestThread ("2", false, lock); - TestThread t3 = new TestThread ("3", false, lock); - TestThread t4 = new TestThread ("4", true, lock); - TestThread t5 = new TestThread ("5", false, lock); - TestThread t6 = new TestThread ("6", false, lock); - TestThread t7 = new TestThread ("7", false, lock); - TestThread t8 = new TestThread ("8", true, lock); - - t1.start (); - t2.start (); - t3.start (); - t4.start (); - t5.start (); - t6.start (); - t7.start (); - t8.start (); - } - } -} - diff --git a/java/JACE/tests/Concurrency/TimingTest.java b/java/JACE/tests/Concurrency/TimingTest.java deleted file mode 100644 index 783d2e003a2..00000000000 --- a/java/JACE/tests/Concurrency/TimingTest.java +++ /dev/null @@ -1,290 +0,0 @@ -package JACE.tests.Concurrency; - -import JACE.OS.*; -import JACE.ASX.*; -import JACE.Concurrency.*; - -/** - * Performs a test with 5 threads. This should test what happens during - * renews, also testing what happens when timeout exceptions are generated - * during operations. - * - * Sample output: - * - * Thread 1 calling acquire - * Thread 1 got lock - * Thread 1 doing work - * Thread 2 calling acquire - * Thread 1 finished doing work - * Thread 1 calling renew -1 1 - * Thread 2 got lock - * Thread 2 doing work - * Thread 3 calling acquire - * Thread 4 calling acquire - * Thread 5 calling acquire with 1 sec timeout - * Thread 1 timed out in renew - * Thread 1 failed renewing - * Thread 1 calling release - * Thread 1 failed release - * Thread 5 timed out in acquire - * Thread 5 failed acquire - * Thread 5 calling release - * Thread 5 failed release - * Thread 2 finished doing work - * Thread 2 calling renew 1 - * Thread 3 got lock - * Thread 3 doing work - * Thread 3 finished doing work - * Thread 3 calling release - * Thread 3 released - * Thread 2 got the lock back - * Thread 2 calling release - * Thread 2 released - * Thread 4 got lock - * Thread 4 doing work - * Thread 4 finished doing work - * Thread 4 calling release - * Thread 4 released - */ -public class TimingTest -{ - static class Worker extends Thread - { - AbstractLock lock; - String name; - int order; - - public Worker (String name, int order, AbstractLock lock) - { - this.name = name; - this.order = order; - this.lock = lock; - } - - public void run() - { - switch (this.order) - { - case 1: - methodA(); - break; - case 2: - methodB(); - break; - case 3: - methodC(); - break; - case 4: - methodD(); - break; - } - } - - public void methodA() - { - // acquires - // launches a class 2 worker - // works - // renew -1 with a 1 sec timeout (intended to fail) - // release - - try { - if (acquire() == AbstractLock.FAILURE) - return; - - new Worker("Thread 2", 2, lock).start(); - - work(3000); - - renew(-1, 1); - } finally { - release(); - } - } - - public void methodB() - { - // acquire - // launch two new class 3 workers and one class 4 worker - // work - // renew, yielding to one waiter - // release - try { - if (acquire() == AbstractLock.FAILURE) - return; - - new Worker ("Thread 3", 3, lock).start (); - new Worker ("Thread 4", 3, lock).start (); - new Worker ("Thread 5", 4, lock).start (); - - work(3000); - - renew(1); - } finally { - release(); - } - } - - public void methodC() - { - // acquire - // work - // release - - try { - if (acquire() == AbstractLock.FAILURE) - return; - - work(1000); - } finally { - release(); - } - - } - - public void methodD() - { - // acquire with a short timeout - // (shouldn't get past the timeout) - try { - if (acquire (1) == AbstractLock.FAILURE) - return; - - ACE.DEBUG (name + " probably should have timed out in acquire"); - work (1000); - } finally { - release (); - } - } - - public int acquire (int relativeTimeout) - { - int result = AbstractLock.FAILURE; - ACE.DEBUG(name + " calling acquire with " + relativeTimeout + - " sec timeout"); - - try { - result = lock.acquire (TimeValue.relativeTimeOfDay (relativeTimeout, 0)); - } catch (JACE.ASX.TimeoutException e) { - ACE.DEBUG(name + " timed out in acquire"); - } catch (Exception e) { - ACE.DEBUG (name + " got exception: " + e); - } - - if (result != AbstractLock.FAILURE) - ACE.DEBUG(name + " got lock"); - else - ACE.DEBUG(name + " failed acquire"); - - return result; - } - - public int acquire() - { - int result = AbstractLock.FAILURE; - - ACE.DEBUG(name + " calling acquire"); - try { - result = lock.acquire(); - } catch (Exception e) { - ACE.DEBUG(name + " got exception: " + e); - } - if (result != AbstractLock.FAILURE) - ACE.DEBUG(name + " got lock"); - else - ACE.DEBUG(name + " failed acquire"); - - return result; - } - - public void release() - { - ACE.DEBUG(name + " calling release"); - int result = AbstractLock.FAILURE; - try { - result = lock.release(); - } catch (Exception e) { - ACE.DEBUG (name + " got exception: " + e); - } - - if (result != AbstractLock.FAILURE) - ACE.DEBUG(name + " released"); - else - ACE.DEBUG(name + " failed release"); - } - - public void renew(int pos) - { - int result = AbstractLock.FAILURE; - ACE.DEBUG(name + " calling renew " + pos); - try { - result = lock.renew(pos); - } catch (Exception e) { - ACE.DEBUG (name + " got exception: " + e); - } - - if (result != AbstractLock.FAILURE) - ACE.DEBUG(name + " got the lock back"); - else - ACE.DEBUG(name + " failed renewing"); - } - - public void renew(int pos, int relativeTimeout) - { - int result = AbstractLock.FAILURE; - ACE.DEBUG(name + " calling renew " + pos + " " + - relativeTimeout); - try { - result = lock.renew(pos, - TimeValue.relativeTimeOfDay(relativeTimeout, - 0)); - } catch (JACE.ASX.TimeoutException e) { - ACE.DEBUG(name + " timed out in renew"); - } catch (Exception e) { - ACE.DEBUG (name + " got exception: " + e); - } - - if (result != AbstractLock.FAILURE) - ACE.DEBUG(name + " got the lock back"); - else - ACE.DEBUG(name + " failed renewing"); - } - - public void work(int ms) - { - ACE.DEBUG(name + " doing work"); - try { - Thread.sleep(ms); - } catch (InterruptedException e) { - ACE.DEBUG(name + " was interrupted"); - } - ACE.DEBUG(name + " finished doing work"); - } - } - - /** - * Command line: - * - * Optional class name (which implements AbstractLock) to test - */ - public static void main(String args[]) { - AbstractLock lock; - - ACE.enableDebugging (); - - try { - - if (args.length > 0) { - ACE.DEBUG("Using class " + args[0] + " as the Lock"); - - lock = (AbstractLock)(Class.forName (args[0]).newInstance ()); - } else - lock = new Token (); - - new Worker("Thread 1", 1, lock).start(); - - } catch (Exception e) { - ACE.ERROR("Error: " + e); - } - } -} diff --git a/java/JACE/tests/Concurrency/TokenTest.java b/java/JACE/tests/Concurrency/TokenTest.java deleted file mode 100644 index 162170f1996..00000000000 --- a/java/JACE/tests/Concurrency/TokenTest.java +++ /dev/null @@ -1,95 +0,0 @@ -/************************************************* - * - * = PACKAGE - * tests.Concurrency - * - * = FILENAME - * TokenTest.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.tests.Concurrency; - -import java.io.*; -import JACE.OS.*; -import JACE.Concurrency.ThreadManager; -import JACE.Concurrency.*; -import JACE.ASX.TimeValue; - -public class TokenTest implements Runnable -{ - static class MyToken extends Token - { - public void sleepHook () - { - ACE.DEBUG (Thread.currentThread ().getName () + - " blocking, sleepHook called"); - } - } - - public void run () - { - String name = Thread.currentThread().getName(); - try - { - if (this.token_.acquire () != AbstractLock.FAILURE) - ACE.DEBUG (name + " got token"); - else - ACE.DEBUG (name + " couldn't get token"); - - ACE.DEBUG (name + " calling acquire again (test nesting)"); - if (this.token_.acquire() != AbstractLock.FAILURE) - ACE.DEBUG (name + " got token again"); - else - ACE.DEBUG (name + " couldn't get token"); - - Thread.sleep (1000); - - ACE.DEBUG (name + " gives it up for max 2 sec to first waiter"); - this.token_.renew (1, TimeValue.relativeTimeOfDay(2, 0)); - - ACE.DEBUG (name + " releases the token once"); - this.token_.release (); - ACE.DEBUG (name + " calls release again (nesting level was 2)"); - this.token_.release (); - } - catch (InterruptedException e) - { - this.token_.release (); - } - catch (JACE.ASX.TimeoutException e) - { - ACE.DEBUG (name + " timed out"); - } - } - - /** - * Command line: optional number of threads to create (defaults to 2) - */ - public static void main (String args []) - { - ThreadManager tm = new ThreadManager (); - int n = 2; - - ACE.enableDebugging (); - - try - { - if (args.length == 1) - { - n = Integer.parseInt (args[0]); - } - } - catch (NumberFormatException e) - { - ACE.ERROR ("Illegal argument."); - } - - tm.spawnN (n, - new TokenTest (), - false); - } - - private static MyToken token_ = new MyToken (); -} diff --git a/java/JACE/tests/Connection/AcceptorTest.java b/java/JACE/tests/Connection/AcceptorTest.java deleted file mode 100644 index 0e313ba1f43..00000000000 --- a/java/JACE/tests/Connection/AcceptorTest.java +++ /dev/null @@ -1,83 +0,0 @@ -// ============================================================================ -// -// = PACKAGE -// tests.Connection -// -// = FILENAME -// AcceptorTest.java -// -// = AUTHOR -// Prashant Jain -// -// ============================================================================ -package JACE.tests.Connection; - -import java.io.*; -import java.net.*; -import JACE.OS.*; -import JACE.Connection.*; - -public class AcceptorTest -{ - void print_usage_and_die () - { - System.out.println ("Usage: test_server [<port>]"); - System.exit (0); - } - - public void init (int port) - { - try - { - Acceptor acceptor = - new Acceptor - (Class.forName ("JACE.tests.Connection.ServerHandler")); - acceptor.open (port); - while (true) - { - acceptor.accept (); - } - } - catch (ClassNotFoundException e) - { - ACE.ERROR (e); - } - catch (SocketException e) - { - ACE.ERROR ("Socket Exception: " + e); - } - catch (InstantiationException e) - { - ACE.ERROR (e); - } - catch (IllegalAccessException e) - { - ACE.ERROR ("Dang!" + e); - } - catch (IOException e) - { - ACE.ERROR (e); - } - } - - public static void main (String [] args) - { - int port = ACE.DEFAULT_SERVER_PORT; - AcceptorTest acceptorTest = new AcceptorTest (); - - ACE.enableDebugging (); - - if (args.length == 1) - { - try - { - port = Integer.parseInt (args[0]); - } - catch (NumberFormatException e) - { - acceptorTest.print_usage_and_die (); - } - } - acceptorTest.init (port); - } -} diff --git a/java/JACE/tests/Connection/ClientHandler.java b/java/JACE/tests/Connection/ClientHandler.java deleted file mode 100644 index d5885a892e9..00000000000 --- a/java/JACE/tests/Connection/ClientHandler.java +++ /dev/null @@ -1,77 +0,0 @@ -// ============================================================================ -// -// = PACKAGE -// tests.Connection -// -// = FILENAME -// ClientHandler.java -// -// = AUTHOR -// Prashant Jain -// -// ============================================================================ -package JACE.tests.Connection; - -import java.io.*; -import java.net.*; -import JACE.OS.*; -import JACE.Connection.*; - -public class ClientHandler extends SvcHandler -{ - public ClientHandler () - { - } - - public int open (Object obj) - { - new Thread (this).start (); - return 0; - } - - public void run () - { - BufferedReader in = new BufferedReader(new InputStreamReader(System.in)); - - String msg; - StringBuffer ack = new StringBuffer (); - int ack_len; - try - { - while (true) - { - System.out.print ("Enter input: "); - System.out.flush (); - msg = in.readLine (); - if (msg == null) - break; - this.peer ().send (new StringBuffer (msg)); - System.out.println ("Waiting for ack..."); - ack_len = this.peer ().recv (ack); - if (ack_len == 0) - break; - else - System.out.println (ack); - } - } - catch (NullPointerException e) - { - ACE.ERROR ("connection reset by peer"); - } - catch (IOException e) - { - ACE.ERROR (e); - } - finally - { - try - { - this.peer ().close (); - } - catch (IOException e) - { - } - } - - } -} diff --git a/java/JACE/tests/Connection/ConnectorTest.java b/java/JACE/tests/Connection/ConnectorTest.java deleted file mode 100644 index 285e492dcaf..00000000000 --- a/java/JACE/tests/Connection/ConnectorTest.java +++ /dev/null @@ -1,78 +0,0 @@ -// ============================================================================ -// -// = PACKAGE -// tests.Connection -// -// = FILENAME -// ConnectorTest.java -// -// = AUTHOR -// Prashant Jain -// -// ============================================================================ -package JACE.tests.Connection; - -import java.io.*; -import java.net.*; -import JACE.OS.*; -import JACE.Connection.*; - -public class ConnectorTest -{ - void print_usage_and_die () - { - System.out.println ("Usage: test_Connector <hostname> [<port>]"); - System.exit (0); - } - - public void init (String hostname, int port) - { - try - { - Connector connector = new Connector (); - connector.open (hostname, port); - connector.connect (new ClientHandler ()); - } - catch (UnknownHostException e) - { - ACE.ERROR (e); - } - catch (SocketException e) - { - ACE.ERROR ("Connection refused"); - } - catch (InstantiationException e) - { - ACE.ERROR (e); - } - catch (IllegalAccessException e) - { - ACE.ERROR (e); - } - catch (IOException e) - { - ACE.ERROR (e); - } - } - - public static void main (String [] args) - { - int port = ACE.DEFAULT_SERVER_PORT; - ConnectorTest connectorTest = new ConnectorTest (); - - ACE.enableDebugging (); - - if (args.length == 2) - { - try - { - port = Integer.parseInt (args[1]); - } - catch (NumberFormatException e) - { - connectorTest.print_usage_and_die (); - } - } - connectorTest.init (args[0], port); - } -} diff --git a/java/JACE/tests/Connection/HTTPHelperTest.java b/java/JACE/tests/Connection/HTTPHelperTest.java deleted file mode 100644 index 28967acb8d3..00000000000 --- a/java/JACE/tests/Connection/HTTPHelperTest.java +++ /dev/null @@ -1,34 +0,0 @@ -package JACE.tests.Connection; - -import java.io.*; -import JACE.Connection.*; -import JACE.OS.*; - -public class HTTPHelperTest -{ - public static void main(String args[]) - { - ACE.enableDebugging (); - // This is just a quick test to confirm that the Base 64 - // encoding and decoding work - // (tests the example given in the HTTP 1.1 RFC) - - String secret = "Aladdin:open sesame"; - - String encoded = HTTPHelper.EncodeBase64(secret); - - System.err.println("Encoding string: \"" + secret + '\"'); - - System.err.println("Result: \"" + encoded + '\"'); - - System.err.println("Is this right? " + - (encoded.equals("QWxhZGRpbjpvcGVuIHNlc2FtZQ==") ? - "Yes" : "No")); - - String decoded = HTTPHelper.DecodeBase64 (encoded); - System.err.println("Decoded: \"" + decoded + '\"'); - - System.err.println("Is this right? " + - (decoded.equals (secret) ? "Yes" : "No")); - } -} diff --git a/java/JACE/tests/Connection/ServerHandler.java b/java/JACE/tests/Connection/ServerHandler.java deleted file mode 100644 index 4dec8186427..00000000000 --- a/java/JACE/tests/Connection/ServerHandler.java +++ /dev/null @@ -1,68 +0,0 @@ -// ============================================================================ -// -// = PACKAGE -// tests.Connection -// -// = FILENAME -// ServerHandler.java -// -// = AUTHOR -// Prashant Jain -// -// ============================================================================ -package JACE.tests.Connection; - -import java.io.*; -import java.net.*; -import JACE.OS.*; -import JACE.Connection.*; - -public class ServerHandler extends SvcHandler -{ - public ServerHandler () - { - } - - public int open (Object obj) - { - new Thread (this).start (); - return 0; - } - - public void run () - { - int msg_len; - System.out.println ("Waiting for messages..."); - try - { - while (true) - { - StringBuffer msg = new StringBuffer (); - msg_len = this.peer ().recv (msg); - if (msg_len == 0) - break; - System.out.println ("Received: " + msg); - this.peer ().send (new StringBuffer ("Got it!")); - } - } - catch (NullPointerException e) - { - ACE.ERROR ("connection reset by peer"); - } - catch (IOException e) - { - ACE.ERROR (e); - } - finally - { - try - { - this.peer ().close (); - } - catch (IOException e) - { - } - } - - } -} diff --git a/java/JACE/tests/Makefile b/java/JACE/tests/Makefile deleted file mode 100644 index f6336bd7ebb..00000000000 --- a/java/JACE/tests/Makefile +++ /dev/null @@ -1,115 +0,0 @@ -# Makefile for JACE tests -# $Id$ - -.SUFFIXES: .java .class - -JACE_WRAPPER = ../.. -CLASSDIR = $(JACE_WRAPPER)/classes - -JC = javac -JCOPTS = -d $(CLASSDIR) - -COMPILE.java = $(JC) $(JCOPTS) $(filter %.java,$?) - -CLASSPATH := $(CLASSDIR):$(CLASSPATH) - -all: asx concurrency condition connection misc reactor socksap svcconfig netsvcs - -pkg_all = $(pkg_asx) $(pkg_concurrency) $(pkg_condition) $(pkg_connection) \ - $(pkg_misc) $(pkg_reactor) $(pkg_socksap) $(pkg_svcconfig) $(pkg_netsvcs) - -clean: - find ${JACE_WRAPPER}/classes/JACE/tests -name '*.class' -print | xargs ${RM} - -pkg_asx = \ - BufferStreamTest \ - MessageQueueTest \ - PriorityBufferTest \ - TaskTest \ - ThreadPoolTest - -asx: $(addprefix ASX/,$(addsuffix .java,$(pkg_asx))) - $(COMPILE.java) - -pkg_concurrency = \ - IterationTest \ - RWMutexTest \ - TimingTest \ - TokenTest - -concurrency: $(addprefix Concurrency/,$(addsuffix .java,$(pkg_concurrency))) - $(COMPILE.java) - -pkg_condition = \ - Consumer \ - JoinableThreadGroup \ - Producer \ - QueueTest \ - SimpleMessageQueue - -condition: $(addprefix Concurrency/Condition/,$(addsuffix .java,$(pkg_condition))) - $(COMPILE.java) - -pkg_connection = \ - AcceptorTest \ - ClientHandler \ - ConnectorTest \ - HTTPHelperTest \ - ServerHandler - -connection: $(addprefix Connection/,$(addsuffix .java,$(pkg_connection))) - $(COMPILE.java) - -pkg_misc = \ - ParseArgsTest - -misc: $(addprefix Misc/,$(addsuffix .java,$(pkg_misc))) - $(COMPILE.java) - -pkg_reactor = \ - TimeValueTest \ - TimerQueueTest - -reactor: $(addprefix Reactor/,$(addsuffix .java,$(pkg_reactor))) - $(COMPILE.java) - -pkg_socksap = \ - SOCKAcceptorTest \ - SOCKConnectorTest - -socksap: $(addprefix SOCK_SAP/,$(addsuffix .java,$(pkg_socksap))) - $(COMPILE.java) - -pkg_svcconfig = \ - Main - -svcconfig: $(addprefix ServiceConfigurator/,$(addsuffix .java,$(pkg_svcconfig))) - $(COMPILE.java) - -netsvcs: logger_tests naming_tests time_tests token_tests - -pkg_logger_tests = \ - LoggerTest - -logger_tests: $(addprefix netsvcs/Logger/,$(addsuffix .java,$(pkg_logger_tests))) - $(COMPILE.java) - -pkg_naming_tests = \ - ClientTest - -naming_tests: $(addprefix netsvcs/Naming/,$(addsuffix .java,$(pkg_naming_tests))) - $(COMPILE.java) - -pkg_time_tests = \ - TSClient - -time_tests: $(addprefix netsvcs/Time/,$(addsuffix .java,$(pkg_time_tests))) - $(COMPILE.java) - -pkg_token_tests = \ - ProxyClientTest - -token_tests: $(addprefix netsvcs/Token/,$(addsuffix .java,$(pkg_token_tests))) - $(COMPILE.java) - - diff --git a/java/JACE/tests/Misc/ParseArgsTest.java b/java/JACE/tests/Misc/ParseArgsTest.java deleted file mode 100644 index cc27b28d75b..00000000000 --- a/java/JACE/tests/Misc/ParseArgsTest.java +++ /dev/null @@ -1,48 +0,0 @@ -// ============================================================================ -// -// = PACKAGE -// tests.Misc -// -// = FILENAME -// ParseArgsTest.java -// -// = AUTHOR -// Prashant Jain -// -// ============================================================================ -package JACE.tests.Misc; - -import JACE.OS.*; -import JACE.Misc.*; - -public class ParseArgsTest -{ - public static void main (String args[]) - { - ACE.enableDebugging (); - - String s; - GetOpt opt = new GetOpt (args, "p:rs:", true); - for (int c; (c = opt.next ()) != -1; ) - { - System.out.println ("c is " + (char)c); - switch (c) - { - case 'p': - s = opt.optarg (); - ACE.DEBUG ("Option <p> selected with argument " + s); - break; - case 'r': - ACE.DEBUG ("Option <r> selected"); - break; - case 's': - s = opt.optarg (); - ACE.DEBUG ("Option <s> selected with argument " + s); - break; - default: - ACE.DEBUG ("Usage: java tests.Misc.ParseArgsTest [-p arg1] [-r] [-s arg2]"); - break; - } - } - } -} diff --git a/java/JACE/tests/Reactor/TimeValueTest.java b/java/JACE/tests/Reactor/TimeValueTest.java deleted file mode 100644 index 559f6d15176..00000000000 --- a/java/JACE/tests/Reactor/TimeValueTest.java +++ /dev/null @@ -1,52 +0,0 @@ -/************************************************* - * - * = PACKAGE - * ACE.Reactor - * - * = FILENAME - * TimeValueTest.java - * - *@author Prashant Jain - * - *************************************************/ -package JACE.tests.Reactor; - -import JACE.OS.*; -import JACE.ASX.*; - -public class TimeValueTest -{ - public void ASSERT (boolean expression, int i) - { - if (!expression) - ACE.ERROR ("ASSERT failed for " + i); - } - - public void runTest () - { - TimeValue tv1 = new TimeValue (); - TimeValue tv2 = new TimeValue (2); - TimeValue tv3 = new TimeValue (100); - TimeValue tv4 = new TimeValue (1, 1000000000); - TimeValue tv5 = new TimeValue (2); - TimeValue tv6 = new TimeValue (1, -1000000000); - - this.ASSERT (tv1.equals (new TimeValue (0)), 1); - this.ASSERT (tv2.lessThan (tv3), 2); - this.ASSERT (tv2.lessThanEqual (tv2), 3); - this.ASSERT (tv2.greaterThanEqual (tv4), 4); - this.ASSERT (tv5.greaterThanEqual (tv6), 5); - this.ASSERT (tv2.equals (new TimeValue (1, 1000000000)), 6); - this.ASSERT (tv5.equals (tv4), 7); - this.ASSERT (tv2.equals (tv4), 8); - this.ASSERT (tv1.notEquals (tv2), 9); - this.ASSERT (tv6.equals (tv1), 10); - } - - public static void main (String [] args) - { - ACE.enableDebugging (); - - new TimeValueTest ().runTest (); - } -} diff --git a/java/JACE/tests/Reactor/TimerQueueTest.java b/java/JACE/tests/Reactor/TimerQueueTest.java deleted file mode 100644 index 93845ccb6ec..00000000000 --- a/java/JACE/tests/Reactor/TimerQueueTest.java +++ /dev/null @@ -1,84 +0,0 @@ -// ============================================================================ -// -// = PACKAGE -// tests.Reactor -// -// = FILENAME -// TimerQueueTest.java -// -// = AUTHOR -// Prashant Jain -// -// ============================================================================ -package JACE.tests.Reactor; - -import JACE.OS.*; -import JACE.ASX.*; -import JACE.Reactor.*; - -public class TimerQueueTest implements EventHandler -{ - public int handleTimeout (TimeValue tv, Object obj) - { - ACE.DEBUG ("handleTimeout: " + tv.toString () + " " + (String) obj); - return 0; - } - - public static void main (String args []) - { - ACE.enableDebugging (); - - TimerQueue tq = new TimerQueue (true); - TimerQueueTest th1 = new TimerQueueTest (); - int n = 5; - - ACE.enableDebugging (); - - try - { - if (args.length == 1) - { - n = Integer.parseInt (args[0]); - } - } - catch (NumberFormatException e) - { - ACE.ERROR ("Illegal argument."); - } - - // Set a periodic timer - int id = tq.scheduleTimer (th1, - "periodic", - new TimeValue (2), - new TimeValue (3)); - - int i; - // Set a bunch of single timers - for (i=1; i <= n; i++) - { - tq.scheduleTimer (th1, - "A-timer-" + new Integer (i), - new TimeValue (i*2)); - } - - TimerQueueTest th2 = new TimerQueueTest (); - for (i=1; i <= n; i++) - { - tq.scheduleTimer (th2, - "B-timer-" + new Integer (i), - new TimeValue (i*3)); - } - // Cancel all timers associated with this handler - tq.cancelTimer (th2); - - try - { - Thread.sleep (30000); - } - catch (InterruptedException e) - { - } - tq.cancelTimer (id); - System.exit (0); - } -} diff --git a/java/JACE/tests/SOCK_SAP/SOCKAcceptorTest.java b/java/JACE/tests/SOCK_SAP/SOCKAcceptorTest.java deleted file mode 100644 index 3251030fe1c..00000000000 --- a/java/JACE/tests/SOCK_SAP/SOCKAcceptorTest.java +++ /dev/null @@ -1,110 +0,0 @@ -// ============================================================================ -// -// = PACKAGE -// tests.SOCK_SAP -// -// = FILENAME -// SOCKAcceptorTest.java -// -// = AUTHOR -// Prashant Jain -// -// ============================================================================ -package JACE.tests.SOCK_SAP; - -import java.io.*; -import java.net.*; -import JACE.OS.*; -import JACE.SOCK_SAP.*; - -class TestHandler extends Thread -{ - public TestHandler (SOCKStream stream) - { - this.stream_ = stream; - } - - public void run () - { - int msgLen; - System.out.println ("Waiting for messages..."); - try - { - while (true) - { - StringBuffer msg = new StringBuffer (); - msgLen = this.stream_.recv (msg); - if (msgLen == 0) - break; - ACE.DEBUG ("Received: " + msg); - this.stream_.send ("Got it!"); - } - } - catch (NullPointerException e) - { - ACE.ERROR ("connection reset by peer"); - } - catch (IOException e) - { - ACE.ERROR (e); - } - finally - { - try - { - this.stream_.close (); - } - catch (IOException e) - { - } - } - } - SOCKStream stream_; -} - -public class SOCKAcceptorTest -{ - void print_usage_and_die () - { - ACE.DEBUG ("Usage: SOCKAcceptorTest [<port>]"); - System.exit (0); - } - - public void init (int port) - { - try - { - SOCKAcceptor acceptor = new SOCKAcceptor (port); - while (true) - { - SOCKStream stream = new SOCKStream (); - acceptor.accept (stream); - TestHandler handler = new TestHandler (stream); - handler.start (); - } - } - catch (IOException e) - { - } - } - - public static void main (String [] args) - { - ACE.enableDebugging (); - - int port = ACE.DEFAULT_SERVER_PORT; - SOCKAcceptorTest server = new SOCKAcceptorTest (); - if (args.length == 1) - { - try - { - port = Integer.parseInt (args[0]); - } - catch (NumberFormatException e) - { - server.print_usage_and_die (); - } - } - server.init (port); - } -} diff --git a/java/JACE/tests/SOCK_SAP/SOCKConnectorTest.java b/java/JACE/tests/SOCK_SAP/SOCKConnectorTest.java deleted file mode 100644 index e14b63936f5..00000000000 --- a/java/JACE/tests/SOCK_SAP/SOCKConnectorTest.java +++ /dev/null @@ -1,97 +0,0 @@ -// ============================================================================ -// -// = PACKAGE -// tests.SOCK_SAP -// -// = FILENAME -// SOCKConnectorTest.java -// -// = AUTHOR -// Prashant Jain -// -// ============================================================================ -package JACE.tests.SOCK_SAP; - -import java.io.*; -import java.net.*; -import JACE.OS.*; -import JACE.SOCK_SAP.*; - -public class SOCKConnectorTest -{ - static void print_usage_and_die () - { - System.out.println ("Usage: SOCKConnectorTest <hostname> [<port>]"); - System.exit (0); - } - - void processRequests (SOCKStream stream) throws IOException - { - // 1.0 JDK DataInputStream in = new DataInputStream (System.in); - BufferedReader in = new BufferedReader(new InputStreamReader(System.in)); - String msg; - int ack_len; - - while (true) - { - StringBuffer ack = new StringBuffer (); - ACE.DEBUG ("Enter input: "); - ACE.FLUSH (); - msg = in.readLine (); - if (msg == null) - break; - stream.send (msg); - ACE.DEBUG ("Waiting for ack..."); - ack_len = stream.recv (ack); - if (ack_len == 0) - break; - else - ACE.DEBUG (ack.toString ()); - } - } - - public void init (String host, int port) - { - SOCKStream stream = new SOCKStream (); - SOCKConnector connector = new SOCKConnector (); - try - { - connector.connect (stream, - host, - port); - processRequests (stream); - } - catch (IOException e) - { - ACE.ERROR (e); - } - } - - public static void main (String [] args) - { - ACE.enableDebugging (); - - int port = ACE.DEFAULT_SERVER_PORT; - SOCKConnectorTest client = new SOCKConnectorTest (); - - // check arg count - if (args.length == 0 || args.length > 2) - print_usage_and_die(); - - if (args.length == 2) - { - try - { - port = Integer.parseInt (args[1]); - } - catch (NumberFormatException e) - { - client.print_usage_and_die (); - } - } - client.init (args[0], port); - - - } -} - diff --git a/java/JACE/tests/ServiceConfigurator/Main.java b/java/JACE/tests/ServiceConfigurator/Main.java deleted file mode 100644 index 2b57d5ad429..00000000000 --- a/java/JACE/tests/ServiceConfigurator/Main.java +++ /dev/null @@ -1,113 +0,0 @@ -package JACE.tests.ServiceConfigurator; - -import java.io.*; -import java.util.*; -import JACE.OS.*; -import JACE.ServiceConfigurator.*; - -/** - * Runs the service configurator, allowing the user to interact with it. - */ -public class Main -{ - public static void main (String args[]) - throws FileNotFoundException, IOException, ClassNotFoundException, - IllegalAccessException, InstantiationException - { - ACE.enableDebugging (); - - if (ServiceConfig.open (args) < 0) { - System.err.println ("Error opening ServiceConfig"); - return; - } - - processCommands (args); - - // close everything down - ServiceConfig.close (); - } - - public static void report(String s) { - System.out.println(s); - } - - static InputStreamReader stdin = new InputStreamReader (System.in); - - public static void showMenu () - { - report ("\n[C]lose all"); - report ("[S]uspend all"); - report ("[R]esume all"); - report ("[Re[l]oad all"); - report ("List [n]ames"); - - report ("\n[Q]uit"); - System.out.print ("\nOption (CSRLNQ): "); - } - - public static void processCommands (String [] args) - throws FileNotFoundException, IOException, ClassNotFoundException, - IllegalAccessException, InstantiationException - { - int ch = 0; - Enumeration svcs; - - showMenu (); - - do { - - ch = stdin.read (); - - switch (ch) - { - case 'c': - case 'C': - ServiceConfig.close (); - break; - case 's': - case 'S': - svcs = ServiceConfig.serviceNames (); - while (svcs.hasMoreElements ()) - ServiceConfig.suspend ((String)svcs.nextElement ()); - break; - case 'r': - case 'R': - svcs = ServiceConfig.serviceNames (); - while (svcs.hasMoreElements ()) - ServiceConfig.resume ((String)svcs.nextElement ()); - break; - case 'l': - case 'L': - ServiceConfig.close (); - svcs = ServiceConfig.serviceNames (); - while (svcs.hasMoreElements ()) - ServiceConfig.remove ((String)svcs.nextElement ()); - ServiceConfig.open (args); - break; - case 'n': - case 'N': - report ("\nService names:\n"); - svcs = ServiceConfig.services (); - while (svcs.hasMoreElements ()) { - Service sv = (Service)svcs.nextElement (); - report (sv.name () + " : " + sv.info ()); - } - break; - case 'q': - case 'Q': - report ("\nExiting..."); - return; - case -1: - case 10: - case 13: - continue; - default: - break; - } - - showMenu (); - - } while (true); - } - -} diff --git a/java/JACE/tests/ServiceConfigurator/svc.conf b/java/JACE/tests/ServiceConfigurator/svc.conf deleted file mode 100644 index 5c0c331ed94..00000000000 --- a/java/JACE/tests/ServiceConfigurator/svc.conf +++ /dev/null @@ -1,4 +0,0 @@ -load TimeService JACE.netsvcs.Time.TSServerAcceptor ServiceObject "-d -p 30000" -load LogService JACE.netsvcs.Logger.ServerLoggingAcceptor ServiceObject "-d -p 30001" -load NameService JACE.netsvcs.Naming.NameAcceptor ServiceObject "-d -p 30002" -load TokenService JACE.netsvcs.Token.TokenAcceptor ServiceObject "-d -p 30003" diff --git a/java/JACE/tests/netsvcs/Logger/LoggerTest.java b/java/JACE/tests/netsvcs/Logger/LoggerTest.java deleted file mode 100644 index ae835b07753..00000000000 --- a/java/JACE/tests/netsvcs/Logger/LoggerTest.java +++ /dev/null @@ -1,115 +0,0 @@ -/************************************************* - * - * = FILENAME - * LoggerTest.java - * - *@author Everett Anderson - * - *************************************************/ -package JACE.tests.netsvcs.Logger; - -import JACE.SOCK_SAP.*; -import java.io.*; -import java.net.*; -import JACE.OS.*; -import JACE.netsvcs.Logger.*; - -/** - * - * This is a simple test log client very similar to the direct_logging - * client of C++ ACE. The logging service should correctly receive - * messages from both the C++ and Java version. - * - * @see JACE.netsvcs.Logger.ServerLoggingAcceptor - */ -public class LoggerTest { - - /** Command line: <hostname> [<port>] - * - * Creates a "hello world" log message and sends it to the server logging - * service. - */ - public static void main(String args[]) - { - if (args.length != 2) { - System.err.println("Use: LoggerTest <host name> [<port>]"); - System.exit(0); - } - - ACE.enableDebugging (); - - // Set the port - int port = args.length > 1 ? - (new Integer(args[1])).intValue() : ACE.DEFAULT_SERVER_PORT; - - SOCKStream cli_stream = new SOCKStream(); - INETAddr remote_addr; - String host; - - // Try to find the host - try { - - host = args[0]; - - remote_addr = new INETAddr(port, host); - - } catch (UnknownHostException uhe) { - ACE.ERROR("UnknownHostException " + uhe); - return; - } - - System.out.println("Connecting to " + host + " on port " + port); - - SOCKConnector con = new SOCKConnector(); - - try { - - // Connect to the service - con.connect(cli_stream, remote_addr); - - } catch (SocketException se) { - - ACE.ERROR("Socket Exception " + se); - return; - - } catch (IOException ie) { - - ACE.ERROR("IOException " + ie); - return; - } - - - // Send a message with priority 4, the current time, - // and 0 for the process ID. - LogRecord record = new LogRecord(4, - System.currentTimeMillis(), - 0); - - // Set the text of the message - record.msgData("hello world"); - - try { - - // Send it - record.streamOutTo(cli_stream.socket().getOutputStream ()); - - // Close the socket - cli_stream.close(); - - } catch (IOException ie) { - - ACE.ERROR("" + ie); - return; - } - } -}; - - - - - - - - - - diff --git a/java/JACE/tests/netsvcs/Naming/ClientTest.java b/java/JACE/tests/netsvcs/Naming/ClientTest.java deleted file mode 100644 index f6af6f906ea..00000000000 --- a/java/JACE/tests/netsvcs/Naming/ClientTest.java +++ /dev/null @@ -1,107 +0,0 @@ -package JACE.tests.netsvcs.Naming; - -import java.io.*; -import java.net.*; -import java.util.*; -import JACE.OS.*; -import JACE.Connection.*; -import JACE.SOCK_SAP.*; -import JACE.netsvcs.Naming.*; - -/** - * Simple test program for NameProxy and the naming service. - * - * Command line: (hostname) (port) - */ -public class ClientTest -{ - public static void print_usage_and_die () - { - System.out.println ("Usage: ClientTest <hostname> [<port>]"); - System.exit (0); - } - public static void main (String [] args) - throws UnknownHostException, - SocketException, - InstantiationException, - IllegalAccessException, - IOException - { - ACE.enableDebugging (); - - int port = ACE.DEFAULT_SERVER_PORT; - - if (args.length == 0 || args.length > 2) - print_usage_and_die (); - - if (args.length == 2) { - try - { - port = Integer.parseInt (args[1]); - } - catch (NumberFormatException e) - { - print_usage_and_die (); - } - } - - System.out.println("Trying to open port " + port + " on " + args[0]); - - NameProxy proxy = new NameProxy (); - - Connector c = new Connector (); - c.open (args[0], port); - c.connect (proxy); - - System.out.println("---- Beginning tests ----"); - - try { - - System.out.println("Binding (five, six, seven): " - + proxy.bind("five", "six", "seven")); - System.out.println("Binding (filth, rat, eats): " - + proxy.bind("filth", "rat", "eats")); - - Vector res = proxy.resolve("five"); - - System.out.println("Resolve (five) : " - + (String)res.elementAt(1) + " " - + (String)res.elementAt(2)); - - System.out.println("Binding (fish, words, him): " - + proxy.bind("fish", "words", "him")); - - System.out.println("Unbind (five, six, seven): " - + proxy.unbind("five")); - - res = proxy.resolve("five"); - - System.out.println("Resolve (five) : " - + (String)res.elementAt(1) + " " - + (String)res.elementAt(2)); - - System.out.println("Binding (fiction, us, you): " - + proxy.bind("fiction", "us", "you")); - - System.out.println("\nGetting all records whose names begin with fi:\n"); - Vector res2 = proxy.listNameEntries("fi"); - - Enumeration iter = res2.elements(); - - while (iter.hasMoreElements()) { - Vector res3 = (Vector)(iter.nextElement()); - - System.out.println((String)res3.elementAt(0) - + "\t" + (String)res3.elementAt(1) - + "\t" + (String)res3.elementAt(2)); - } - - } catch (Exception e) { - System.err.println ("" + e); - e.printStackTrace (); - } finally { - proxy.close (); - } - } -} - diff --git a/java/JACE/tests/netsvcs/Time/TSClient.java b/java/JACE/tests/netsvcs/Time/TSClient.java deleted file mode 100644 index 7a8adf93f42..00000000000 --- a/java/JACE/tests/netsvcs/Time/TSClient.java +++ /dev/null @@ -1,37 +0,0 @@ -package JACE.tests.netsvcs.Time; - -import JACE.netsvcs.Time.*; -import JACE.OS.*; -import JACE.Reactor.*; - -public class TSClient -{ - - // Will run until killed since the default is to run the timer - // queue in its own thread. - public static void main (String args[]) - { - ACE.enableDebugging (); - - TSClerkProcessor cp = new TSClerkProcessor (); - - if (cp.init (args) != 0) - return; - - ACE.DEBUG ("***************************"); - ACE.DEBUG ("Press enter to end the test"); - ACE.DEBUG ("***************************"); - - try { - System.in.read(); - - cp.close (); - - } catch (Exception e) { - ACE.ERROR (e); - } - } -} - - - diff --git a/java/JACE/tests/netsvcs/Token/ProxyClientTest.java b/java/JACE/tests/netsvcs/Token/ProxyClientTest.java deleted file mode 100644 index 1b2118b7f9e..00000000000 --- a/java/JACE/tests/netsvcs/Token/ProxyClientTest.java +++ /dev/null @@ -1,200 +0,0 @@ -package JACE.tests.netsvcs.Token; - -import java.net.*; -import java.io.*; -import JACE.ASX.*; -import JACE.OS.*; -import JACE.Misc.*; -import JACE.Concurrency.*; -import JACE.netsvcs.Token.*; - -public class ProxyClientTest -{ - public static void report(String s) { - System.out.println(s); - } - - static InputStreamReader stdin = new InputStreamReader (System.in); - static RemoteLock lock; - static int requeuePosition = -1, timeout = -1; - - public static void showMenu () - { - report ("\n[A]cquire"); - report ("Acquire [w]rite"); - report ("Acquire rea[d]"); - report ("[T]ry Acquire"); - report ("Try acquire wr[i]te"); - report ("Try acquire r[e]ad"); - report ("Re[n]ew"); - report ("[R]elease"); - - report ("\n[Q]uit"); - System.out.print ("\nOption (AWDTIENRQ): "); - } - - public static void processCommands () throws IOException - { - int ch = 0, result = -1; - - showMenu (); - do { - - ch = stdin.read(); - - try { - - switch (ch) - { - case 'a': - case 'A': - if (timeout >= 0) { - TimeValue tv = TimeValue.relativeTimeOfDay (timeout, 0); - result = lock.acquire (tv); - } else - result = lock.acquire (); - break; - case 'w': - case 'W': - if (timeout >= 0) { - TimeValue tv = TimeValue.relativeTimeOfDay (timeout, 0); - result = lock.acquireWrite (tv); - } else - result = lock.acquire (); - break; - case 'd': - case 'D': - if (timeout >= 0) { - TimeValue tv = TimeValue.relativeTimeOfDay (timeout, 0); - result = lock.acquireRead (tv); - } else - result = lock.acquire (); - break; - case 't': - case 'T': - result = lock.tryAcquire (); - break; - case 'i': - case 'I': - result = lock.tryAcquireWrite (); - break; - case 'e': - case 'E': - result = lock.tryAcquireRead (); - break; - case 'r': - case 'R': - result = lock.release (); - break; - case 'n': - case 'N': - if (timeout >= 0) { - TimeValue tv = TimeValue.relativeTimeOfDay (timeout, 0); - result = lock.renew (requeuePosition, tv); - } else - result = lock.renew (requeuePosition); - break; - case 'q': - case 'Q': - continue; - case -1: - case 10: - case 13: - // Ignore line feeds and carriage returns - continue; - default: - report ("Unknown command: " + (char)ch + " (" + ch + ")\n"); - showMenu (); - continue; - } - - report ("\nResult: " + (result == lock.SUCCESS ? "Success" : - "Failure")); - - } catch (TimeoutException e) { - report ("\nRequest timed out"); - /* - } catch (InterruptedException e) { - report ("\nInterrupted while attemping operation"); - */ - } catch (LockException e) { - report ("\nLock failure: " + e.getMessage ()); - } - - showMenu (); - - } while (ch != 'Q' && ch != 'q'); - } - - public static void printUsage () - { - report ("Valid options:\n"); - report ("-h <host name> Specify token server host"); - report ("-p <port number> Port to connect to"); - report ("-t <time in sec> Relative timeout to use"); - report ("-l <lock type> 0 Mutex, 1 RWMutex"); - report ("-c <client ID> Specify ID (default is this machine name)"); - report ("-n <token name> Specify token name"); - report ("-q <requeue pos> Use this requeue position in renew"); - report ("-d Enable debugging"); - } - - public static void main (String args[]) throws IOException - { - GetOpt opt = new GetOpt (args, "h:p:t:l:c:n:q:d", true); - - String host = "localhost", tokenName = "token1"; - int port = ACE.DEFAULT_SERVER_PORT; - int type = LockTypes.MUTEX, c; - String clientID = InetAddress.getLocalHost().getHostName (); - - try { - while ((c = opt.next ()) != -1) { - switch (c) - { - case 'h': - host = opt.optarg (); - break; - case 'p': - port = Integer.parseInt (opt.optarg ()); - break; - case 't': - timeout = Integer.parseInt (opt.optarg ()); - break; - case 'l': - type = Integer.parseInt (opt.optarg ()); - break; - case 'c': - clientID = opt.optarg (); - break; - case 'n': - tokenName = opt.optarg (); - break; - case 'q': - requeuePosition = Integer.parseInt (opt.optarg ()); - break; - case 'd': - ACE.enableDebugging (); - ACE.DEBUG ("Debugging is enabled"); - break; - default: - printUsage (); - return; - } - } - } catch (ArrayIndexOutOfBoundsException e) { - printUsage (); - return; - } - - report ("Using : " + host + " on port " + port); - report ("Token : " + tokenName); - report ("Client ID: " + clientID); - - lock = new RemoteLock (type, 0, tokenName, clientID, host, port); - - processCommands (); - - lock.close (); - } -} |