From 7e669f40bed629ac746ac62ece63e3d4ce6ff039 Mon Sep 17 00:00:00 2001 From: normal Date: Wed, 24 Jan 2018 21:07:14 +0000 Subject: ruby/ruby.h: remove unnecessary exports from C-API Needlessly exporting can reduce performance locally and increase binary size. Increasing the footprint of our C-API larger is also detrimental to our development as it encourages tighter coupling with our internals; making it harder for us to preserve compatibility. If some parts of the core codebase needs access to globals, internal.h should be used instead of anything in include/ruby/*. "Urabe, Shyouhei" wrote: > On Thu, Jan 18, 2018 at 7:33 PM, Eric Wong wrote: > > shyouhei@ruby-lang.org wrote: > >> https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=61908 > >> > >> export rb_mFConst > > > > Why are we exporting all these and making the public C-API bigger? > > If anything, we should make these static. Thanks. > > No concrete reason, except they have already been externed in 2.5. > These variables had lacked declarations so far, which resulted in their > visibility to be that of extern. The commit is just confirming the status quo. > > I'm not against to turn them into static. This reverts changes from r61910, r61909, r61908, r61907, and r61906. * transcode.c (rb_eUndefinedConversionError): make static (rb_eInvalidByteSequenceError): ditto (rb_eConverterNotFoundError): ditto * process.c (rb_mProcGID, rb_mProcUid, rb_mProcID_Syscall): ditto * file.c (rb_mFConst): ditto * error.c (rb_mWarning, rb_cWarningBuffer): ditto * enumerator.c (rb_cLazy): ditto [Misc #14381] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enumerator.c | 2 +- error.c | 4 ++-- file.c | 2 +- include/ruby/ruby.h | 10 ---------- process.c | 6 +++--- transcode.c | 6 +++--- 6 files changed, 10 insertions(+), 20 deletions(-) diff --git a/enumerator.c b/enumerator.c index 95801d2e81..0c2ce19502 100644 --- a/enumerator.c +++ b/enumerator.c @@ -102,7 +102,7 @@ * */ VALUE rb_cEnumerator; -VALUE rb_cLazy; +static VALUE rb_cLazy; static ID id_rewind, id_new, id_yield, id_to_enum; static ID id_next, id_result, id_lazy, id_receiver, id_arguments, id_memo, id_method, id_force; static VALUE sym_each, sym_cycle; diff --git a/error.c b/error.c index 2aa5169c2b..52ff87bc0f 100644 --- a/error.c +++ b/error.c @@ -53,8 +53,8 @@ int rb_str_end_with_asciichar(VALUE str, int c); VALUE rb_eEAGAIN; VALUE rb_eEWOULDBLOCK; VALUE rb_eEINPROGRESS; -VALUE rb_mWarning; -VALUE rb_cWarningBuffer; +static VALUE rb_mWarning; +static VALUE rb_cWarningBuffer; static ID id_warn; diff --git a/file.c b/file.c index a54aa5d6da..f898ba5f8a 100644 --- a/file.c +++ b/file.c @@ -5802,7 +5802,7 @@ rb_file_s_mkfifo(int argc, VALUE *argv) #define rb_file_s_mkfifo rb_f_notimplement #endif -VALUE rb_mFConst; +static VALUE rb_mFConst; void rb_file_const(const char *name, VALUE value) diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 1a1c6bd4a8..bd635f3b7c 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1905,18 +1905,12 @@ RUBY_EXTERN VALUE rb_mKernel; RUBY_EXTERN VALUE rb_mComparable; RUBY_EXTERN VALUE rb_mEnumerable; RUBY_EXTERN VALUE rb_mErrno; -RUBY_EXTERN VALUE rb_mFConst; RUBY_EXTERN VALUE rb_mFileTest; RUBY_EXTERN VALUE rb_mGC; RUBY_EXTERN VALUE rb_mMath; -RUBY_EXTERN VALUE rb_mProcGID; -RUBY_EXTERN VALUE rb_mProcID_Syscall; -RUBY_EXTERN VALUE rb_mProcUID; RUBY_EXTERN VALUE rb_mProcess; RUBY_EXTERN VALUE rb_mWaitReadable; RUBY_EXTERN VALUE rb_mWaitWritable; -RUBY_EXTERN VALUE rb_mWarning; -RUBY_EXTERN VALUE rb_cWarningBuffer; RUBY_EXTERN VALUE rb_cBasicObject; RUBY_EXTERN VALUE rb_cObject; @@ -1941,7 +1935,6 @@ RUBY_EXTERN VALUE rb_cFloat; RUBY_EXTERN VALUE rb_cHash; RUBY_EXTERN VALUE rb_cIO; RUBY_EXTERN VALUE rb_cInteger; -RUBY_EXTERN VALUE rb_cLazy; RUBY_EXTERN VALUE rb_cMatch; RUBY_EXTERN VALUE rb_cMethod; RUBY_EXTERN VALUE rb_cModule; @@ -1991,9 +1984,6 @@ RUBY_EXTERN VALUE rb_eSysStackError; RUBY_EXTERN VALUE rb_eRegexpError; RUBY_EXTERN VALUE rb_eEncodingError; RUBY_EXTERN VALUE rb_eEncCompatError; -RUBY_EXTERN VALUE rb_eUndefinedConversionError; -RUBY_EXTERN VALUE rb_eInvalidByteSequenceError; -RUBY_EXTERN VALUE rb_eConverterNotFoundError; RUBY_EXTERN VALUE rb_eScriptError; RUBY_EXTERN VALUE rb_eNameError; diff --git a/process.c b/process.c index 7df4d3bffe..8b8268e9f1 100644 --- a/process.c +++ b/process.c @@ -7590,9 +7590,9 @@ rb_clock_getres(int argc, VALUE *argv) } VALUE rb_mProcess; -VALUE rb_mProcUID; -VALUE rb_mProcGID; -VALUE rb_mProcID_Syscall; +static VALUE rb_mProcUID; +static VALUE rb_mProcGID; +static VALUE rb_mProcID_Syscall; /* diff --git a/transcode.c b/transcode.c index c524259354..ff9576d019 100644 --- a/transcode.c +++ b/transcode.c @@ -17,9 +17,9 @@ #define ENABLE_ECONV_NEWLINE_OPTION 1 /* VALUE rb_cEncoding = rb_define_class("Encoding", rb_cObject); */ -VALUE rb_eUndefinedConversionError; -VALUE rb_eInvalidByteSequenceError; -VALUE rb_eConverterNotFoundError; +static VALUE rb_eUndefinedConversionError; +static VALUE rb_eInvalidByteSequenceError; +static VALUE rb_eConverterNotFoundError; VALUE rb_cEncodingConverter; -- cgit v1.2.3