From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id B0F176ECE8; Wed, 6 Apr 2022 15:52:20 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B0F176ECE8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1649249540; bh=qDxkmDvUOK69IAWKGUL4dJ819vFYZLYwxy3n1t5kkek=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=vxicbtBzoTfNQgSOBZBaklwWxWaRAYIO9QgwDRCAKnW2kUk+tAnArLaND29+S51db u8AHnZ8bC1DBC2FnG/xmmj67EI52mrVTNusdgbOcAWf0Zc29xUnZQYzQIOZ7fT88wh jF7fOTW6nm5SpPf81nH9ywB0o+u0E/meK7abeXJk= Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 4C82B6EFE3 for ; Wed, 6 Apr 2022 15:49:55 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 4C82B6EFE3 Received: by mail-lj1-f180.google.com with SMTP id q68so3072268ljb.3 for ; Wed, 06 Apr 2022 05:49:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XKtAJSpeZycRCnAerrTv8GV9tEhZ/gtydSpwSEBv4Vg=; b=KeXukf2l/ow2dBfWxS/tsfJGEVh9/AZtOFDh1uP/yu+IfYd1nrbtuIs0cf0Ni/NlHS Wy9hjoN1b8e3iuTFzY0O58gf3OXPZ02lWJfTeCYqD9uQ4xv8L1SzOEvJM6ELuA6stixB gv8Zchx3Ps1fQIbwl/cF6Prr1AGWTHH8RuSCVTASlkSELwnuxdFA6HjW0++yNoZnGG1K 5wv/S8yqa7jSmnmQjMexqxO4NSbQKsoeeFaC9/U3IKyIxUabx+90cZbkRGLzisUQFKml KmZKozoZOU4aKVkRlbJGox9Di7uWt8BS6qyQz25WNUQu0bniCM+vxtFNyVmHYgchzeQL Y9Bw== X-Gm-Message-State: AOAM533keByagkCSqYUcJKofXHf5PQgvegxgX9jU3nVBLa6TSasHEUKa txa0wdAHFQdpgHooWyFiHWpdh8pcTDLFSQ== X-Google-Smtp-Source: ABdhPJxpUiqOyEwpyg52YV1E14b/1wWIuWPyYJRZ1+RC7dnjMoBdmBx9DjXMtJdPT1dqlnGD6Ag0dw== X-Received: by 2002:a2e:951:0:b0:24b:3b2:440b with SMTP id 78-20020a2e0951000000b0024b03b2440bmr5417802ljj.42.1649249394544; Wed, 06 Apr 2022 05:49:54 -0700 (PDT) Received: from localhost.localdomain ([93.175.28.20]) by smtp.gmail.com with ESMTPSA id i25-20020a0565123e1900b0044a2908b040sm1821375lfv.115.2022.04.06.05.49.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 05:49:54 -0700 (PDT) X-Google-Original-From: Maxim Kokryashkin To: tarantool-patches@dev.tarantool.org, imun@tarantool.org, skaplun@tarantool.org Date: Wed, 6 Apr 2022 15:49:37 +0300 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH luajit v3 5/7] memprof: add profile common section X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Maxim Kokryashkin via Tarantool-patches Reply-To: Maxim Kokryashkin Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" A Lua API for sysprof needs to be introduced, but sysprof's C API is quite similar with memprof's. Considering this, there are some structures and functions that should be common among memprof's and sysprof's implementations of Lua API to avoid duplication. Part of tarantool/tarantool#781 --- src/lib_misc.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/src/lib_misc.c b/src/lib_misc.c index 1dab08cc..22d29d78 100644 --- a/src/lib_misc.c +++ b/src/lib_misc.c @@ -8,8 +8,9 @@ #define lib_misc_c #define LUA_LIB -#include #include +#include +#include #include "lua.h" #include "lmisclib.h" @@ -75,9 +76,7 @@ LJLIB_CF(misc_getmetrics) #include "lj_libdef.h" -/* ----- misc.memprof module ---------------------------------------------- */ - -#define LJLIB_MODULE_misc_memprof +/* --------- profile common section --------------------------------------- */ /* ** Yep, 8Mb. Tuned in order not to bother the platform with too often flushes. @@ -85,9 +84,9 @@ LJLIB_CF(misc_getmetrics) #define STREAM_BUFFER_SIZE (8 * 1024 * 1024) /* Structure given as ctx to memprof writer and on_stop callback. */ -struct memprof_ctx { - /* Output file stream for data. */ - FILE *stream; +struct profile_ctx { + /* Output file descriptor for data. */ + int fd; /* Profiled global_State for lj_mem_free at on_stop callback. */ global_State *g; /* Buffer for data. */ @@ -96,13 +95,13 @@ struct memprof_ctx { /* ** Default buffer writer function. -** Just call fwrite to the corresponding FILE. +** Just call write to the corresponding descriptor. */ static size_t buffer_writer_default(const void **buf_addr, size_t len, void *opt) { - struct memprof_ctx *ctx = opt; - FILE *stream = ctx->stream; + struct profile_ctx *ctx = opt; + const int fd = ctx->fd; const void * const buf_start = *buf_addr; const void *data = *buf_addr; size_t write_total = 0; @@ -110,9 +109,9 @@ static size_t buffer_writer_default(const void **buf_addr, size_t len, lua_assert(len <= STREAM_BUFFER_SIZE); for (;;) { - const size_t written = fwrite(data, 1, len - write_total, stream); + const size_t written = write(fd, data, len - write_total); - if (LJ_UNLIKELY(written == 0)) { + if (LJ_UNLIKELY(written == -1)) { /* Re-tries write in case of EINTR. */ if (errno != EINTR) { /* Will be freed as whole chunk later. */ @@ -137,22 +136,25 @@ static size_t buffer_writer_default(const void **buf_addr, size_t len, return write_total; } -/* Default on stop callback. Just close the corresponding stream. */ +/* Default on stop callback. Just close the corresponding descriptor. */ static int on_stop_cb_default(void *opt, uint8_t *buf) { - struct memprof_ctx *ctx = opt; - FILE *stream = ctx->stream; + struct profile_ctx *ctx = opt; + const int fd = ctx->fd; UNUSED(buf); lj_mem_free(ctx->g, ctx, sizeof(*ctx)); - return fclose(stream); + return close(fd); } +/* ----- misc.memprof module ---------------------------------------------- */ + +#define LJLIB_MODULE_misc_memprof /* local started, err, errno = misc.memprof.start(fname) */ LJLIB_CF(misc_memprof_start) { struct lj_memprof_options opt = {0}; const char *fname = strdata(lj_lib_checkstr(L, 1)); - struct memprof_ctx *ctx; + struct profile_ctx *ctx; int memprof_status; /* -- 2.35.1