Tarantool development patches archive
 help / color / mirror / Atom feed
From: Sergey Kaplun via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: Sergey Ostanevich <sergos@tarantool.org>,
	Igor Munkin <imun@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH luajit] Flush and close output file after profiling run.
Date: Thu, 12 May 2022 13:09:37 +0300	[thread overview]
Message-ID: <20220512100937.24037-1-skaplun@tarantool.org> (raw)

From: Mike Pall <mike>

Thanks to Sergey Ostanevich.

Using `jit.p` with a file argument does not flush result to the
file on profile stop.

This patch adds missing close for the file descriptor on profile stop.

Sergey Kaplun:
* added the description and the test for the problem
---

LuaJIT PR: https://github.com/LuaJIT/LuaJIT/pull/726
Branch: https://github.com/tarantool/luajit/tree/skaplun/lj-726-profile-flush-close-full-ci
Tarantool PR: https://github.com/tarantool/tarantool/pull/7128

 src/jit/p.lua                                 |  1 +
 .../lj-726-profile-flush-close.test.lua       | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 test/tarantool-tests/lj-726-profile-flush-close.test.lua

diff --git a/src/jit/p.lua b/src/jit/p.lua
index 7be10586..4569d69e 100644
--- a/src/jit/p.lua
+++ b/src/jit/p.lua
@@ -238,6 +238,7 @@ local function prof_finish()
     prof_count1 = nil
     prof_count2 = nil
     prof_ud = nil
+    if out ~= stdout then out:close() end
   end
 end
 
diff --git a/test/tarantool-tests/lj-726-profile-flush-close.test.lua b/test/tarantool-tests/lj-726-profile-flush-close.test.lua
new file mode 100644
index 00000000..290bd722
--- /dev/null
+++ b/test/tarantool-tests/lj-726-profile-flush-close.test.lua
@@ -0,0 +1,29 @@
+local tap = require('tap')
+
+local test = tap.test('lj-726-profile-flush-close')
+test:plan(1)
+
+local TEST_FILE = 'lj-726-profile-flush-close.profile'
+
+local function payload()
+  local r = 0
+  for i = 1, 1e8 do
+    r = r + i
+  end
+  return r
+end
+
+local p = require('jit.p')
+p.start("f", TEST_FILE)
+payload()
+p.stop()
+
+local f, err = io.open(TEST_FILE)
+assert(f, err)
+
+-- Check that file is not empty.
+test:ok(f:read(0), 'profile output was flushed and closed')
+
+assert(os.remove(TEST_FILE))
+
+os.exit(test:check() and 0 or 1)
-- 
2.34.1


             reply	other threads:[~2022-05-12 10:11 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-12 10:09 Sergey Kaplun via Tarantool-patches [this message]
2022-06-21 13:50 ` sergos via Tarantool-patches
2022-06-28 23:57 ` Igor Munkin via Tarantool-patches
2022-06-30 12:10 ` Igor Munkin via Tarantool-patches

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220512100937.24037-1-skaplun@tarantool.org \
    --to=tarantool-patches@dev.tarantool.org \
    --cc=imun@tarantool.org \
    --cc=sergos@tarantool.org \
    --cc=skaplun@tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH luajit] Flush and close output file after profiling run.' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox