start of new file

[IRC.git] / Robust / src / Benchmarks / Conglomerator / Tag / Opt / WebServerExampleOpt.java

diff --git a/Robust/src/Benchmarks/Conglomerator/Tag/Opt/WebServerExampleOpt.java b/Robust/src/Benchmarks/Conglomerator/Tag/Opt/WebServerExampleOpt.java
index 3d66d20f20d41e02e86f7944e8b518c6890ac45e..df43e906fa4f93ed08d68b8dcaa2ee640d998605 100644 (file)
--- a/Robust/src/Benchmarks/Conglomerator/Tag/Opt/WebServerExampleOpt.java
+++ b/Robust/src/Benchmarks/Conglomerator/Tag/Opt/WebServerExampleOpt.java
@@ -1,7 +1,6 @@
 /* Startup object is generated with the initialstate flag set by the
  *  system to start the computation up */
 
-// Create New ServerSocket
 task Startup(StartupObject s {initialstate}) {
        ServerSocket ss = new ServerSocket(9000);
        Logger log = new Logger() {Initialize};
@@ -10,92 +9,43 @@ task Startup(StartupObject s {initialstate}) {
 }
 
 task LookupS(Stock l{initialstate}) {
-    String query="GET /"+l.url+" HTTP/1.1\r\nConnection: close\r\nHost:"+l.hostname+"\r\n\r\n";
-    l.connect(l.hostname, 80);
-    l.write(query.getBytes());
+    l.doLookup();
     taskexit(l{!initialstate, query});
 }
 
 task ReceiveQueryS(Stock l{query&&IOPending}) {
-    byte[] buffer=new byte[1024];
-    int numchars=l.read(buffer);
-    if (numchars<=0) {
-       l.fix();
-       l.close();
-       taskexit(l{!query,done}{});
-    }
-    String str=new String(buffer, 0, numchars);
-    if (l.data==null) {
-       l.data=str;
-    } else
-       l.data=l.data+str;
-    taskexit;
+    if (l.Receive()) taskexit(l{!query,done}{}); else taskexit;
 }
 
-task LookupG(Google l{initialstate}) {
-    String query="GET /"+l.url+" HTTP/1.1\r\nConnection: close\r\nHost:"+l.hostname+"\r\n\r\n";
-    l.connect(l.hostname, 80);
-    l.write(query.getBytes());
+task LookupW(Weather l{initialstate}) {
+    l.doLookup();
     taskexit(l{!initialstate, query});
 }
 
-task ReceiveQueryG(Google l{query&&IOPending}) {
-    byte[] buffer=new byte[1024];
-    int numchars=l.read(buffer);
-    if (numchars<=0) {
-       l.fix();
-       l.close();
-       taskexit(l{!query,done}{});
-    }
-    String str=new String(buffer, 0, numchars);
-    if (l.data==null) {
-       l.data=str;
-    } else
-       l.data=l.data+str;
-    taskexit;
+task ReceiveQueryW(Weather l{query&&IOPending}) {
+    if (l.Receive()) taskexit(l{!query,done}{}); else taskexit;
 }
 
-task LookupW(Weather l{initialstate}) {
-    String query="GET /"+l.url+" HTTP/1.1\r\nConnection: close\r\nHost:"+l.hostname+"\r\n\r\n";
-    l.connect(l.hostname, 80);
-    l.write(query.getBytes());
+task LookupG(Google l{initialstate}) {
+    l.doLookup();
     taskexit(l{!initialstate, query});
 }
 
-task ReceiveQueryW(Weather l{query&&IOPending}) {
-    byte[] buffer=new byte[1024];
-    int numchars=l.read(buffer);
-    if (numchars<=0) {
-       l.fix();
-       l.close();
-       taskexit(l{!query,done}{});
-    }
-    String str=new String(buffer, 0, numchars);
-    if (l.data==null) {
-       l.data=str;
-    } else
-       l.data=l.data+str;
-    taskexit;
+task ReceiveQueryG(Google l{query&&IOPending}) {
+    if (l.Receive()) taskexit(l{!query,done}{}); else taskexit;
 }
 
-
-
-//Listen for a request and accept request 
 task AcceptConnection(ServerSocket ss{SocketPending}) {
-    // System.printString("W> Waiting for connection...\n");
     tag t=new tag(link);
     WebServerSocket web = new WebServerSocket() {!WritePending, !TransPending, WebInitialize}{t};
     MySocket ms=new MySocket(){}{t};
     ss.accept(ms);
-//     System.printString("W> Connected... \n");
 }
 
-// Process the incoming http request 
 task ProcessRequest(WebServerSocket web{WebInitialize}{link l}, MySocket s{IOPending}{link l}) {
        if (web.clientrequest(s)) {
            if(web.checktrans()==false)
-               // Not special transaction , do normal filesending      
-               taskexit(web {WritePending, LogPending,!WebInitialize}); //Sets the WritePending and LogPending flag true 
+               taskexit(web {WritePending, LogPending,!WebInitialize});
            else {
                Weather w=new Weather(){initialstate}{l};
                Google g=new Google(){initialstate}{l};
@@ -105,25 +55,18 @@ task ProcessRequest(WebServerSocket web{WebInitialize}{link l}, MySocket s{IOPen
        }
 }
 
-//Do the WriteIO on server socket and send the requested file to Client
 task SendFile(WebServerSocket web{WritePending}{link l}, MySocket s{}{link l}) {
-//     System.printString("W> Inside SendFile ... \n");
        web.sendfile(s);
        s.close();
        taskexit(web {!WritePending});
 }
 
-// Log the Client request
 task LogRequest(WebServerSocket web{LogPending}, Logger log{Initialize}) {
-//Task fired when both
-// LogPending and Initialize flags are true 
-//     System.printString("L > Inside logrequest\n");
        log.logrequest(web.filename);
        taskexit(web {!LogPending});
 }
 
-//Transaction on Inventory
-task Transaction(WebServerSocket web{TransPending}{link l}, optional Weather weather{done}{link l}, optional Google g{done}{link l}, MySocket s{}{link l}, optional Stock st{done}{link l}){ //Task for WebServerTransactions
+task Transaction(WebServerSocket web{TransPending}{link l}, optional Weather weather{done}{link l}, optional Google g{done}{link l}, MySocket s{}{link l}, optional Stock st{done}{link l}){
        web.httpresponse(s);
        s.write(("<html>").getBytes());
        if (isavailable(weather))