From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 6B4BA1F670 for ; Fri, 22 Oct 2021 04:05:16 +0000 (UTC) From: Eric Wong To: unicorn-public@yhbt.net Subject: [PATCH] allow Ruby to deduplicate remaining globals Date: Fri, 22 Oct 2021 04:05:16 +0000 Message-Id: <20211022040516.17342-1-bofh@yhbt.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Most of these are bound to be used in Rack/Rails/apps/gems, (though possibly with different encodings). Give Ruby a chance to deduplicate them, at least. --- ext/unicorn_http/common_field_optimization.h | 1 - ext/unicorn_http/global_variables.h | 2 +- ext/unicorn_http/unicorn_http.rl | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/unicorn_http/common_field_optimization.h b/ext/unicorn_http/common_field_optimization.h index 0659fc7..250e43e 100644 --- a/ext/unicorn_http/common_field_optimization.h +++ b/ext/unicorn_http/common_field_optimization.h @@ -83,7 +83,6 @@ static void init_common_fields(void) struct common_field *cf = common_http_fields; char tmp[64]; - id_uminus = rb_intern("-@"); memcpy(tmp, HTTP_PREFIX, HTTP_PREFIX_LEN); for(i = ARRAY_SIZE(common_http_fields); --i >= 0; cf++) { diff --git a/ext/unicorn_http/global_variables.h b/ext/unicorn_http/global_variables.h index f8e694c..c9ceebd 100644 --- a/ext/unicorn_http/global_variables.h +++ b/ext/unicorn_http/global_variables.h @@ -55,7 +55,7 @@ NORETURN(static void parser_raise(VALUE klass, const char *)); /** Defines global strings in the init method. */ #define DEF_GLOBAL(N, val) do { \ - g_##N = rb_obj_freeze(rb_str_new(val, sizeof(val) - 1)); \ + g_##N = str_new_dd_freeze(val, (long)sizeof(val) - 1); \ rb_gc_register_mark_object(g_##N); \ } while (0) diff --git a/ext/unicorn_http/unicorn_http.rl b/ext/unicorn_http/unicorn_http.rl index 605b23f..ba23438 100644 --- a/ext/unicorn_http/unicorn_http.rl +++ b/ext/unicorn_http/unicorn_http.rl @@ -968,6 +968,7 @@ void Init_unicorn_http(void) e414 = rb_define_class_under(mUnicorn, "RequestURITooLongError", eHttpParserError); + id_uminus = rb_intern("-@"); init_globals(); rb_define_alloc_func(cHttpParser, HttpParser_alloc); rb_define_method(cHttpParser, "initialize", HttpParser_init, 0);