commit 9c15558ba14fcace4db761493225f1415d7abcf6
author Jayanth Othayoth <ojayanth@in.ibm.com> Wed Aug 09 07:47:45 2017 -0500
committer Patrick Williams <patrick@stwcx.xyz> Tue Aug 22 20:48:19 2017 +0000
tree 55987e09af659f80685bdaff150064cee73d8561
parent ea4b5e5fc76635bcb8257b62a4a4c72ddc7cc2ae

Enabled dreport based dump data collection

Resolves openbmc/openbmc#1506

Change-Id: I83ead760b8d3ce285ed9421e54f0027652b4e534
Signed-off-by: Jayanth Othayoth <ojayanth@in.ibm.com>

dump_manager.cpp

diff --git a/dump_manager.cpp b/dump_manager.cpp
index ef840f3..a189284 100644
--- a/dump_manager.cpp
+++ b/dump_manager.cpp
@@ -34,7 +34,6 @@
 uint32_t Manager::createDump()
 {
     std::vector<std::string> paths;
-
     return captureDump(Type::UserRequested, paths);
 }
 
@@ -42,18 +41,39 @@
     Type type,
     const std::vector<std::string>& fullPaths)
 {
+    //Type to dreport type  string map
+    static const std::map<Type, std::string> typeMap =
+                               {{Type::ApplicationCored, "core"},
+                                {Type::UserRequested, "user"}};
+
+    //Get Dump size.
+    auto size = getAllowedSize();
+
     pid_t pid = fork();
 
     if (pid == 0)
     {
         fs::path dumpPath(BMC_DUMP_PATH);
+        auto id =  std::to_string(lastEntryId + 1);
+        dumpPath /= id;
 
-        dumpPath /= std::to_string(lastEntryId + 1);
-        execl("/usr/bin/ffdc", "ffdc", "-d", dumpPath.c_str(), "-e", nullptr);
+        //get dreport type map entry
+        auto tempType = typeMap.find(type);
 
-        //ffdc script execution is failed.
+        execl("/usr/bin/dreport",
+              "dreport",
+              "-d", dumpPath.c_str(),
+              "-i", id.c_str(),
+              "-s", std::to_string(size).c_str(),
+              "-q",
+              "-v",
+              "-f", fullPaths.empty() ? "" : fullPaths.front(),
+              "-t", tempType->second.c_str(),
+              nullptr);
+
+        //dreport script execution is failed.
         auto error = errno;
-        log<level::ERR>("Error occurred during ffdc function execution",
+        log<level::ERR>("Error occurred during dreport function execution",
                         entry("ERRNO=%d", error));
         elog<InternalFailure>();
     }