Changeset 599

Show
Ignore:
Timestamp:
12/05/07 06:11:52 (1 year ago)
Author:
blackhedd
Message:

re-enabled the pure-Ruby implementation

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • version_0/ChangeLog

    r593 r599  
    979730Nov07: Changed Pipe descriptors so that the child-side of the socketpair is 
    9898        NOT set nonblocking. Suggested by Duane Johnson. 
     9905Dec07: Re-enabled the pure-Ruby implementation. 

  • version_0/lib/eventmachine.rb

    r591 r599  
    3333# code will have problems of its own, and it's not nearly as fast 
    3434# anyway. Suggested by a problem report from Moshe Litvin. 05Jun07. 
     35# 
     36# 05Dec07: Re-enabled the pure-ruby mechanism, but without the automatic 
     37# fallback feature that tripped up Moshe Litvin. We shouldn't fail over to 
     38# the pure Ruby version because it's possible that the user intended to 
     39# run the extension but failed to do so because of a compilation or 
     40# similar error. So we require either a global variable or an environment 
     41# string be set in order to select the pure-Ruby version. 
     42# 
    3543 
    3644=begin 
    …… 
    5765        require 'jeventmachine' 
    5866else 
    59         require 'rubyeventmachine' 
     67        if $eventmachine_library == :pure_ruby or ENV['EVENTMACHINE_LIBRARY'] == "pure_ruby" 
     68                require 'pr_eventmachine' 
     69        else 
     70                require 'rubyeventmachine' 
     71        end 
    6072end 
    6173