[Tarantool-patches] [PATCH luajit v2 6/6] profilers: print user-friendly errors

[Maxim Kokryashkin]

Hi, Sergey!
Thanks for the review!
Fixed, branch is force-pushed, tarantool PR is updated.
Iterative diff:
===
diff --git a/Makefile.original b/Makefile.original
index 73995130..4a1e1d9d 100644
--- a/Makefile.original
+++ b/Makefile.original
@@ -97,7 +97,7 @@ FILES_JITLIB= bc.lua bcsave.lua dump.lua p.lua v.lua zone.lua \
 	      dis_x86.lua dis_x64.lua dis_arm.lua dis_arm64.lua \
 	      dis_arm64be.lua dis_ppc.lua dis_mips.lua dis_mipsel.lua \
 	      dis_mips64.lua dis_mips64el.lua vmdef.lua
-FILES_UTILSLIB= avl.lua bufread.lua safe_event_reader.lua symtab.lua
+FILES_UTILSLIB= avl.lua bufread.lua evread.lua symtab.lua
 FILES_MEMPROFLIB= humanize.lua parse.lua process.lua
 FILES_SYSPROFLIB= parse.lua
 FILES_TOOLSLIB= memprof.lua sysprof.lua
diff --git a/test/tarantool-tests/gh-5688-tool-cli-flag.test.lua b/test/tarantool-tests/gh-5688-tool-cli-flag.test.lua
index ec958031..8ead83b5 100644
--- a/test/tarantool-tests/gh-5688-tool-cli-flag.test.lua
+++ b/test/tarantool-tests/gh-5688-tool-cli-flag.test.lua
@@ -42,7 +42,7 @@ local SMOKE_CMD_SET = {
 local MEMPROF_CMD_SET = {
   {
     cmd = MEMPROF_PARSER .. BAD_PATH,
-    like = 'Failed to open',
+    like = 'Failed to open.*fopen, errno: 2',
   },
   {
     cmd = MEMPROF_PARSER .. TMP_BINFILE_MEMPROF,
@@ -61,7 +61,7 @@ local MEMPROF_CMD_SET = {
 local SYSPROF_CMD_SET = {
   {
     cmd = SYSPROF_PARSER .. BAD_PATH,
-    like = 'Failed to open',
+    like = 'Failed to open.*fopen, errno: 2',
   },
   {
     cmd = SYSPROF_PARSER .. TMP_BINFILE_SYSPROF,
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 7f728787..695c079a 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -18,7 +18,7 @@ else()
     memprof.lua
     utils/avl.lua
     utils/bufread.lua
-    utils/safe_event_reader.lua
+    utils/evread.lua
     utils/symtab.lua
   )
   list(APPEND LUAJIT_TOOLS_DEPS tools-parse-memprof)
@@ -37,7 +37,7 @@ else()
   install(FILES
       ${CMAKE_CURRENT_SOURCE_DIR}/utils/avl.lua
       ${CMAKE_CURRENT_SOURCE_DIR}/utils/bufread.lua
-      ${CMAKE_CURRENT_SOURCE_DIR}/utils/safe_event_reader.lua
+      ${CMAKE_CURRENT_SOURCE_DIR}/utils/evread.lua
       ${CMAKE_CURRENT_SOURCE_DIR}/utils/symtab.lua
     DESTINATION ${LUAJIT_DATAROOTDIR}/utils
     PERMISSIONS
@@ -67,7 +67,7 @@ else()
     sysprof.lua
     utils/avl.lua
     utils/bufread.lua
-    utils/safe_event_reader.lua
+    utils/evread.lua
     utils/symtab.lua
   )
   list(APPEND LUAJIT_TOOLS_DEPS tools-parse-sysprof)
@@ -84,7 +84,7 @@ else()
   install(FILES
       ${CMAKE_CURRENT_SOURCE_DIR}/utils/avl.lua
       ${CMAKE_CURRENT_SOURCE_DIR}/utils/bufread.lua
-      ${CMAKE_CURRENT_SOURCE_DIR}/utils/safe_event_reader.lua
+      ${CMAKE_CURRENT_SOURCE_DIR}/utils/evread.lua
       ${CMAKE_CURRENT_SOURCE_DIR}/utils/symtab.lua
     DESTINATION ${LUAJIT_DATAROOTDIR}/utils
     PERMISSIONS
diff --git a/tools/memprof.lua b/tools/memprof.lua
index d491b3dc..7d7e8e05 100644
--- a/tools/memprof.lua
+++ b/tools/memprof.lua
@@ -12,7 +12,7 @@

 local memprof = require "memprof.parse"
 local process = require "memprof.process"
-local safe_event_reader = require "utils.safe_event_reader"
+local evread = require "utils.evread"
 local view = require "memprof.humanize"

 local stdout, stderr = io.stdout, io.stderr
@@ -110,7 +110,7 @@ local function dump(inputfile)
   -- XXX: This function exits with a non-zero exit code and
   -- prints an error message if it encounters any failure during
   -- the process of parsing.
-  local events, symbols = safe_event_reader(memprof.parse, inputfile)
+  local events, symbols = evread(memprof.parse, inputfile)

   if not config.leak_only then
     view.profile_info(events, config)
diff --git a/tools/sysprof.lua b/tools/sysprof.lua
index 9c0c23c9..420ca41c 100644
--- a/tools/sysprof.lua
+++ b/tools/sysprof.lua
@@ -1,4 +1,4 @@
-local safe_event_reader = require "utils.safe_event_reader"
+local evread = require "utils.evread"
 local sysprof = require "sysprof.parse"

 local stdout, stderr = io.stdout, io.stderr
@@ -80,7 +80,7 @@ local function dump(inputfile)
   -- XXX: This function exits with a non-zero exit code and
   -- prints an error message if it encounters any failure during
   -- the process of parsing.
-  local events = safe_event_reader(sysprof.parse, inputfile)
+  local events = evread(sysprof.parse, inputfile)

   for stack, count in pairs(events) do
     print(stack, count)
diff --git a/tools/utils/safe_event_reader.lua b/tools/utils/evread.lua
similarity index 82%
rename from tools/utils/safe_event_reader.lua
rename to tools/utils/evread.lua
index 39246a9d..394a4a03 100644
--- a/tools/utils/safe_event_reader.lua
+++ b/tools/utils/evread.lua
@@ -4,12 +4,12 @@ local symtab = require('utils.symtab')
 local function make_error_handler(fmt, inputfile)
   return function(err)
     io.stderr:write(string.format(fmt, inputfile))
-    io.stderr:write(string.format('\nOriginal error: %s', err))
+    io.stderr:write(string.format('\n\t%s\n', err))
     os.exit(1, true)
   end
 end

-local function safe_event_reader(parser, inputfile)
+return function(parser, inputfile)
   local _, reader = xpcall(
     bufread.new,
     make_error_handler('Failed to open %s.', inputfile),
@@ -30,5 +30,3 @@ local function safe_event_reader(parser, inputfile)
   )
   return events, symbols
 end
-
-return safe_event_reader
===

Regards,
Maxim Kokryashkin