mspsim-commit Mailing List for mspsim (Page 4)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

The branch "master" has been updated
       via  a6c0d2c9fe8c5bd4a15b1d0016ab2a104908d12d (commit)
       via  23f4539245a1657932386e71d0e7957ed309337b (commit)
       via  a8fd33da1536e7ccd56d04964d8a12099bc717b4 (commit)
      from  d11c6d14760d60e9087f69956c9e9ecb839b0c36 (commit)

Changed paths:
M	se/sics/mspsim/chip/CC2420.java
M	se/sics/mspsim/ui/SerialMon.java
M	se/sics/mspsim/util/ComponentRegistry.java


- Log -----------------------------------------------------------------
commit a6c0d2c9fe8c5bd4a15b1d0016ab2a104908d12d
Author: Niclas Finne <nf...@si...>
Date:   Wed Feb 29 12:25:38 2012 +0100

    Reimplemented the send queue to avoid problem when DMA is used

diff --git a/se/sics/mspsim/ui/SerialMon.java b/se/sics/mspsim/ui/SerialMon.java
index eba9e24..f61d472 100644
--- a/se/sics/mspsim/ui/SerialMon.java
+++ b/se/sics/mspsim/ui/SerialMon.java
@@ -27,24 +27,22 @@
  *
  * This file is part of MSPSim.
  *
- * $Id$
- *
  * -----------------------------------------------------------------
  *
  * SerialMon
  *
  * Author  : Joakim Eriksson
  * Created : Sun Oct 21 22:00:00 2007
- * Updated : $Date$
- *           $Revision$
  */
 
 package se.sics.mspsim.ui;
 import java.awt.BorderLayout;
+import java.awt.EventQueue;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
+import java.util.ArrayDeque;
 
 import javax.swing.JFrame;
 import javax.swing.JMenuItem;
@@ -52,7 +50,6 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
 
 import se.sics.mspsim.core.IOUnit;
 import se.sics.mspsim.core.StateChangeListener;
@@ -79,10 +76,8 @@
   private int historyCount = 0;
   private String text = "*** Serial mon for MSPsim ***\n";
 
-  private final static int QUEUE_SIZE = 5;
-  private String[] queue = new String[QUEUE_SIZE];
-  private int wPos = 0, rPos = 0, rIndex = 0;
-  private boolean isSending = false;
+  private ArrayDeque<String> sendQueue = new ArrayDeque<String>(8);
+  private int sendIndex;
 
   private int lines = 1;
   private boolean isUpdatePending = false;
@@ -227,7 +222,7 @@ public void dataReceived(USARTSource source, int data) {
     // Collapse several immediate updates
     if (!isUpdatePending) {
       isUpdatePending = true;
-      SwingUtilities.invokeLater(new Runnable() {
+      EventQueue.invokeLater(new Runnable() {
 	  public void run() {
 	    isUpdatePending = false;
 
@@ -246,44 +241,47 @@ public void run() {
   // -------------------------------------------------------------------
 
   protected boolean sendCommand(String command) {
-    int next = (wPos + 1) % QUEUE_SIZE;
-    if (next == rPos) {
-      /* Queue full */
+    synchronized (sendQueue) {
+      /* Do not queue too many commands */
+      if (sendQueue.size() == 8) {
       commandField.setEnabled(false);
       return false;
     }
-    queue[wPos] = command + '\n';
-    wPos = next;
-    if (!isSending) {
-      isSending = true;
-      sendNext();
+      sendQueue.add(command);
     }
+    sendNext();
     return true;
   }
 
-  public void stateChanged(Object source, int old, int state) {
-    if (state == USARTListener.RXFLAG_CLEARED && isSending) {
+  public void stateChanged(Object source, int oldState, int newState) {
+    if (newState == USARTListener.RXFLAG_CLEARED) {
       sendNext();
     }
   }
 
   private void sendNext() {
     boolean updateCommand = false;
-    while (isSending && usart.isReceiveFlagCleared()) {
-      char c = queue[rPos].charAt(rIndex++);
-      usart.byteReceived((byte)c);
-      dataReceived(usart, c);
-      if (rIndex >= queue[rPos].length()) {
-        rIndex = 0;
-        rPos = (rPos + 1) % QUEUE_SIZE;
-        if (rPos == wPos) {
-          isSending = false;
+    char c;
+    while (usart.isReceiveFlagCleared()) {
+      synchronized (sendQueue) {
+        String next = sendQueue.peekFirst();
+        if (next == null) {
+          break;
         }
+        if (sendIndex == next.length()) {
+          sendQueue.removeFirst();
+          sendIndex = 0;
+          c = '\n';
         updateCommand = true;
+        } else {
+          c = next.charAt(sendIndex++);
+        }
       }
+      usart.byteReceived((byte)c);
+      dataReceived(usart, c);
     }
     if (updateCommand && !commandField.isEnabled()) {
-      SwingUtilities.invokeLater(new Runnable() {
+      EventQueue.invokeLater(new Runnable() {
         public void run() {
           commandField.setEnabled(true);
         }
commit 23f4539245a1657932386e71d0e7957ed309337b
Author: Niclas Finne <nf...@si...>
Date:   Wed Feb 29 11:51:13 2012 +0100

    Changed log output to warning when trying to send too large packet, fixed typo

diff --git a/se/sics/mspsim/chip/CC2420.java b/se/sics/mspsim/chip/CC2420.java
index 3d0e9fb..55d81d7 100644
--- a/se/sics/mspsim/chip/CC2420.java
+++ b/se/sics/mspsim/chip/CC2420.java
@@ -502,7 +502,7 @@ private boolean setState(RadioState state) {
       break;

       

     case TX_ACK_CALIBRATE:

-        /* TX active during ACK + NOTE: we ignore the SFD when receiveing full packets so

+        /* TX active during ACK + NOTE: we ignore the SFD when receiving full packets so

          * we need to add another extra 2 symbols here to get a correct timing */

         status |= STATUS_TX_ACTIVE;

         setSymbolEvent(12 + 2 + 2);

@@ -661,7 +661,7 @@ public void receivedByte(byte data) {
 

               if (rxread++ == rxlen) {

                   if (frameRejected) {

-                      log("Frame rejected - setting SFD to false and RXWAIT\n");

+                      if (DEBUG) log("Frame rejected - setting SFD to false and RXWAIT\n");

                       setSFD(false);

                       setState(RadioState.RX_WAIT);

                       return;

@@ -1063,7 +1063,7 @@ private void txNext() {
           memory[RAM_TXFIFO + len] = txCrc.getCRCLow();

       }

       if (txfifoPos > 0x7f) {

-        log("Warning: packet size too large - repeating packet bytes txfifoPos: " + txfifoPos);

+        logw("**** Warning - packet size too large - repeating packet bytes txfifoPos: " + txfifoPos);

       }

       if (listener != null) {

         if (DEBUG) log("transmitting byte: " + Utils.hex8(memory[RAM_TXFIFO + (txfifoPos & 0x7f)] & 0xFF));

commit a8fd33da1536e7ccd56d04964d8a12099bc717b4
Author: Niclas Finne <nf...@si...>
Date:   Wed Feb 29 11:44:55 2012 +0100

    Added generics, method to find components by type and name, and copyright header. Minor code cleanup.

diff --git a/se/sics/mspsim/util/ComponentRegistry.java b/se/sics/mspsim/util/ComponentRegistry.java
index bf33a88..781aad8 100644
--- a/se/sics/mspsim/util/ComponentRegistry.java
+++ b/se/sics/mspsim/util/ComponentRegistry.java
@@ -1,3 +1,37 @@
+/**
+ * Copyright (c) 2008-2012, Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of MSPSim.
+ *
+ * -----------------------------------------------------------------
+ *
+ * Author  : Joakim Eriksson
+ * Created : Mon Feb 11 2008
+ */
 package se.sics.mspsim.util;
 import java.io.PrintStream;
 import java.util.ArrayList;
@@ -7,7 +41,14 @@
   private ArrayList<ComponentEntry> components = new ArrayList<ComponentEntry>();
   private boolean running = false;
   
+    private synchronized ComponentEntry[] getAllEntries() {
+        return components.toArray(new ComponentEntry[components.size()]);
+    }
+
   public void registerComponent(String name, Object component) {
+        if (name == null || component == null) {
+            throw new NullPointerException();
+        }
     synchronized (this) {
       components.add(new ComponentEntry(name, component)); 
     }
@@ -22,9 +63,9 @@ public void registerComponent(String name, Object component) {
   }
   
   public synchronized Object getComponent(String name) {
-    for (int i = 0, n = components.size(); i < n; i++) {
-      if (name.equals(components.get(i).name)) {
-        return components.get(i).component;
+        for (ComponentEntry entry : components) {
+            if (name.equals(entry.name)) {
+                return entry.component;
       }
     }
     return null;
@@ -32,8 +73,7 @@ public synchronized Object getComponent(String name) {
   
   public synchronized Object[] getAllComponents(String name) {
     ArrayList<Object> list = new ArrayList<Object>();
-    for (int i = 0, n = components.size(); i < n; i++) {
-      ComponentEntry entry = components.get(i);
+        for (ComponentEntry entry : components) {
       if (name.equals(entry.name)) {
 	list.add(entry.component);
       }
@@ -41,41 +81,69 @@ public synchronized Object getComponent(String name) {
     return list.toArray();
   }
 
+    public synchronized <T> T getComponent(Class<T> type, String name) {
+        for (ComponentEntry entry : components) {
+            if (type.isInstance(entry.component) && name.equals(entry.name)) {
+                return type.cast(entry.component);
+            }
+        }
+        return null;
+    }
+
   @SuppressWarnings("unchecked")
-  public synchronized Object getComponent(Class name) {
-    for (int i = 0, n = components.size(); i < n; i++) {
-      if (name.isAssignableFrom(components.get(i).component.getClass())) {
-        return components.get(i).component;
+    public synchronized <T> T[] getAllComponents(Class<T> type, String name) {
+        ArrayList<T> list = new ArrayList<T>();
+        for (ComponentEntry entry : components) {
+            if (type.isInstance(entry.component) && name.equals(entry.name)) {
+                list.add(type.cast(entry.component));
+            }
+        }
+        return list.toArray((T[]) java.lang.reflect.Array.newInstance(type, list.size()));
+    }
+
+    public synchronized <T> T getComponent(Class<T> type) {
+        for (ComponentEntry entry : components) {
+            if (type.isInstance(entry.component)) {
+                return type.cast(entry.component);
       }
     }
     return null;
   }
   
   @SuppressWarnings("unchecked")
-  public synchronized Object[] getAllComponents(Class name) {
-    ArrayList<Object> list = new ArrayList<Object>();
-    for (int i = 0, n = components.size(); i < n; i++) {
-      Object component = components.get(i).component;
-      if (name.isAssignableFrom(component.getClass())) {
-	list.add(component);
+    public synchronized <T> T[] getAllComponents(Class<T> type) {
+        ArrayList<T> list = new ArrayList<T>();
+        for (ComponentEntry entry : components) {
+            if (type.isInstance(entry.component)) {
+                list.add(type.cast(entry.component));
       }
     }
-    return list.toArray((Object[]) java.lang.reflect.Array.newInstance(name, list.size()));
+        return list.toArray((T[]) java.lang.reflect.Array.newInstance(type, list.size()));
   }
 
   public void start() {
     ComponentEntry[] plugs;
     synchronized (this) {
       running = true;
-      plugs = components.toArray(new ComponentEntry[components.size()]);
+            plugs = getAllEntries();
     }
-    for (int i = 0; i < plugs.length; i++) {
-      if (plugs[i].component instanceof ActiveComponent) {
-        ((ActiveComponent) plugs[i].component).start();
+
+        for (ComponentEntry entry : plugs) {
+            if (entry.component instanceof ActiveComponent) {
+                ((ActiveComponent) entry.component).start();
       }
     }
   }
   
+    public void printRegistry(PrintStream out) {
+        ComponentEntry[] plugs = getAllEntries();
+        out.printf("%-22s %s\n", "Component Name", "Component Class");
+        out.println("----------------------------------------------");
+        for (ComponentEntry entry : plugs) {
+            out.printf("%-22s %s\n", entry.name, entry.component.getClass().getName());
+        }
+    }
+
   private static class ComponentEntry {
     public final String name;
     public final Object component;
@@ -86,12 +154,4 @@ private ComponentEntry(String name, Object component) {
     }
   }
   
-  public void printRegistry(PrintStream out) {
-      ComponentEntry[] plugs = components.toArray(new ComponentEntry[components.size()]);
-      out.printf("%-22s %s\n", "Component Name", "Component Class");
-      out.println("----------------------------------------------");
-      for (int i = 0; i < plugs.length; i++) {
-          out.printf("%-22s %s\n", plugs[i].name, plugs[i].component.getClass().getName());
-      }
-  }
 }
-----------------------------------------------------------------------

Summary of changes:
 se/sics/mspsim/chip/CC2420.java            |    6 +-
 se/sics/mspsim/ui/SerialMon.java           |   66 ++++-----
 se/sics/mspsim/util/ComponentRegistry.java |  222 ++++++++++++++++++----------
 3 files changed, 176 insertions(+), 118 deletions(-)


hooks/post-receive
-- 
mspsim




2007	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (21)	Nov (12)	Dec (41)
2008	Jan (25)	Feb (54)	Mar (63)	Apr (52)	May (17)	Jun (3)	Jul (3)	Aug (5)	Sep (49)	Oct (50)	Nov (34)	Dec (14)
2009	Jan (9)	Feb (15)	Mar (38)	Apr (12)	May (35)	Jun (20)	Jul (2)	Aug (7)	Sep (36)	Oct (24)	Nov (2)	Dec (2)
2010	Jan (14)	Feb (1)	Mar (36)	Apr (2)	May (4)	Jun (6)	Jul (35)	Aug (11)	Sep (8)	Oct (3)	Nov	Dec (1)
2011	Jan (11)	Feb (12)	Mar (3)	Apr (7)	May (12)	Jun (8)	Jul	Aug (3)	Sep (4)	Oct	Nov (2)	Dec (4)
2012	Jan (2)	Feb (1)	Mar (14)	Apr (5)	May (28)	Jun	Jul	Aug	Sep	Oct (21)	Nov (4)	Dec (1)
2013	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2014	Jan	Feb	Mar	Apr	May (2)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

mspsim-commit Mailing List for mspsim (Page 4)

Java-based instruction level emulator of MSP430. Code on github.

mspsim-commit — Commit messages