changes

diff --git a/Robust/src/Analysis/Scheduling/ScheduleAnalysis.java b/Robust/src/Analysis/Scheduling/ScheduleAnalysis.java
index 5673edaf8a7a0f6d37fffbc9b7ffa72ebf9f34c6..25c4960fb093ba8f94df62dc736e94a946ec4d3b 100644 (file)
--- a/Robust/src/Analysis/Scheduling/ScheduleAnalysis.java
+++ b/Robust/src/Analysis/Scheduling/ScheduleAnalysis.java
@@ -1010,7 +1010,7 @@ public class ScheduleAnalysis {
          ScheduleNode tocombine = sn2sn.get(tmpcombine.node);
          ScheduleNode root = sn2sn.get(rootnodes.elementAt(tmpcombine.root).elementAt(tmpcombine.index));
          ScheduleEdge se = (ScheduleEdge)tocombine.inedges().next();
-         try{
+         try {
            if(root.equals(((ScheduleNode)se.getSource()))) {
              root.mergeSEdge(se);
              if(ScheduleEdge.NEWEDGE == se.getType()) {

diff --git a/Robust/src/Analysis/TaskStateAnalysis/FlagState.java b/Robust/src/Analysis/TaskStateAnalysis/FlagState.java
index 9c975eb8a9976f4108c845a2977ccb90a1982b8f..2034015dd51a3814cfc6b4e61af78a71bddcf9cd 100644 (file)
--- a/Robust/src/Analysis/TaskStateAnalysis/FlagState.java
+++ b/Robust/src/Analysis/TaskStateAnalysis/FlagState.java
@@ -239,8 +239,7 @@ public class FlagState extends GraphNode implements Cloneable {
    */
   public String toString(FlagDescriptor[] flags) {
     StringBuffer sb = new StringBuffer(flagstate.size());
-    for(int i=0; i < flags.length; i++)
-    {
+    for(int i=0; i < flags.length; i++){
       if (get(flags[i]))
        sb.append(1);
       else

diff --git a/Robust/src/Analysis/TaskStateAnalysis/TaskAnalysis.java b/Robust/src/Analysis/TaskStateAnalysis/TaskAnalysis.java
index 8508068ed9dfeee0b402fe58970c63a394bbb31c..3d6377327fbe36edda3f05119bff859a30a33318 100644 (file)
--- a/Robust/src/Analysis/TaskStateAnalysis/TaskAnalysis.java
+++ b/Robust/src/Analysis/TaskStateAnalysis/TaskAnalysis.java
@@ -374,7 +374,7 @@ public class TaskAnalysis {
   private FlagState canonicalizeFlagState(Hashtable sourcenodes, FlagState fs) {
     if (sourcenodes.containsKey(fs))
       return (FlagState)sourcenodes.get(fs);
-    else{
+    else {
       sourcenodes.put(fs,fs);
       return fs;
     }

diff --git a/Robust/src/Analysis/TaskStateAnalysis/TaskGraph.java b/Robust/src/Analysis/TaskStateAnalysis/TaskGraph.java
index ac522e9d916570b9494b2ce77f3f58c70d4311ef..432e3d49d65a5e7b4d7c26eb424a045c23ecdd08 100644 (file)
--- a/Robust/src/Analysis/TaskStateAnalysis/TaskGraph.java
+++ b/Robust/src/Analysis/TaskStateAnalysis/TaskGraph.java
@@ -62,7 +62,7 @@ public class TaskGraph {
   private TaskNode canonicalizeTaskNode(Hashtable nodes, TaskNode node) {
     if (nodes.containsKey(node))
       return (TaskNode)nodes.get(node);
-    else{
+    else {
       nodes.put(node,node);
       return (TaskNode)node;
     }

diff --git a/Robust/src/ClassLibrary/gnu/Random.java b/Robust/src/ClassLibrary/gnu/Random.java
index b09683e632f24cf35eadab21fe8a7b2a22626c95..c56fa3b1d9efba302d322b7fd609bfaa75141ad9 100644 (file)
--- a/Robust/src/ClassLibrary/gnu/Random.java
+++ b/Robust/src/ClassLibrary/gnu/Random.java
@@ -190,8 +190,7 @@ public class Random
     int random;
     // Do a little bit unrolling of the above algorithm.
     int max = bytes.length & ~0x3;
-    for (int i = 0; i < max; i += 4)
-    {
+    for (int i = 0; i < max; i += 4){
       random = next(32);
       bytes[i] = (byte) random;
       bytes[i + 1] = (byte) (random >> 8);
@@ -200,8 +199,7 @@ public class Random
     }
     if (max < bytes.length){
       random = next(32);
-      for (int j = max; j < bytes.length; j++)
-      {
+      for (int j = max; j < bytes.length; j++){
        bytes[j] = (byte) random;
        random >>= 8;
       }

diff --git a/Robust/src/Interface/HTTPHeader.java b/Robust/src/Interface/HTTPHeader.java
index d3e753feacdd36c13a899e727beaf681555f4b8e..76125e8be465b7b292c22250f0678fea8f9caaeb 100644 (file)
--- a/Robust/src/Interface/HTTPHeader.java
+++ b/Robust/src/Interface/HTTPHeader.java
@@ -71,10 +71,9 @@ public class HTTPHeader {
              "Server : SpinWeb Custom HTTP Server\n" + // server type
              "Content-Type: " + contentType + "\n" +  // type
              "Content-Length: "+ fileLength + "\n\n"; // length
-    try{
+    try {
       out.write(header.getBytes());
-    }
-    catch(IOException e){
+    } catch(IOException e)  {
       e.printStackTrace();     // do nothing!
     }
   }

diff --git a/Robust/src/Interface/HTTPServices.java b/Robust/src/Interface/HTTPServices.java
index 5a2b19a53e99959108e0096be4f999579f8cbfac..818777ff70b7e90285aa2de2a5775f4c587266cd 100644 (file)
--- a/Robust/src/Interface/HTTPServices.java
+++ b/Robust/src/Interface/HTTPServices.java
@@ -35,12 +35,11 @@ public class HTTPServices {
 
     buffer = new byte[1024];
 
-    try{
+    try {
       while((size = reader.read(buffer,0,buffer.length)) != -1)
        out.write(buffer,0,size);
       reader.close();
-    }
-    catch(IOException e){
+    } catch(IOException e)  {
       e.printStackTrace();
       resp.returnCode = 501;       // error during transmision
     }
@@ -55,17 +54,16 @@ public class HTTPServices {
                                                   OutputStream out,HTTPResponse resp) {
     FileInputStream reader = null;
 
-    try{
+    try {
       reader = get_reader(fileName, resp);
       resp.returnCode = 200;
-    }
-    catch(IOException e){
+    } catch(IOException e)  {
       resp.returnCode = 404;       // file not found
     }
 
     if(resp.returnCode == 200)
       HTTPHeader.send_header(out, resp.returnCode, fileName, resp.sentBytes);
-    else{
+    else {
       HTTPHeader.send_header(out, resp.returnCode, fileName, 0);
       return null;
     }

diff --git a/Robust/src/Interface/JhttpServer.java b/Robust/src/Interface/JhttpServer.java
index 59c675ce0c7a545007b77dcd64a31941ac801953..bdec1490f1a41a7ca708252acaf5b7ec12b95ca1 100644 (file)
--- a/Robust/src/Interface/JhttpServer.java
+++ b/Robust/src/Interface/JhttpServer.java
@@ -20,11 +20,10 @@ public class JhttpServer extends Thread {
   public JhttpServer(int port, WebInterface webinterface) {
     System.out.println("starting...");
     this.webinterface=webinterface;
-    try{
+    try {
       System.out.println("creating the port");
       server = new ServerSocket(port);
-    }
-    catch (IOException e){
+    } catch (IOException e)  {
       System.err.println(e);
       System.exit(1);
     }
@@ -37,10 +36,9 @@ public class JhttpServer extends Thread {
   public void run() {
     // infinite loop
     while (true){
-      try{
+      try {
        startWorker(server.accept());
-      }
-      catch (Exception e){
+      } catch (Exception e)  {
        System.err.println(e);
       }
     }

diff --git a/Robust/src/Interface/JhttpWorker.java b/Robust/src/Interface/JhttpWorker.java
index c5e3bfc1ae54305d7c18785ed61994075cc3bc3a..7323922587d3dbbb22ea50bb2025236a434afeb8 100644 (file)
--- a/Robust/src/Interface/JhttpWorker.java
+++ b/Robust/src/Interface/JhttpWorker.java
@@ -46,8 +46,7 @@ public class JhttpWorker extends Thread {
           client.getInputStream()));
 
       out = client.getOutputStream();
-    }
-    catch(IOException e){
+    } catch(IOException e)  {
       // I'm not too good at HTTP. Normally, we should put some
       // error code here. Anyway, I have assumed that an error
       // is equivalent to an unhandled request / method (501)
@@ -80,7 +79,7 @@ public class JhttpWorker extends Thread {
        resp.returnCode = 501;         //error
       }
 
-      try{
+      try {
        out.flush();
        if (logging)
          LogFile.write_log(client,methodType,fileName,httpVersion,
@@ -89,8 +88,7 @@ public class JhttpWorker extends Thread {
        out.close();
        in.close();
        client.close();
-      }
-      catch(IOException e){
+      } catch(IOException e)  {
        ;         // do nothing
       }
     }
@@ -110,7 +108,7 @@ public class JhttpWorker extends Thread {
   private int method(BufferedReader in) {
     int ret = -1;
 
-    try{
+    try {
       String line;
 
       // read just the first line
@@ -123,17 +121,17 @@ public class JhttpWorker extends Thread {
        if ( str.equals("GET") ){
          ret = 0;
          methodType = "GET";
-       } else if ( str.equals("HEAD") )   {
+       } else if ( str.equals("HEAD") ) {
          ret = 1;
          methodType = "HEAD";
-       } else if ( str.equals("POST") )   {
+       } else if ( str.equals("POST") ) {
          ret = 2;
          methodType = "POST";
-       } else{
+       } else {
          System.out.println("501 - unsupported request:" +str);
          return -1;
        }
-      } else{
+      } else {
        // System.out.println("Request from browser was empty!");
        return -1;
       }
@@ -171,8 +169,7 @@ public class JhttpWorker extends Thread {
          break;
        }
       }
-    }
-    catch(Exception e){
+    } catch(Exception e)  {
       System.err.println(e);
       return -1;
     }

diff --git a/Robust/src/Interface/LogFile.java b/Robust/src/Interface/LogFile.java
index b52ea857f3c898ce353e97670e7ff51be4a8b077..d282a092d574db2cd251f0e342ca441fa1e26781 100644 (file)
--- a/Robust/src/Interface/LogFile.java
+++ b/Robust/src/Interface/LogFile.java
@@ -55,7 +55,7 @@ public class LogFile
       ReturnCode + " " +           // 200-500
       BytesSent + "\n";           // bytes sent
 
-    try{
+    try {
       BufferedWriter out = new BufferedWriter(
         new OutputStreamWriter(
           new FileOutputStream(log_file_name, true)));
@@ -63,8 +63,7 @@ public class LogFile
       out.write(Entry,0,Entry.length());
       out.flush();
       out.close();
-    }
-    catch (IOException e){
+    } catch (IOException e)  {
       System.err.println("Gicu " + e);
     }
 

diff --git a/Robust/src/Interface/WebInterface.java b/Robust/src/Interface/WebInterface.java
index 472e9fa87ae6d83148d8a1f6447e10b1501e8457..1815417edc48330b62a50eabd9e1142b00cfa31e 100644 (file)
--- a/Robust/src/Interface/WebInterface.java
+++ b/Robust/src/Interface/WebInterface.java
@@ -87,7 +87,7 @@ public class WebInterface {
   }
 
   private String task(TaskDescriptor td, OutputStream out, HTTPResponse resp) {
-    try{
+    try {
       PrintWriter pw=new PrintWriter(out);
       pw.println("<br><br><h3>Task:&nbsp;&nbsp;&nbsp;"+td.toString()+"</h3><br>");
       printTask(td,pw);
@@ -103,12 +103,14 @@ public class WebInterface {
       }
 
       pw.flush();
-    } catch (Exception e) {e.printStackTrace(); System.exit(-1);}
+    } catch (Exception e) {
+      e.printStackTrace(); System.exit(-1);
+    }
     return null;
   }
 
   private String printTask(TaskDescriptor td, PrintWriter pw) {
-    try{
+    try {
 
       for(int i=0; i < td.numParameters(); i++){
        pw.println("FlagState Graph:&nbsp;&nbsp;<a href=\"/"+td.getParamType(i)+".html\">"+td.getParamType(i)+"</a><br>");
@@ -116,7 +118,9 @@ public class WebInterface {
                   +td.getParamType(i)+"</a><br>");
       }
       pw.flush();
-    } catch(Exception e) {e.printStackTrace(); System.exit(-1);}
+    } catch(Exception e) {
+      e.printStackTrace(); System.exit(-1);
+    }
     return null;
   }
 
@@ -125,7 +129,7 @@ public class WebInterface {
     for(Iterator it_rootnodes=rootnodes.iterator(); it_rootnodes.hasNext();){
       FlagState root=(FlagState)it_rootnodes.next();
       if (root.getLabel().equals((String)cd_nodeid.elementAt(1))){
-       try{
+       try {
          PrintWriter pw=new PrintWriter(out);
          pw.println("<br><br><h3>Allocating tasks for "+root.getTextLabel()+":</h3><br>");
          Vector tasks=root.getAllocatingTasks();
@@ -135,7 +139,9 @@ public class WebInterface {
            printTask(td,pw);
          }
 
-       } catch (Exception e) {e.printStackTrace(); System.exit(-1);}
+       } catch (Exception e) {
+         e.printStackTrace(); System.exit(-1);
+       }
        break;
       }
 
@@ -176,7 +182,9 @@ public class WebInterface {
       }
 
       pw.flush();
-    } catch (Exception e) {e.printStackTrace(); System.exit(-1);}
+    } catch (Exception e) {
+      e.printStackTrace(); System.exit(-1);
+    }
     return null;
   }
 
@@ -212,7 +220,9 @@ public class WebInterface {
        pw.println(str);
       }
       pw.flush();
-    } catch (Exception e) {e.printStackTrace(); System.exit(-1);}
+    } catch (Exception e) {
+      e.printStackTrace(); System.exit(-1);
+    }
     return null;
   }
 
@@ -273,7 +283,9 @@ public class WebInterface {
        pw.println(str);
 
       pw.flush();
-    } catch (Exception e) {e.printStackTrace(); System.exit(-1);}
+    } catch (Exception e) {
+      e.printStackTrace(); System.exit(-1);
+    }
     return null;
   }
 

diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java
index 07b3b71747886848fe947aee8bffba8e6df5fc29..28389107e9c75c8877fc2e188e486938188db255 100644 (file)
--- a/Robust/src/Main/Main.java
+++ b/Robust/src/Main/Main.java
@@ -86,10 +86,10 @@ public class Main {
       else if (option.equals("-flatirtasks")) {
        state.FLATIRGRAPH=true;
        state.FLATIRGRAPHTASKS=true;
-      } else if (option.equals("-flatirusermethods"))    {
+      } else if (option.equals("-flatirusermethods")) {
        state.FLATIRGRAPH=true;
        state.FLATIRGRAPHUSERMETHODS=true;
-      } else if (option.equals("-flatirlibmethods"))    {
+      } else if (option.equals("-flatirlibmethods")) {
        state.FLATIRGRAPH=true;
        state.FLATIRGRAPHLIBMETHODS=true;
       } else if (option.equals("-multicore"))

diff --git a/Robust/src/Runtime/DSTM/interface/dht.c b/Robust/src/Runtime/DSTM/interface/dht.c
index 768a8e3343847cad92413ba86804fe686b7dcfa8..fc18199124e52716839209fd699162ea2aba3f35 100644 (file)
--- a/Robust/src/Runtime/DSTM/interface/dht.c
+++ b/Robust/src/Runtime/DSTM/interface/dht.c
@@ -404,8 +404,7 @@ int dhtInsert(unsigned int key, unsigned int val) {
     write4(&outBuffer[1], key);
     write4(&outBuffer[5], val);
 
-    for (i = 0; i < INSERT_RETRIES; i++)
-    {
+    for (i = 0; i < INSERT_RETRIES; i++){
       if (sendto(pollsock.fd, outBuffer, 9, 0, (struct sockaddr *)&toAddr,
                  socklen) < 0){
        perror("dhtInsert():sendto()");
@@ -446,8 +445,7 @@ int dhtInsertMult(unsigned int numKeys, unsigned int *keys,     unsigned int *va
   int i;
 
   status = 0;
-  for (i = 0; i < numKeys; i++)
-  {
+  for (i = 0; i < numKeys; i++){
     if (dhtInsert(keys[i], vals[i]) != 0)
       status = -1;
   }
@@ -487,8 +485,7 @@ int dhtRemove(unsigned int key) {
     outBuffer[0] = REMOVE_CMD;
     write4(&outBuffer[1], key);
 
-    for (i = 0; i < REMOVE_RETRIES; i++)
-    {
+    for (i = 0; i < REMOVE_RETRIES; i++){
       if (sendto(pollsock.fd, outBuffer, 5, 0, (struct sockaddr *)&toAddr,
                  socklen) < 0){
        perror("dhtRemove():sendto()");
@@ -529,8 +526,7 @@ int dhtRemoveMult(unsigned int numKeys, unsigned int *keys) {
   int i;
 
   status = 0;
-  for (i = 0; i < numKeys; i++)
-  {
+  for (i = 0; i < numKeys; i++){
     if (dhtRemove(keys[i]) != 0)
       status = -1;
   }
@@ -569,8 +565,7 @@ int dhtSearch(unsigned int key, unsigned int *val) {
     outBuffer[0] = SEARCH_CMD;
     write4(&outBuffer[1], key);
 
-    for (i = 0; i < SEARCH_RETRIES; i++)
-    {
+    for (i = 0; i < SEARCH_RETRIES; i++){
       if (sendto(pollsock.fd, outBuffer, 5, 0, (struct sockaddr *)&toAddr,
                  socklen) < 0){
        perror("dhtSearch():sendto()");
@@ -610,8 +605,7 @@ int dhtSearch(unsigned int key, unsigned int *val) {
 int dhtSearchMult(unsigned int numKeys, unsigned int *keys, unsigned int *vals) {
   int i;
   int status = 0;
-  for (i = 0; i < numKeys; i++)
-  {
+  for (i = 0; i < numKeys; i++){
     if (dhtSearch(keys[i], &vals[i]) != 0)
       status = -1;
   }
@@ -765,8 +759,7 @@ int udpSend(unsigned char *msg, unsigned int size, unsigned int destIp) {
 int udpSendAll(unsigned char *msg, unsigned int size) {
   int i;
   int status = 0;
-  for (i = 0; i < numHosts; i++)
-  {
+  for (i = 0; i < numHosts; i++){
     if ((hostReplied[i] == 0) && (hostArray[i].ipAddr != myHostData.ipAddr)){
       if (udpSend(msg, size, hostArray[i].ipAddr) != 0)
        status = -1;
@@ -859,16 +852,14 @@ int removeHost(unsigned int ipAddr) {
   if (i == -1)
     return -1;
 
-  for (j = 0; j < numBlocks; j++)
-  {
+  for (j = 0; j < numBlocks; j++){
     if (blockOwnerArray[j] == i)
       blockOwnerArray[j] = 0;                   //TODO: is this what I want to have happen?
     else if (blockOwnerArray[j] > i)
       blockOwnerArray[j]--;
   }
 
-  for (; i < numHosts - 1; i++)
-  {
+  for (; i < numHosts - 1; i++){
     hostArray[i] = hostArray[i+1];
     hostReplied[i] = hostReplied[i+1];
   }
@@ -880,8 +871,7 @@ int removeHost(unsigned int ipAddr) {
 void removeUnresponsiveHosts() {
   int i;
 
-  for (i = 0; i < numHosts; i++)
-  {
+  for (i = 0; i < numHosts; i++){
     if (!hostReplied[i] && hostArray[i].ipAddr != myHostData.ipAddr)
       removeHost(hostArray[i].ipAddr);
   }
@@ -893,13 +883,12 @@ int addHost(struct hostData newHost) {
   int i;
   int j;
 
-  for (i = 0; i < numHosts; i++)
-  {
+  for (i = 0; i < numHosts; i++){
     if (hostArray[i].ipAddr == newHost.ipAddr){
       hostArray[i] = newHost;
       hostReplied[i] = 0;
       return 0;
-    } else if (hostArray[i].ipAddr > newHost.ipAddr)  {
+    } else if (hostArray[i].ipAddr > newHost.ipAddr) {
       if (numHosts == hostArraySize){
        newHostArray = calloc(2 * hostArraySize, sizeof(struct hostData));
        newHostReplied = calloc(2 * hostArraySize, sizeof(unsigned char));
@@ -918,16 +907,14 @@ int addHost(struct hostData newHost) {
        hostArraySize = 2 * hostArraySize;
       } else
       {
-       for (j = numHosts; j > i; j--)
-       {
+       for (j = numHosts; j > i; j--){
          hostArray[j] = hostArray[j-1];
          hostReplied[j] = hostReplied[j-1];
        }
        hostArray[i] = newHost;
        hostReplied[i] = 0;
       }
-      for(j = 0; j < numBlocks; j++)
-      {
+      for(j = 0; j < numBlocks; j++){
        if (blockOwnerArray[j] >= i)
          blockOwnerArray[j]++;
       }
@@ -976,8 +963,7 @@ void writeHostList() {
   struct in_addr tmpAddr;
 
   fprintf(logfile, "numHosts = %d\n", numHosts);
-  for (i = 0; i < numHosts; i++)
-  {
+  for (i = 0; i < numHosts; i++){
     tmpAddr.s_addr = htonl(hostArray[i].ipAddr);
     fprintf(logfile, "%d) %s, %d\n", i, inet_ntoa(tmpAddr),
             hostArray[i].maxKeyCapacity);
@@ -1053,19 +1039,19 @@ void *udpListen() {
     oldState = state;
     if (pollret < 0){
       perror("udpListen():poll()");
-    } else if (pollret > 0)  {
+    } else if (pollret > 0) {
       bytesRcvd = recvfrom(udpPollSock.fd, inBuffer, MAX_MSG_SIZE, 0,
                            (struct sockaddr *)&peerAddr, &socklen);
       if (bytesRcvd < 1){
        dhtLog("udpListen(): ERROR: bytesRcvd = %d\n", bytesRcvd);
-      } else if (inBuffer[0] >= NUM_MSG_TYPES)  {
+      } else if (inBuffer[0] >= NUM_MSG_TYPES) {
        dhtLog("udpListen(): ERROR: unknown msg type = %d\n", inBuffer[0]);
-      } else if (!msgSizeOk(inBuffer, bytesRcvd))  {
+      } else if (!msgSizeOk(inBuffer, bytesRcvd)) {
        dhtLog("udpListen(): ERROR: msg size not ok: type = %s\n, size = %d\n",
               msg_types[inBuffer[0]], bytesRcvd);
-      } else if (state == EXIT2_STATE)  {
+      } else if (state == EXIT2_STATE) {
        //do nothing
-      } else if (state == INIT1_STATE)  { //after initialization with seed, do not proceed until seed replies
+      } else if (state == INIT1_STATE) {  //after initialization with seed, do not proceed until seed replies
        dhtLog("udpListen(): received %s from %s, %d bytes\n",
               msg_types[inBuffer[0]], inet_ntoa(peerAddr.sin_addr), bytesRcvd);
        for (i = 0; i < bytesRcvd; i++)
@@ -1192,7 +1178,7 @@ void *udpListen() {
            outBuffer[0] = JOIN_RES;
            outBuffer[1] = 0;                                             //status, success
            udpSend(outBuffer, 2, peerIp);
-         } else if (state == LEAD_REBUILD1_STATE)  {
+         } else if (state == LEAD_REBUILD1_STATE) {
            //note: I don't need to addHost().
            checkReplied(peerIp);
            outBuffer[0] = JOIN_RES;
@@ -1216,7 +1202,7 @@ void *udpListen() {
        case JOIN_RES:
          if (state == REBUILD1_STATE){
            setState(REBUILD2_STATE);
-         } else if (state == INIT2_STATE)  {
+         } else if (state == INIT2_STATE) {
            setState(NORMAL_STATE);
          }
          break;

diff --git a/Robust/src/Runtime/DSTM/interface/mlookup.c b/Robust/src/Runtime/DSTM/interface/mlookup.c
index a554d62fe0e98697a2cd427fe243746fe273eb0b..21951a1036b393ecf1a8c13eba2bd38149300adc 100644 (file)
--- a/Robust/src/Runtime/DSTM/interface/mlookup.c
+++ b/Robust/src/Runtime/DSTM/interface/mlookup.c
@@ -195,8 +195,7 @@ unsigned int *mhashGetKeys(unsigned int *numKeys) {
   keys = calloc(*numKeys, sizeof(unsigned int));
 
   keyindex = 0;
-  for (i = 0; i < mlookup.size; i++)
-  {
+  for (i = 0; i < mlookup.size; i++){
     if (mlookup.table[i].key != 0){
       curr = &mlookup.table[i];
       while (curr != NULL){

diff --git a/Robust/src/Runtime/DSTM/interface/trans.c b/Robust/src/Runtime/DSTM/interface/trans.c
index 0fe01246f763126de19c894cfec57c3bb307fcdb..8b18916fa396d03fbf70c9c71bee9196f3bb8c9b 100644 (file)
--- a/Robust/src/Runtime/DSTM/interface/trans.c
+++ b/Robust/src/Runtime/DSTM/interface/trans.c
@@ -1800,7 +1800,7 @@ plistnode_t *pInsert(plistnode_t *pile, objheader_t *headeraddr, unsigned int mi
        tmp->numcreated++;
        GETSIZE(tmpsize, headeraddr);
        tmp->sum_bytes += sizeof(objheader_t) + tmpsize;
-      } else if (STATUS(headeraddr) & DIRTY)  {
+      } else if (STATUS(headeraddr) & DIRTY) {
        tmp->oidmod[tmp->nummod] = OID(headeraddr);
        tmp->nummod++;
        GETSIZE(tmpsize, headeraddr);

diff --git a/Robust/src/Runtime/SimpleHash.c b/Robust/src/Runtime/SimpleHash.c
index b43fb0abbc004226c9f22663fc98583469490a70..41e075086e605e9d1d5cdf97e880273fbe6b13b0 100755 (executable)
--- a/Robust/src/Runtime/SimpleHash.c
+++ b/Robust/src/Runtime/SimpleHash.c
@@ -80,7 +80,7 @@ int RuntimeHashremovekey(struct RuntimeHash *thisvar, int key) {
       }
       if (toremove->lnext!=NULL) {
        toremove->lnext->lprev=toremove->lprev;
-      } else{
+      } else {
        thisvar->listtail=toremove->lprev;
       }
       RUNFREE(toremove);

diff --git a/Robust/src/Runtime/multicoretask.c b/Robust/src/Runtime/multicoretask.c
index dd3bd789c7c81d2dd651d3e052a23151b34c3ba6..11680236c293a1152dc3ba3afed0490c293df842 100644 (file)
--- a/Robust/src/Runtime/multicoretask.c
+++ b/Robust/src/Runtime/multicoretask.c
@@ -3404,7 +3404,7 @@ parameterpresent:
             }*/
          /* Actually call task */
 #ifdef PRECISE_GC
-               ((int *)taskpointerarray)[0]=currtpd->numParameters;
+                     ((int *)taskpointerarray)[0]=currtpd->numParameters;
          taskpointerarray[1]=NULL;
 #endif
 execute:

diff --git a/Robust/src/Runtime/task.c b/Robust/src/Runtime/task.c
index e1430679fb80c48709119a6e5729c5155d8bdb81..e44a0737d395dafb02187559f7e75a4dc9a4baf6 100644 (file)
--- a/Robust/src/Runtime/task.c
+++ b/Robust/src/Runtime/task.c
@@ -903,7 +903,7 @@ int enqueuetasks(struct parameterwrapper *parameter, struct parameterwrapper *pr
 backtrackinit:
     if(toiHasNext(&parameter->iterators[j], taskpointerarray OPTARG(failed))){
       toiNext(&parameter->iterators[j], taskpointerarray OPTARG(failed));
-    } else if (j>0)       {
+    } else if (j>0) {
       /* Need to backtrack */
       toiReset(&parameter->iterators[j]);
       j--;
@@ -953,7 +953,7 @@ backtrackinit:
 backtrackinc:
       if(toiHasNext(&parameter->iterators[j], taskpointerarray OPTARG(failed))){
        toiNext(&parameter->iterators[j], taskpointerarray OPTARG(failed));
-      } else if (j>0)       {
+      } else if (j>0) {
        /* Need to backtrack */
        toiReset(&parameter->iterators[j]);
        j--;
@@ -1200,7 +1200,7 @@ parameterpresent:
          }
          /* Actually call task */
 #ifdef PRECISE_GC
-               ((int *)taskpointerarray)[0]=currtpd->numParameters;
+                     ((int *)taskpointerarray)[0]=currtpd->numParameters;
          taskpointerarray[1]=NULL;
 #endif
 #ifdef OPTIONAL

diff --git a/Robust/src/java.cfg b/Robust/src/java.cfg
index e44548e8fbe4449d4f053ffa014970ea3484bea0..545f6e798e59d110e09551b1455e2792b37ca1b3 100644 (file)
--- a/Robust/src/java.cfg
+++ b/Robust/src/java.cfg
@@ -23,6 +23,7 @@ sp_inside_fparen = remove
 sp_func_call_paren = Remove
 sp_fparen_brace = Add
 sp_sparen_brace = Add
+sp_paren_brace = Add
 sp_else_brace = Add
 sp_brace_else = Add
 sp_catch_brace = Add