input file parsser implemented

Author: dgiantsidi

MSI.h

@@ -0,0 +1,5 @@
+class MSI {
+
+
+
+}

Main.cpp

@@ -1,22 +1,43 @@
 #include <iostream>
-#include "cache.h"
+#include "processor.h"
+#include "parser.h"
 #include <stdlib.h>     /* atoi */
 int main (int argc, char* argv[]) {
     int lineSize = 1024;
     int linesNumber = 4;
-    if (argc < 3) {
+    int procNumber = 1;
+
+    if (argc < 4) {
         std::cout << "Not enough arguments\n";
         exit(1);
     }
-    
+
     lineSize = atoi(argv[1]);
     linesNumber = atoi(argv[2]);
+    procNumber = atoi(argv[3]);
+    
+    Processor **procTable = new Processor*[procNumber];
+    for (int i = 0; i < procNumber; i++) {
+        Cache cache(lineSize, linesNumber);
+        procTable[i] = new Processor(i, &cache);
+        std::cout << "Cache line size: " << cache.retLineSize() << std::endl;
+        std::cout << "Cache lines number: " << cache.retLinesNumber() << std::endl;
+        std::cout << "cache Line of 17: " << cache.findCacheLine(17) << std::endl;
+        std::cout << "cache tag of 17: " << cache.findTag(17) << std::endl;
+        cache.cacheWord(cache.findCacheLine(17), cache.findTag(17), 17);
+        std::cout << "address: " << cache.retWord(cache.findCacheLine(17), cache.findTag(17)) << std::endl;
+    }
 
-    Cache cache(lineSize, linesNumber);
-    std::cout << "Cache line size: " << cache.retLineSize() << std::endl;
-    std::cout << "Cache lines number: " << cache.retLinesNumber() << std::endl;
-    std::cout << "cache Line of 17: " << cache.findCacheLine(17) << std::endl;
-    std::cout << "cache tag of 17: " << cache.findTag(17) << std::endl;
-    cache.cacheWord(cache.findCacheLine(17), cache.findTag(17), 17);
-    std::cout << "address: " << cache.retWord(cache.findCacheLine(17), cache.findTag(17));
+    Parser p;
+    int ret;
+    ret = p.parse();
+    int pId;
+    int adr;
+    while (ret) {
+        // here cache coherence should be implemented
+        pId = p.getProcessor();
+        adr = p.getAddress();
+        std::cout << pId << " " << adr << std::endl;
+        ret = p.parse();
+    }
 }

Makefile

@@ -1,5 +1,5 @@
 target:
-	g++ Main.cpp cache.cpp processor.cpp MSI.cpp -o CC
+	g++ Main.cpp cache.cpp processor.cpp MSI.cpp -o CC -std=c++11
 	# g++ Main.cpp cache.cpp
 
 clean:

parser.h

@@ -0,0 +1,63 @@
+#include <fstream>  
+#include <sstream>  
+
+class Parser{
+    private:
+        std::ifstream infile;
+        int id;
+        std::string operation;
+        int address;
+
+    public:
+        Parser () {
+            infile.open("trace1.txt");
+        }
+
+        int parse() {
+            std::string line;    
+
+            if (std::getline(infile, line)) {
+                // std::cout << line << std::endl;
+                processLine(line);
+                return 1;
+            }
+            return 0;
+        }
+
+        void processLine(std::string line) {
+            std::string str;
+            std::string ss;
+            std::stringstream sstream;
+            std::stringstream linestream(line);
+            int i = 0;
+            while (std::getline(linestream, str, ' ')) {
+               // std::cout<<str;
+                switch(i) {
+                    case 0:
+                        sstream.str(str);
+                        while (std::getline(sstream, ss, 'P')) {}
+                        id = std::stoi(ss);
+                        break;
+                    case 1:
+                        operation = str;
+                        break;
+                    case 2:
+                        address = std::stoi(str);
+                        break;
+                }
+                i++;
+            }
+        }
+
+        int getProcessor() {
+            return id;
+        }
+
+        int getAddress() {
+            return address;
+        }
+
+        std::string getOper() {
+            return operation;
+        }
+};

processor.cpp

@@ -1,5 +1,4 @@
 #include "processor.h"
-// #include "cache.h"
 
 Processor::Processor(int processorId, Cache *privateCache) {
     id = processorId;