Changeset 5696 for icGREP

Timestamp:

Oct 18, 2017, 3:12:32 PM (16 months ago)

Author:

cameron

Message:

Fix missing filename as line output prefix

Location:

icGREP/icgrep-devel/icgrep

Files:

• grep_engine.cpp (modified) (3 diffs)
• grep_engine.h (modified) (2 diffs)

icGREP/icgrep-devel/icgrep/grep_engine.cpp

@@ -37 +37 @@
 #include <fcntl.h>
 #include <errno.h>
+#include <llvm/ADT/STLExtras.h> // for make_unique
 
 using namespace parabix;
@@ -166 +167 @@
     auto f = reinterpret_cast<GrepFunctionType>(mGrepDriver->getMain());
     
-    uint64_t grepResult = f(fileDescriptor, reinterpret_cast<intptr_t>(resultAccums[fileIdx]));
+    uint64_t grepResult = f(fileDescriptor, reinterpret_cast<intptr_t>(resultAccums[fileIdx].get()));
     if (grepResult > 0) grepMatchFound = true;
     else if ((Mode == NormalMode) && !resultAccums[fileIdx]->mResultStr.str().empty()) grepMatchFound = true;
@@ -218 +219 @@
             }
         }
-        resultAccums.push_back(new NonNormalizingReportMatch(linePrefix));
+        resultAccums.push_back(make_unique<NonNormalizingReportMatch>(linePrefix));
     }
 }

icGREP/icgrep-devel/icgrep/grep_engine.h

@@ -27 +27 @@
 void *DoGrepThreadFunction(void *args);
     
+
+class NonNormalizingReportMatch : public MatchAccumulator {
+public:
+    NonNormalizingReportMatch(std::string linePrefix) : mLinePrefix(linePrefix), mLineCount(0), mPrevious_line_end(nullptr) {}
+    void accumulate_match(const size_t lineNum, char * line_start, char * line_end) override;
+    void finalize_match(char * buffer_end) override;
+    std::string mLinePrefix;
+    size_t mLineCount;
+    char * mPrevious_line_end;
+    std::stringstream mResultStr;
     
-    
-    class NonNormalizingReportMatch : public MatchAccumulator {
-    public:
-        NonNormalizingReportMatch(std::string linePrefix) : mLineCount(0), mPrevious_line_end(nullptr) {}
-        void accumulate_match(const size_t lineNum, char * line_start, char * line_end) override;
-        void finalize_match(char * buffer_end) override;
-        std::string mLinePrefix;
-        size_t mLineCount;
-        char * mPrevious_line_end;
-        std::stringstream mResultStr;
-        
-    };
-    
-    
-    
+};
+
+
 class GrepEngine {
 public:
@@ -66 +64 @@
     bool grepMatchFound;
 
-    std::vector<NonNormalizingReportMatch *> resultAccums;
+    std::vector<std::unique_ptr<NonNormalizingReportMatch>> resultAccums;
     std::vector<std::string> inputFiles;