From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.1 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 209CD1F405 for ; Tue, 23 Jan 2024 12:57:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yhbt.net; s=selector1; t=1706014665; bh=ysVgJ2bENspP1iqz++W0MnSpT0xKLy+l4k+jyonVF4U=; h=From:To:Subject:Date:From; b=ifCYXuotPxHlnWgoQ3FODICmGH9+sLONlhOIjuRalI1oIc/2qohk+DRob6E3rk3b5 UeSxTX+7c1W3ykhITYJXgbery/7x7UBvccuGKH6W5GoXNCZODv5lV1/VdTwI+hgkUy vW1ec4+0msnY9jh8Mn+NqStPiF9QEUvo0Q1tzGnE= From: Eric Wong To: clogger-public@yhbt.net Subject: [PATCH] switch to TypedData macros for allocation Date: Tue, 23 Jan 2024 12:57:45 +0000 Message-ID: <20240123125745.498086-1-bofh@yhbt.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: This gives us memsize information and appears to fix a leak under Ruby 3.3. --- ext/clogger_ext/clogger.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ext/clogger_ext/clogger.c b/ext/clogger_ext/clogger.c index 8cd40be..9861d70 100644 --- a/ext/clogger_ext/clogger.c +++ b/ext/clogger_ext/clogger.c @@ -225,18 +225,28 @@ static void clogger_mark(void *ptr) rb_gc_mark(c->body); } +static size_t memsize(const void *ptr) +{ + return sizeof(struct clogger); +} + +static const rb_data_type_t clogger_type = { + "clogger", + { clogger_mark, RUBY_TYPED_DEFAULT_FREE, memsize, /* reserved */ }, +}; + static VALUE clogger_alloc(VALUE klass) { struct clogger *c; - return Data_Make_Struct(klass, struct clogger, clogger_mark, -1, c); + return TypedData_Make_Struct(klass, struct clogger, &clogger_type, c); } static struct clogger *clogger_get(VALUE self) { struct clogger *c; - Data_Get_Struct(self, struct clogger, c); + TypedData_Get_Struct(self, struct clogger, &clogger_type, c); assert(c); return c; }