From c9673929b4ea808d690d649fe3145c4dd0bb90ee Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Mon, 18 Nov 2013 18:11:41 -0800 Subject: working on native C ext --- ext/encoder/encoder.c | 6 - ext/encoder/extconf.rb | 16 --- ext/ffi_yajl/ext/encoder/Makefile | 238 ++++++++++++++++++++++++++++++++++++ ext/ffi_yajl/ext/encoder/encoder.c | 85 +++++++++++++ ext/ffi_yajl/ext/encoder/extconf.rb | 18 +++ 5 files changed, 341 insertions(+), 22 deletions(-) delete mode 100644 ext/encoder/encoder.c delete mode 100644 ext/encoder/extconf.rb create mode 100644 ext/ffi_yajl/ext/encoder/Makefile create mode 100644 ext/ffi_yajl/ext/encoder/encoder.c create mode 100644 ext/ffi_yajl/ext/encoder/extconf.rb (limited to 'ext') diff --git a/ext/encoder/encoder.c b/ext/encoder/encoder.c deleted file mode 100644 index d664647..0000000 --- a/ext/encoder/encoder.c +++ /dev/null @@ -1,6 +0,0 @@ - -void Init_encoder() { - mJSON_Yajl = rb_define_module("JSON_Yajl"); - mEncoder -} - diff --git a/ext/encoder/extconf.rb b/ext/encoder/extconf.rb deleted file mode 100644 index bc3013b..0000000 --- a/ext/encoder/extconf.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'mkmf' - -# the customer is always right, ruby is always compiled to be stupid -$CFLAGS = ENV['CFLAGS'] if ENV['CFLAGS'] -$LDFLAGS = ENV['LDFLAGS'] if ENV['LDFLAGS'] -RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC'] - -# except if you're doing an unoptimized gcc install we're going to help you out a bit -if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc|clang/ - $CFLAGS << " -O3" unless $CFLAGS[/-O\d/] - # how many people realize that -Wall is a compiler-specific flag??? - # apparently not many based on reading lots of shitty extconf.rb's out there - $CFLAGS << " -Wall" -end - -create_makefile 'encoder' diff --git a/ext/ffi_yajl/ext/encoder/Makefile b/ext/ffi_yajl/ext/encoder/Makefile new file mode 100644 index 0000000..0b4b2ef --- /dev/null +++ b/ext/ffi_yajl/ext/encoder/Makefile @@ -0,0 +1,238 @@ + +SHELL = /bin/sh + +# V=0 quiet, V=1 verbose. other values don't work. +V = 0 +Q1 = $(V:1=) +Q = $(Q1:0=@) +ECHO1 = $(V:1=@:) +ECHO = $(ECHO1:0=@echo) + +#### Start of system configuration section. #### + +srcdir = . +topdir = /Users/lamont/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0 +hdrdir = $(topdir) +arch_hdrdir = /Users/lamont/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0/x86_64-darwin12.4.0 +PATH_SEPARATOR = : +VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby +prefix = /Users/lamont/.rvm/rubies/ruby-2.0.0-p247 +rubysitearchprefix = $(rubylibprefix)/$(sitearch) +rubyarchprefix = $(rubylibprefix)/$(arch) +rubylibprefix = $(libdir)/$(RUBY_BASE_NAME) +exec_prefix = $(prefix) +vendorarchhdrdir = $(vendorhdrdir)/$(sitearch) +sitearchhdrdir = $(sitehdrdir)/$(sitearch) +rubyarchhdrdir = $(rubyhdrdir)/$(arch) +vendorhdrdir = $(rubyhdrdir)/vendor_ruby +sitehdrdir = $(rubyhdrdir)/site_ruby +rubyhdrdir = $(includedir)/$(RUBY_VERSION_NAME) +vendorarchdir = $(vendorlibdir)/$(sitearch) +vendorlibdir = $(vendordir)/$(ruby_version) +vendordir = $(rubylibprefix)/vendor_ruby +sitearchdir = $(sitelibdir)/$(sitearch) +sitelibdir = $(sitedir)/$(ruby_version) +sitedir = $(rubylibprefix)/site_ruby +rubyarchdir = $(rubylibdir)/$(arch) +rubylibdir = $(rubylibprefix)/$(ruby_version) +sitearchincludedir = $(includedir)/$(sitearch) +archincludedir = $(includedir)/$(arch) +sitearchlibdir = $(libdir)/$(sitearch) +archlibdir = $(libdir)/$(arch) +ridir = $(datarootdir)/$(RI_BASE_NAME) +mandir = $(datarootdir)/man +localedir = $(datarootdir)/locale +libdir = $(exec_prefix)/lib +psdir = $(docdir) +pdfdir = $(docdir) +dvidir = $(docdir) +htmldir = $(docdir) +infodir = $(datarootdir)/info +docdir = $(datarootdir)/doc/$(PACKAGE) +oldincludedir = /usr/include +includedir = $(prefix)/include +localstatedir = $(prefix)/var +sharedstatedir = $(prefix)/com +sysconfdir = $(prefix)/etc +datadir = $(datarootdir) +datarootdir = $(prefix)/share +libexecdir = $(exec_prefix)/libexec +sbindir = $(exec_prefix)/sbin +bindir = $(exec_prefix)/bin +archdir = $(rubyarchdir) + + +CC = /usr/bin/clang +CXX = clang++ +LIBRUBY = $(LIBRUBY_SO) +LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a +LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME) +LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static +empty = +OUTFLAG = -o $(empty) +COUTFLAG = -o $(empty) + +RUBY_EXTCONF_H = +cflags = $(optflags) $(debugflags) $(warnflags) +optflags = -O3 -fno-fast-math +debugflags = -ggdb3 +warnflags = -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wunused-variable -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration +CCDLFLAGS = -fno-common +CFLAGS = $(CCDLFLAGS) -O3 -march=nocona -O2 -pipe -fno-common -Wall $(ARCH_FLAG) +INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir) +DEFS = +CPPFLAGS = -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT -I/usr/local/opt/libyaml/include -I/usr/local/opt/readline/include -I/usr/local/opt/libksba/include -I/usr/local/opt/openssl/include $(DEFS) $(cppflags) +CXXFLAGS = $(CCDLFLAGS) $(cxxflags) $(ARCH_FLAG) +ldflags = -L. -fstack-protector -L/usr/local/lib -L/usr/local/opt/libyaml/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/libksba/lib -L/usr/local/opt/openssl/lib +dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress -L/usr/local/opt/libyaml/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/libksba/lib -L/usr/local/opt/openssl/lib +ARCH_FLAG = +DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG) +LDSHARED = $(CC) -dynamic -bundle +LDSHAREDXX = $(CXX) -dynamic -bundle +AR = ar +EXEEXT = + +RUBY_INSTALL_NAME = ruby +RUBY_SO_NAME = ruby.2.0.0 +RUBYW_INSTALL_NAME = +RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version) +RUBYW_BASE_NAME = rubyw +RUBY_BASE_NAME = ruby + +arch = x86_64-darwin12.4.0 +sitearch = $(arch) +ruby_version = 2.0.0 +ruby = $(bindir)/ruby +RUBY = $(ruby) +ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h + +RM = rm -f +RM_RF = $(RUBY) -run -e rm -- -rf +RMDIRS = rmdir -p +MAKEDIRS = mkdir -p +INSTALL = /usr/bin/install -c +INSTALL_PROG = $(INSTALL) -m 0755 +INSTALL_DATA = $(INSTALL) -m 644 +COPY = cp +TOUCH = exit > + +#### End of system configuration section. #### + +preload = + +libpath = . $(libdir) /usr/local/opt/libyaml/lib /usr/local/opt/readline/lib /usr/local/opt/libksba/lib /usr/local/opt/openssl/lib +LIBPATH = -L. -L$(libdir) -L/usr/local/opt/libyaml/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/libksba/lib -L/usr/local/opt/openssl/lib +DEFFILE = + +CLEANFILES = mkmf.log +DISTCLEANFILES = +DISTCLEANDIRS = + +extout = +extout_prefix = +target_prefix = /encoder +LOCAL_LIBS = +LIBS = $(LIBRUBYARG_SHARED) -lpthread -ldl -lobjc +ORIG_SRCS = encoder.c +SRCS = $(ORIG_SRCS) +OBJS = encoder.o +HDRS = +TARGET = encoder +TARGET_NAME = encoder +TARGET_ENTRY = Init_$(TARGET_NAME) +DLLIB = $(TARGET).bundle +EXTSTATIC = +STATIC_LIB = + +BINDIR = $(DESTDIR)$(bindir) +RUBYCOMMONDIR = $(DESTDIR)$(sitedir)$(target_prefix) +RUBYLIBDIR = $(DESTDIR)$(sitelibdir)$(target_prefix) +RUBYARCHDIR = $(DESTDIR)$(sitearchdir)$(target_prefix) +HDRDIR = $(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix) +ARCHHDRDIR = $(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix) + +TARGET_SO = $(DLLIB) +CLEANLIBS = $(TARGET).bundle +CLEANOBJS = *.o *.bak + +all: $(DLLIB) +static: $(STATIC_LIB) +.PHONY: all install static install-so install-rb +.PHONY: clean clean-so clean-static clean-rb + +clean-static:: +clean-rb-default:: +clean-rb:: +clean-so:: +clean: clean-so clean-static clean-rb-default clean-rb + -$(Q)$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) .*.time + +distclean-rb-default:: +distclean-rb:: +distclean-so:: +distclean-static:: +distclean: clean distclean-so distclean-static distclean-rb-default distclean-rb + -$(Q)$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log + -$(Q)$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES) + -$(Q)$(RMDIRS) $(DISTCLEANDIRS) 2> /dev/null || true + +realclean: distclean +install: install-so install-rb + +install-so: $(DLLIB) ./.RUBYARCHDIR.time + $(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR) +clean-static:: + -$(Q)$(RM) $(STATIC_LIB) +install-rb: pre-install-rb install-rb-default +install-rb-default: pre-install-rb-default +pre-install-rb: Makefile +pre-install-rb-default: Makefile +pre-install-rb-default: + $(ECHO) installing default encoder libraries +./.RUBYARCHDIR.time: + $(Q) $(MAKEDIRS) $(RUBYARCHDIR) + $(Q) $(TOUCH) $@ + +site-install: site-install-so site-install-rb +site-install-so: install-so +site-install-rb: install-rb + +.SUFFIXES: .c .m .cc .mm .cxx .cpp .C .o + +.cc.o: + $(ECHO) compiling $(<) + $(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $< + +.mm.o: + $(ECHO) compiling $(<) + $(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $< + +.cxx.o: + $(ECHO) compiling $(<) + $(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $< + +.cpp.o: + $(ECHO) compiling $(<) + $(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $< + +.C.o: + $(ECHO) compiling $(<) + $(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $< + +.c.o: + $(ECHO) compiling $(<) + $(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $< + +.m.o: + $(ECHO) compiling $(<) + $(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $< + +$(DLLIB): $(OBJS) Makefile + $(ECHO) linking shared-object encoder/$(DLLIB) + -$(Q)$(RM) $(@) + $(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS) + $(Q) test -z '$(RUBY_CODESIGN)' || codesign -s '$(RUBY_CODESIGN)' -f $@ + + + +$(OBJS): $(HDRS) $(ruby_headers) diff --git a/ext/ffi_yajl/ext/encoder/encoder.c b/ext/ffi_yajl/ext/encoder/encoder.c new file mode 100644 index 0000000..878e3bf --- /dev/null +++ b/ext/ffi_yajl/ext/encoder/encoder.c @@ -0,0 +1,85 @@ +#include +#include + +static VALUE mFFI_Yajl, mExt, mEncoder; + +/* FIXME: the json gem does a whole bunch of indirection around monkeypatching... not sure if we need to as well... */ + +static VALUE mEncoder_encode(VALUE self, VALUE obj) { + return Qnil; +} + +static VALUE rb_cHash_ffi_yajl(VALUE self, VALUE yajl_gen, VALUE state) { + return Qnil; +} + +static VALUE rb_cArray_ffi_yajl(VALUE self, VALUE yajl_gen, VALUE state) { + return Qnil; +} + +static VALUE rb_cNilClass_ffi_yajl(VALUE self, VALUE yajl_gen, VALUE state) { + yajl_gen_null((struct yajl_gen_t *) yajl_gen); + return Qnil; +} + +static VALUE rb_cTrueClass_ffi_yajl(VALUE self, VALUE yajl_gen, VALUE state) { + yajl_gen_bool((struct yajl_gen_t *) yajl_gen, 0); + return Qnil; +} + +static VALUE rb_cFalseClass_ffi_yajl(VALUE self, VALUE yajl_gen, VALUE state) { + yajl_gen_bool((struct yajl_gen_t *) yajl_gen, 1); + return Qnil; +} + +static VALUE rb_cFixnum_ffi_yajl(VALUE self, VALUE yajl_gen, VALUE state) { + VALUE processing_key, str; + + processing_key = rb_hash_aref(state, ID2SYM(rb_intern("processing_key"))); + if ( RTEST(processing_key) ) { + str = rb_any_to_s(self); + yajl_gen_string((struct yajl_gen_t *) yajl_gen, (unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str)); + } else { + yajl_gen_integer((struct yajl_gen_t *) yajl_gen, NUM2INT(self)); + } + return Qnil; +} + +static VALUE rb_cBignum_ffi_yajl(VALUE self, VALUE yajl_gen, VALUE state) { + rb_raise( rb_eNotImpError, "not implemented"); + return Qnil; +} + +static VALUE rb_cFloat_ffi_yajl(VALUE self, VALUE yajl_gen, VALUE state) { + yajl_gen_double((struct yajl_gen_t *) yajl_gen, NUM2DBL(self)); + return Qnil; +} + +static VALUE rb_cString_ffi_yajl(VALUE self, VALUE yajl_gen, VALUE state) { + yajl_gen_string((struct yajl_gen_t *) yajl_gen, (unsigned char *)RSTRING_PTR(self), RSTRING_LEN(self)); + return Qnil; +} + +static VALUE rb_cObject_ffi_yajl(VALUE self, VALUE yajl_gen, VALUE state) { + rb_raise( rb_eNotImpError, "not implemented"); + return Qnil; +} + +void Init_encoder() { + mFFI_Yajl = rb_define_module("FFI_Yajl"); + mExt = rb_define_module_under(mFFI_Yajl, "Ext"); + mEncoder = rb_define_module_under(mExt, "Encoder"); + rb_define_method(mEncoder, "encode", mEncoder_encode, 1); + + rb_define_method(rb_cHash, "ffi_yajl", rb_cHash_ffi_yajl, 2); + rb_define_method(rb_cArray, "ffi_yajl", rb_cArray_ffi_yajl, 2); + rb_define_method(rb_cNilClass, "ffi_yajl", rb_cNilClass_ffi_yajl, 2); + rb_define_method(rb_cTrueClass, "ffi_yajl", rb_cTrueClass_ffi_yajl, 2); + rb_define_method(rb_cFalseClass, "ffi_yajl", rb_cFalseClass_ffi_yajl, 2); + rb_define_method(rb_cFixnum, "ffi_yajl", rb_cFixnum_ffi_yajl, 2); + rb_define_method(rb_cBignum, "ffi_yajl", rb_cBignum_ffi_yajl, 2); + rb_define_method(rb_cFloat, "ffi_yajl", rb_cFloat_ffi_yajl, 2); + rb_define_method(rb_cString, "ffi_yajl", rb_cString_ffi_yajl, 2); + rb_define_method(rb_cObject, "ffi_yajl", rb_cObject_ffi_yajl, 2); +} + diff --git a/ext/ffi_yajl/ext/encoder/extconf.rb b/ext/ffi_yajl/ext/encoder/extconf.rb new file mode 100644 index 0000000..bfe042a --- /dev/null +++ b/ext/ffi_yajl/ext/encoder/extconf.rb @@ -0,0 +1,18 @@ +require 'mkmf' + +# the customer is always right, ruby is always compiled to be stupid +$CFLAGS = ENV['CFLAGS'] if ENV['CFLAGS'] +$LDFLAGS = ENV['LDFLAGS'] if ENV['LDFLAGS'] +RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC'] + +# except if you're doing an unoptimized gcc install we're going to help you out a bit +if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc|clang/ + $CFLAGS << " -O3" unless $CFLAGS[/-O\d/] + # how many people realize that -Wall is a compiler-specific flag??? + # apparently not many based on reading lots of shitty extconf.rb's out there + $CFLAGS << " -Wall" +end + +dir_config 'encoder' + +create_makefile 'ffi_yajl/ext/encoder' -- cgit v1.2.1