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 A94236EC55; Wed, 6 Oct 2021 22:15:20 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org A94236EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1633547720; bh=c9rJOXPt+t9f8XvJkUvYXirLb9BHv+rQ9cF/Tg5mVFU=; 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=v0OW1OFsAR8WvSZrxXfztawRL5H+g+7uxY7kSquAAeUOtf5RtCdEZZ+uUjeXzNprZ YnTJN1F0mddsQ3yNyLihT6JxsfsUHXhygcjt3hCcPJQZstxE0ylKSa/siAC4KgJtay sMkU97ti3dsIDO6w+xPh1rs/KzvKkLUEdDYDSKgc= Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 7614E6EC55 for ; Wed, 6 Oct 2021 22:15:18 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 7614E6EC55 Received: by mail-lf1-f45.google.com with SMTP id i24so13902347lfj.13 for ; Wed, 06 Oct 2021 12:15:18 -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=iaceZAd4T91j8uNJrQr31gMgN8njfHz5DtW3tldMFEg=; b=7qqy3EnFUrxq1/yyo0aj47rBlZPFX/TyqN8PWUg42n4MY1t2R+awIJy8ypfvAV/W1m bcEZzocUBaGkxaCFkzDRinVoONySKYeLHavAKcMeovdW92IVFDPRlTWtJnbHKhOmYeXx dIo1cl5GjSfimMe5mxsEE3vmCISHOCCOTXsIPfWH6vmHcHKfoE2scC/hM31FgpUkXp/t 8a9038PqLLsPT6SYiI1kNxkeznQ7tqTr6P9ZEo1AIgEt5+jMGuqkVzs22FG4L3hl0QyI hvPTlb0dLWmCiPQrxT+cy2J9nxUKhZxrllgY0Ou9eD4HBwL6hAUtZ8cTcZX1uap9Ue5M r4rw== X-Gm-Message-State: AOAM532r//6v1G/7xc3qv0IjzQbhL4gsoDuugolcve7umuBnyy7vXpuz wrAEtW0Hp4M6qoDY6XAgVa4o4Rb2WKjQyQ== X-Google-Smtp-Source: ABdhPJxnS5ThxlVfRFNP6WSLy64qQPq1zCs6p3HBL2MacSCAi5KvYK4lqscfSIsx3KDSHL/XpDi50g== X-Received: by 2002:a2e:f19:: with SMTP id 25mr30842316ljp.219.1633547717639; Wed, 06 Oct 2021 12:15:17 -0700 (PDT) Received: from localhost.localdomain ([93.175.11.199]) by smtp.gmail.com with ESMTPSA id u21sm2331159lju.26.2021.10.06.12.15.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Oct 2021 12:15:17 -0700 (PDT) X-Google-Original-From: Maxim Kokryashkin To: tarantool-patches@dev.tarantool.org, imun@tarantool.org, skaplun@tarantool.org, m.shishatskiy@tarantool.org Date: Wed, 6 Oct 2021 22:15:12 +0300 Message-Id: <20211006191512.3565471-1-m.kokryashkin@tarantool.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH luajit v2] 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 --- GitHub branch: https://github.com/tarantool/luajit/tree/shishqa/gh-781-platform-and-lua-profiler 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.33.0