command-t 1.5.1 → 1.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 65e092a4101159c349fa3add3f4654a8ea0ce323
+  data.tar.gz: 0da32ec23fd4db0d33aae16ae131201161872e16
+SHA512:
+  metadata.gz: 15aee07c8cbf2e2f6d1dbf5b2da4731adb9a5f359d8a0f4a783d2e9eb998eb56cc4ae2d72d3e4ac4a4bc87a1465f99c63b1dea1f131124869475403c599cf489
+  data.tar.gz: 75ead8da5ba910874aa4172f4c7558e63e4cd95923a9db2daa37ea319a41d5dd8761994117ab81307d9c734085d2dbef49cbd89b1acb8fb2f1552d7a53ce9b3e

data/README.txt

@@ -764,6 +764,11 @@ POSSIBILITY OF SUCH DAMAGE.
 
 HISTORY                                         *command-t-history*
 
+1.6 (16 December 2013)
+- on systems with POSIX threads (such as OS X and Linux), Command-T will use
+  threads to compute match results in parallel, resulting in a large speed
+  boost that is especially noticeable when navigating large projects
+
 1.5.1 (23 September 2013)
 - exclude large benchmark fixture file from source exports (patch from Vít
   Ondruch)

data/doc/command-t.txt

@@ -764,6 +764,11 @@ POSSIBILITY OF SUCH DAMAGE.
 
 HISTORY                                         *command-t-history*
 
+1.6 (16 December 2013)
+- on systems with POSIX threads (such as OS X and Linux), Command-T will use
+  threads to compute match results in parallel, resulting in a large speed
+  boost that is especially noticeable when navigating large projects
+
 1.5.1 (23 September 2013)
 - exclude large benchmark fixture file from source exports (patch from Vít
   Ondruch)

data/ruby/command-t/Makefile

@@ -1,75 +1,120 @@
 
 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/greg/.multiruby/install/1.8.7-p334/lib/ruby/1.8/i686-darwin10.6.0
+topdir = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/include/ruby-2.0.0
 hdrdir = $(topdir)
-VPATH = $(srcdir):$(topdir):$(hdrdir)
+arch_hdrdir = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/include/ruby-2.0.0/universal-darwin13
+PATH_SEPARATOR = :
+VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
+prefix = /System/Library/Frameworks/Ruby.framework/Versions/2.0/usr
+rubysitearchprefix = $(rubylibprefix)/$(sitearch)
+rubyarchprefix = $(rubylibprefix)/$(arch)
+rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
 exec_prefix = $(prefix)
-prefix = $(DESTDIR)/Users/greg/.multiruby/install/1.8.7-p334
-sharedstatedir = $(prefix)/com
-mandir = $(datarootdir)/man
-psdir = $(docdir)
-oldincludedir = $(DESTDIR)/usr/include
-localedir = $(datarootdir)/locale
-bindir = $(exec_prefix)/bin
-libexecdir = $(exec_prefix)/libexec
-sitedir = $(libdir)/ruby/site_ruby
-htmldir = $(docdir)
+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)
-includedir = $(prefix)/include
-infodir = $(datarootdir)/info
 vendorlibdir = $(vendordir)/$(ruby_version)
-sysconfdir = $(prefix)/etc
+vendordir = $(rubylibprefix)/vendor_ruby
+sitearchdir = $(sitelibdir)/$(sitearch)
+sitelibdir = $(sitedir)/$(ruby_version)
+sitedir = $(DESTDIR)/Library/Ruby/Site
+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 = $(DESTDIR)/usr/share/man
+localedir = $(datarootdir)/locale
 libdir = $(exec_prefix)/lib
-sbindir = $(exec_prefix)/sbin
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-vendordir = $(libdir)/ruby/vendor_ruby
-datarootdir = $(prefix)/share
+psdir = $(docdir)
 pdfdir = $(docdir)
-archdir = $(rubylibdir)/$(arch)
-sitearchdir = $(sitelibdir)/$(sitearch)
-datadir = $(datarootdir)
+dvidir = $(docdir)
+htmldir = $(docdir)
+infodir = $(DESTDIR)/usr/share/info
+docdir = $(datarootdir)/doc/$(PACKAGE)
+oldincludedir = /usr/include
+includedir = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk$(prefix)/include
 localstatedir = $(prefix)/var
-sitelibdir = $(sitedir)/$(ruby_version)
+sharedstatedir = $(prefix)/com
+sysconfdir = $(DESTDIR)/Library/Ruby/Site
+datadir = $(datarootdir)
+datarootdir = $(prefix)/share
+libexecdir = $(exec_prefix)/libexec
+sbindir = $(exec_prefix)/sbin
+bindir = $(exec_prefix)/bin
+archdir = $(rubyarchdir)
+
 
-CC = gcc
+CC = xcrun clang
+CXX = xcrun 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
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)
+empty =
+OUTFLAG = -o $(empty)
+COUTFLAG = -o $(empty)
 
 RUBY_EXTCONF_H = 
-CFLAGS   =  -fno-common -g -O2  -fno-common -pipe -fno-common $(cflags) 
-INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
-DEFS     = 
-CPPFLAGS = -DHAVE_RUBY_H  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags)
-CXXFLAGS = $(CFLAGS) 
-ldflags  = -L. 
-dldflags = 
-archflag = 
-DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
-LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
+cflags   =  $(optflags) $(debugflags) $(warnflags)
+optflags = 
+debugflags = -g
+warnflags = 
+CCDLFLAGS = 
+CFLAGS   = $(CCDLFLAGS)  -g -Os -pipe $(ARCH_FLAG)
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
+DEFS     = -DPROCESSOR_COUNT=4
+CPPFLAGS = -DHAVE_PTHREAD_H -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT $(DEFS) $(cppflags)
+CXXFLAGS = $(CCDLFLAGS)  -g -Os -pipe  $(ARCH_FLAG)
+ldflags  = -L. -L/usr/local/lib
+dldflags = -undefineddynamic_lookup -multiply_definedsuppress 
+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
-arch = i686-darwin10.6.0
-sitearch = i686-darwin10.6.0
-ruby_version = 1.8
-ruby = /Users/greg/.multiruby/install/1.8.7-p334/bin/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 = universal-darwin13
+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. ####
 
@@ -81,76 +126,112 @@ DEFFILE =
 
 CLEANFILES = mkmf.log
 DISTCLEANFILES = 
+DISTCLEANDIRS = 
 
 extout = 
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  -ldl -lobjc  
-SRCS = ext.c match.c matcher.c
+LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lobjc 
+ORIG_SRCS = ext.c match.c matcher.c
+SRCS = $(ORIG_SRCS) 
 OBJS = ext.o match.o matcher.o
+HDRS = $(srcdir)/ext.h $(srcdir)/match.h $(srcdir)/matcher.h $(srcdir)/ruby_compat.h
 TARGET = ext
+TARGET_NAME = ext
+TARGET_ENTRY = Init_$(TARGET_NAME)
 DLLIB = $(TARGET).bundle
 EXTSTATIC = 
 STATIC_LIB = 
 
-BINDIR        = $(bindir)
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+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 $(TARGET).il? $(TARGET).tds $(TARGET).map
-CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
+CLEANLIBS     = $(TARGET).bundle 
+CLEANOBJS     = *.o  *.bak
 
-all:		$(DLLIB)
-static:		$(STATIC_LIB)
+all:    $(DLLIB)
+static: $(STATIC_LIB)
+.PHONY: all install static install-so install-rb
+.PHONY: clean clean-so clean-static clean-rb
 
-clean:
-		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+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:	clean
-		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+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
+realclean: distclean
 install: install-so install-rb
 
-install-so: $(RUBYARCHDIR)
-install-so: $(RUBYARCHDIR)/$(DLLIB)
-$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+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
-$(RUBYARCHDIR):
-	$(MAKEDIRS) $@
+pre-install-rb-default:
+	$(ECHO) installing default ext 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 .cxx .cpp .C .o
+.SUFFIXES: .c .m .cc .mm .cxx .cpp .C .o
 
 .cc.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.mm.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .cxx.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .cpp.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .C.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .c.o:
-	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
+	$(ECHO) compiling $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+
+.m.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
 
 $(DLLIB): $(OBJS) Makefile
-	@-$(RM) $@
-	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+	$(ECHO) linking shared-object $(DLLIB)
+	-$(Q)$(RM) $(@)
+	$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+	$(Q) test -z '$(RUBY_CODESIGN)' || codesign -s '$(RUBY_CODESIGN)' -f $@
 
 
 

data/ruby/command-t/ext.c

@@ -1,4 +1,4 @@
-// Copyright 2010 Wincent Colaiuta. All rights reserved.
+// Copyright 2010-2013 Wincent Colaiuta. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are met:
@@ -21,11 +21,9 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-#include "match.h"
 #include "matcher.h"
 
 VALUE mCommandT         = 0; // module CommandT
-VALUE cCommandTMatch    = 0; // class CommandT::Match
 VALUE cCommandTMatcher  = 0; // class CommandT::Matcher
 
 VALUE CommandT_option_from_hash(const char *option, VALUE hash)
@@ -44,22 +42,10 @@ void Init_ext()
     // module CommandT
     mCommandT = rb_define_module("CommandT");
 
-    // class CommandT::Match
-    cCommandTMatch = rb_define_class_under(mCommandT, "Match", rb_cObject);
-
-    // methods
-    rb_define_method(cCommandTMatch, "initialize", CommandTMatch_initialize, -1);
-    rb_define_method(cCommandTMatch, "matches?", CommandTMatch_matches, 0);
-    rb_define_method(cCommandTMatch, "to_s", CommandTMatch_to_s, 0);
-
-    // attributes
-    rb_define_attr(cCommandTMatch, "score", Qtrue, Qfalse); // reader: true, writer: false
-
     // class CommandT::Matcher
     cCommandTMatcher = rb_define_class_under(mCommandT, "Matcher", rb_cObject);
 
     // methods
     rb_define_method(cCommandTMatcher, "initialize", CommandTMatcher_initialize, -1);
-    rb_define_method(cCommandTMatcher, "sorted_matches_for", CommandTMatcher_sorted_matches_for, 2);
-    rb_define_method(cCommandTMatcher, "matches_for", CommandTMatcher_matches_for, 1);
+    rb_define_method(cCommandTMatcher, "sorted_matches_for", CommandTMatcher_sorted_matches_for, -1);
 }

data/ruby/command-t/ext.h

@@ -1,4 +1,4 @@
-// Copyright 2010 Wincent Colaiuta. All rights reserved.
+// Copyright 2010-2013 Wincent Colaiuta. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are met:
@@ -24,7 +24,6 @@
 #include <ruby.h>
 
 extern VALUE mCommandT;         // module CommandT
-extern VALUE cCommandTMatch;    // class CommandT::Match
 extern VALUE cCommandTMatcher;  // class CommandT::Matcher
 
 // Encapsulates common pattern of checking for an option in an optional

data/ruby/command-t/extconf.rb

@@ -1,4 +1,4 @@
-# Copyright 2010 Wincent Colaiuta. All rights reserved.
+# Copyright 2010-2013 Wincent Colaiuta. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -23,12 +23,82 @@
 
 require 'mkmf'
 
-def missing item
-  puts "couldn't find #{item} (required)"
-  exit 1
+def header(item)
+  unless find_header(item)
+    puts "couldn't find #{item} (required)"
+    exit 1
+  end
 end
 
+# Stolen, with minor modifications, from:
+#
+#   https://github.com/grosser/parallel/blob/d11e4a3c8c1a2091a0cc2896befa71a94a88d1e7/lib/parallel.rb
+#
+# Number of processors seen by the OS and used for process scheduling.
+#
+# * AIX: /usr/sbin/pmcycles (AIX 5+), /usr/sbin/lsdev
+# * BSD: /sbin/sysctl
+# * Cygwin: /proc/cpuinfo
+# * Darwin: /usr/bin/hwprefs, /usr/sbin/sysctl
+# * HP-UX: /usr/sbin/ioscan
+# * IRIX: /usr/sbin/sysconf
+# * Linux: /proc/cpuinfo
+# * Minix 3+: /proc/cpuinfo
+# * Solaris: /usr/sbin/psrinfo
+# * Tru64 UNIX: /usr/sbin/psrinfo
+# * UnixWare: /usr/sbin/psrinfo
+#
+def processor_count
+  os_name = RbConfig::CONFIG['target_os']
+  if os_name =~ /mingw|mswin/
+    require 'win32ole'
+    result = WIN32OLE.connect('winmgmts://').ExecQuery(
+        'select NumberOfLogicalProcessors from Win32_Processor')
+    result.to_enum.collect(&:NumberOfLogicalProcessors).reduce(:+)
+  elsif File.readable?('/proc/cpuinfo')
+    IO.read('/proc/cpuinfo').scan(/^processor/).size
+  elsif File.executable?('/usr/bin/hwprefs')
+    IO.popen(%w[/usr/bin/hwprefs thread_count]).read.to_i
+  elsif File.executable?('/usr/sbin/psrinfo')
+    IO.popen('/usr/sbin/psrinfo').read.scan(/^.*on-*line/).size
+  elsif File.executable?('/usr/sbin/ioscan')
+    IO.popen(%w[/usr/sbin/ioscan -kC processor]) do |out|
+      out.read.scan(/^.*processor/).size
+    end
+  elsif File.executable?('/usr/sbin/pmcycles')
+    IO.popen(%w[/usr/sbin/pmcycles -m]).read.count("\n")
+  elsif File.executable?('/usr/sbin/lsdev')
+    IO.popen(%w[/usr/sbin/lsdev -Cc processor -S 1]).read.count("\n")
+  elsif File.executable?('/usr/sbin/sysconf') and os_name =~ /irix/i
+    IO.popen(%w[/usr/sbin/sysconf NPROC_ONLN]).read.to_i
+  elsif File.executable?('/usr/sbin/sysctl')
+    IO.popen(%w[/usr/sbin/sysctl -n hw.ncpu]).read.to_i
+  elsif File.executable?('/sbin/sysctl')
+    IO.popen(%w[/sbin/sysctl -n hw.ncpu]).read.to_i
+  else
+    puts 'Unknown platform: ' + RbConfig::CONFIG['target_os']
+    puts 'Assuming 1 processor.'
+    1
+  end
+rescue => e
+  puts "#{e}: assuming 1 processor."
+  1
+end
+
+# mandatory headers
+header('float.h')
+header('ruby.h')
+header('stdlib.h')
+header('string.h')
+
+# optional headers
+have_header('pthread.h') # sets HAVE_PTHREAD_H if found
+
 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
-have_header('ruby.h') or missing('ruby.h')
+count = processor_count
+count = 1 if count < 0   # sanity check
+count = 32 if count > 32 # sanity check
+RbConfig::MAKEFILE_CONFIG['DEFS'] += "-DPROCESSOR_COUNT=#{count}"
+
 create_makefile('ext')

data/ruby/command-t/match.c

@@ -21,7 +21,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-#include "float.h"
+#include <float.h> /* for DBL_MAX */
 #include "match.h"
 #include "ext.h"
 #include "ruby_compat.h"
@@ -146,20 +146,12 @@ memoize:
     return score;
 }
 
-// Match.new needle, string, options = {}
-VALUE CommandTMatch_initialize(int argc, VALUE *argv, VALUE self)
+void calculate_match(VALUE str,
+                     VALUE needle,
+                     VALUE always_show_dot_files,
+                     VALUE never_show_dot_files,
+                     match_t *out)
 {
-    // process arguments: 2 mandatory, 1 optional
-    VALUE str, needle, options;
-    if (rb_scan_args(argc, argv, "21", &str, &needle, &options) == 2)
-        options = Qnil;
-    str    = StringValue(str);
-    needle = StringValue(needle); // already downcased by caller
-
-    // check optional options hash for overrides
-    VALUE always_show_dot_files = CommandT_option_from_hash("always_show_dot_files", options);
-    VALUE never_show_dot_files = CommandT_option_from_hash("never_show_dot_files", options);
-
     matchinfo_t m;
     m.haystack_p            = RSTRING_PTR(str);
     m.haystack_len          = RSTRING_LEN(str);
@@ -198,19 +190,7 @@ VALUE CommandTMatch_initialize(int argc, VALUE *argv, VALUE self)
         score = recursive_match(&m, 0, 0, 0, 0.0);
     }
 
-    // clean-up and final book-keeping
-    rb_iv_set(self, "@score", rb_float_new(score));
-    rb_iv_set(self, "@str", str);
-    return Qnil;
-}
-
-VALUE CommandTMatch_matches(VALUE self)
-{
-    double score = NUM2DBL(rb_iv_get(self, "@score"));
-    return score > 0 ? Qtrue : Qfalse;
-}
-
-VALUE CommandTMatch_to_s(VALUE self)
-{
-    return rb_iv_get(self, "@str");
+    // final book-keeping
+    out->path  = str;
+    out->score = score;
 }

data/ruby/command-t/match.h

@@ -1,4 +1,4 @@
-// Copyright 2010 Wincent Colaiuta. All rights reserved.
+// Copyright 2010-2013 Wincent Colaiuta. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are met:
@@ -23,7 +23,14 @@
 
 #include <ruby.h>
 
-extern VALUE CommandTMatch_initialize(int argc, VALUE *argv, VALUE self);
-extern VALUE CommandTMatch_matches(VALUE self);
-extern VALUE CommandTMatch_score(VALUE self);
-extern VALUE CommandTMatch_to_s(VALUE self);
+// struct for representing an individual match
+typedef struct {
+    VALUE   path;
+    double  score;
+} match_t;
+
+extern void calculate_match(VALUE str,
+                            VALUE needle,
+                            VALUE always_show_dot_files,
+                            VALUE never_show_dot_files,
+                            match_t *out);

data/ruby/command-t/matcher.c

@@ -21,25 +21,30 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-#include <stdlib.h> /* for qsort() */
-#include <string.h> /* for strcmp() */
+#include <stdlib.h>  /* for qsort() */
+#include <string.h>  /* for strncmp() */
 #include "matcher.h"
+#include "match.h"
 #include "ext.h"
 #include "ruby_compat.h"
 
+// order matters; we want this to be evaluated only after ruby.h
+#ifdef HAVE_PTHREAD_H
+#include <pthread.h> /* for pthread_create, pthread_join etc */
+#endif
+
 // comparison function for use with qsort
-int comp_alpha(const void *a, const void *b)
+int cmp_alpha(const void *a, const void *b)
 {
-    VALUE a_val = *(VALUE *)a;
-    VALUE b_val = *(VALUE *)b;
-    ID    to_s  = rb_intern("to_s");
-    VALUE a_str = rb_funcall(a_val, to_s, 0);
-    VALUE b_str = rb_funcall(b_val, to_s, 0);
-    char  *a_p  = RSTRING_PTR(a_str);
-    long  a_len = RSTRING_LEN(a_str);
-    char  *b_p  = RSTRING_PTR(b_str);
-    long  b_len = RSTRING_LEN(b_str);
-    int   order = 0;
+    match_t a_match = *(match_t *)a;
+    match_t b_match = *(match_t *)b;
+    VALUE   a_str   = a_match.path;
+    VALUE   b_str   = b_match.path;
+    char    *a_p    = RSTRING_PTR(a_str);
+    long    a_len   = RSTRING_LEN(a_str);
+    char    *b_p    = RSTRING_PTR(b_str);
+    long    b_len   = RSTRING_LEN(b_str);
+    int     order   = 0;
 
     if (a_len > b_len) {
         order = strncmp(a_p, b_p, b_len);
@@ -57,20 +62,17 @@ int comp_alpha(const void *a, const void *b)
 }
 
 // comparison function for use with qsort
-int comp_score(const void *a, const void *b)
+int cmp_score(const void *a, const void *b)
 {
-    VALUE  a_val   = *(VALUE *)a;
-    VALUE  b_val   = *(VALUE *)b;
-    ID     score   = rb_intern("score");
-    double a_score = RFLOAT_VALUE(rb_funcall(a_val, score, 0));
-    double b_score = RFLOAT_VALUE(rb_funcall(b_val, score, 0));
+    match_t a_match = *(match_t *)a;
+    match_t b_match = *(match_t *)b;
 
-    if (a_score > b_score)
+    if (a_match.score > b_match.score)
         return -1; // a scores higher, a should appear sooner
-    else if (a_score < b_score)
+    else if (a_match.score < b_match.score)
         return 1;  // b scores higher, a should appear later
     else
-        return comp_alpha(a, b);
+        return cmp_alpha(a, b);
 }
 
 VALUE CommandTMatcher_initialize(int argc, VALUE *argv, VALUE self)
@@ -87,12 +89,7 @@ VALUE CommandTMatcher_initialize(int argc, VALUE *argv, VALUE self)
 
     // check optional options hash for overrides
     VALUE always_show_dot_files = CommandT_option_from_hash("always_show_dot_files", options);
-    if (always_show_dot_files != Qtrue)
-        always_show_dot_files = Qfalse;
-
     VALUE never_show_dot_files = CommandT_option_from_hash("never_show_dot_files", options);
-    if (never_show_dot_files != Qtrue)
-        never_show_dot_files = Qfalse;
 
     rb_iv_set(self, "@always_show_dot_files", always_show_dot_files);
     rb_iv_set(self, "@never_show_dot_files", never_show_dot_files);
@@ -100,70 +97,130 @@ VALUE CommandTMatcher_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-VALUE CommandTMatcher_sorted_matches_for(VALUE self, VALUE abbrev, VALUE options)
+typedef struct {
+    int thread_count;
+    int thread_index;
+    match_t *matches;
+    long path_count;
+    VALUE paths;
+    VALUE abbrev;
+    VALUE always_show_dot_files;
+    VALUE never_show_dot_files;
+} thread_args_t;
+
+void *match_thread(void *thread_args)
 {
-    // process optional options hash
-    VALUE limit_option = CommandT_option_from_hash("limit", options);
-
-    // get unsorted matches
-    VALUE matches = CommandTMatcher_matches_for(self, abbrev);
-
-    abbrev = StringValue(abbrev);
-    if (RSTRING_LEN(abbrev) == 0 ||
-        (RSTRING_LEN(abbrev) == 1 && RSTRING_PTR(abbrev)[0] == '.'))
-        // alphabetic order if search string is only "" or "."
-        qsort(RARRAY_PTR(matches), RARRAY_LEN(matches), sizeof(VALUE), comp_alpha);
-    else
-        // for all other non-empty search strings, sort by score
-        qsort(RARRAY_PTR(matches), RARRAY_LEN(matches), sizeof(VALUE), comp_score);
-
-    // apply optional limit option
-    long limit = NIL_P(limit_option) ? 0 : NUM2LONG(limit_option);
-    if (limit == 0 || RARRAY_LEN(matches) < limit)
-        limit = RARRAY_LEN(matches);
-
-    // will return an array of strings, not an array of Match objects
-    for (long i = 0; i < limit; i++) {
-        VALUE str = rb_funcall(RARRAY_PTR(matches)[i], rb_intern("to_s"), 0);
-        RARRAY_PTR(matches)[i] = str;
+    thread_args_t *args = (thread_args_t *)thread_args;
+    for (long i = args->thread_index; i < args->path_count; i += args->thread_count) {
+        VALUE path = RARRAY_PTR(args->paths)[i];
+        calculate_match(path,
+                        args->abbrev,
+                        args->always_show_dot_files,
+                        args->never_show_dot_files,
+                        &args->matches[i]);
     }
 
-    // trim off any items beyond the limit
-    if (limit < RARRAY_LEN(matches))
-        (void)rb_funcall(matches, rb_intern("slice!"), 2, LONG2NUM(limit),
-            LONG2NUM(RARRAY_LEN(matches) - limit));
-
-    return matches;
+    return NULL;
 }
 
-VALUE CommandTMatcher_matches_for(VALUE self, VALUE abbrev)
+
+VALUE CommandTMatcher_sorted_matches_for(int argc, VALUE *argv, VALUE self)
 {
+    // process arguments: 1 mandatory, 1 optional
+    VALUE abbrev, options;
+
+    if (rb_scan_args(argc, argv, "11", &abbrev, &options) == 1)
+        options = Qnil;
     if (NIL_P(abbrev))
         rb_raise(rb_eArgError, "nil abbrev");
 
-    VALUE matches = rb_ary_new();
+    abbrev = StringValue(abbrev);
+    abbrev = rb_funcall(abbrev, rb_intern("downcase"), 0);
+
+    // check optional options has for overrides
+    VALUE limit_option = CommandT_option_from_hash("limit", options);
+
+    // get unsorted matches
     VALUE scanner = rb_iv_get(self, "@scanner");
+    VALUE paths = rb_funcall(scanner, rb_intern("paths"), 0);
     VALUE always_show_dot_files = rb_iv_get(self, "@always_show_dot_files");
     VALUE never_show_dot_files = rb_iv_get(self, "@never_show_dot_files");
-    VALUE options = Qnil;
-
-    if (always_show_dot_files == Qtrue) {
-        options = rb_hash_new();
-        rb_hash_aset(options, ID2SYM(rb_intern("always_show_dot_files")), always_show_dot_files);
-    } else if (never_show_dot_files == Qtrue) {
-        options = rb_hash_new();
-        rb_hash_aset(options, ID2SYM(rb_intern("never_show_dot_files")), never_show_dot_files);
+
+    long path_count = RARRAY_LEN(paths);
+    match_t *matches = malloc(path_count * sizeof(match_t));
+    if (!matches)
+        rb_raise(rb_eNoMemError, "memory allocation failed");
+
+    int err;
+    int thread_count = 1;
+
+#ifdef HAVE_PTHREAD_H
+#define THREAD_THRESHOLD 1000 /* avoid the overhead of threading when search space is small */
+    if (path_count < THREAD_THRESHOLD)
+        thread_count = 1;
+    else
+        thread_count = PROCESSOR_COUNT; // passed in as preprocessor macro
+    pthread_t *threads = malloc(sizeof(pthread_t) * thread_count);
+    if (!threads)
+        rb_raise(rb_eNoMemError, "memory allocation failed");
+#endif
+
+    thread_args_t *thread_args = malloc(sizeof(thread_args_t) * thread_count);
+    if (!thread_args)
+        rb_raise(rb_eNoMemError, "memory allocation failed");
+    for (int i = 0; i < thread_count; i++) {
+        thread_args[i].thread_count = thread_count;
+        thread_args[i].thread_index = i;
+        thread_args[i].matches = matches;
+        thread_args[i].path_count = path_count;
+        thread_args[i].paths = paths;
+        thread_args[i].abbrev = abbrev;
+        thread_args[i].always_show_dot_files = always_show_dot_files;
+        thread_args[i].never_show_dot_files = never_show_dot_files;
+
+#ifdef HAVE_PTHREAD_H
+        if (i == thread_count - 1) {
+#endif
+            // for the last "worker", we'll just use the main thread
+            (void)match_thread(&thread_args[i]);
+#ifdef HAVE_PTHREAD_H
+        } else {
+            err = pthread_create(&threads[i], NULL, match_thread, (void *)&thread_args[i]);
+            if (err != 0)
+                rb_raise(rb_eSystemCallError, "pthread_create() failure (%d)", err);
+        }
+#endif
     }
 
-    abbrev = rb_funcall(abbrev, rb_intern("downcase"), 0);
-    VALUE paths = rb_funcall(scanner, rb_intern("paths"), 0);
+#ifdef HAVE_PTHREAD_H
+    for (int i = 0; i < thread_count - 1; i++) {
+        err = pthread_join(threads[i], NULL);
+        if (err != 0)
+            rb_raise(rb_eSystemCallError, "pthread_join() failure (%d)", err);
+    }
+    free(threads);
+#endif
+
+    if (RSTRING_LEN(abbrev) == 0 ||
+        (RSTRING_LEN(abbrev) == 1 && RSTRING_PTR(abbrev)[0] == '.'))
+        // alphabetic order if search string is only "" or "."
+        qsort(matches, path_count, sizeof(match_t), cmp_alpha);
+    else
+        // for all other non-empty search strings, sort by score
+        qsort(matches, path_count, sizeof(match_t), cmp_score);
 
-    for (long i = 0, max = RARRAY_LEN(paths); i < max; i++) {
-        VALUE path = RARRAY_PTR(paths)[i];
-        VALUE match = rb_funcall(cCommandTMatch, rb_intern("new"), 3, path, abbrev, options);
-        if (rb_funcall(match, rb_intern("matches?"), 0) == Qtrue)
-            rb_funcall(matches, rb_intern("push"), 1, match);
+    VALUE results = rb_ary_new();
+
+    long limit = NIL_P(limit_option) ? 0 : NUM2LONG(limit_option);
+    if (limit == 0)
+        limit = path_count;
+    for (long i = 0; i < path_count && limit > 0; i++) {
+        if (matches[i].score > 0.0) {
+            rb_funcall(results, rb_intern("push"), 1, matches[i].path);
+            limit--;
+        }
     }
 
-    return matches;
+    free(matches);
+    return results;
 }

data/ruby/command-t/matcher.h

@@ -1,4 +1,4 @@
-// Copyright 2010 Wincent Colaiuta. All rights reserved.
+// Copyright 2010-2013 Wincent Colaiuta. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are met:
@@ -24,7 +24,4 @@
 #include <ruby.h>
 
 extern VALUE CommandTMatcher_initialize(int argc, VALUE *argv, VALUE self);
-extern VALUE CommandTMatcher_sorted_matches_for(VALUE self, VALUE abbrev, VALUE options);
-
-// most likely the function will be subsumed by the sorted_matcher_for function
-extern VALUE CommandTMatcher_matches_for(VALUE self, VALUE abbrev);
+extern VALUE CommandTMatcher_sorted_matches_for(int argc, VALUE *argv, VALUE self);

metadata

@@ -1,32 +1,26 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: command-t
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 5
-  - 1
-  version: 1.5.1
+version: !ruby/object:Gem::Version
+  version: '1.6'
 platform: ruby
-authors: 
+authors:
 - Wincent Colaiuta
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-05 00:00:00 -08:00
-default_executable: 
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies: []
-
-description: "    Command-T provides a fast, intuitive mechanism for opening files with a\n    minimal number of keystrokes. Its full functionality is only available when\n    installed as a Vim plug-in, but it is also made available as a RubyGem so\n    that other applications can make use of its searching algorithm.\n"
+description: |2
+      Command-T provides a fast, intuitive mechanism for opening files with a
+      minimal number of keystrokes. Its full functionality is only available when
+      installed as a Vim plug-in, but it is also made available as a RubyGem so
+      that other applications can make use of its searching algorithm.
 email: win@wincent.com
 executables: []
-
-extensions: 
+extensions:
 - ruby/command-t/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - README.txt
 - LICENSE
 - Gemfile
@@ -63,35 +57,27 @@ files:
 - ruby/command-t/vim.rb
 - doc/command-t.txt
 - plugin/command-t.vim
-has_rdoc: true
 homepage: https://wincent.com/products/command-t
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - ruby
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The Command-T plug-in for VIM.
 test_files: []
-