rakie 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95d75f7ea14d2462c94b21bd025f17e5150075e295dd1dc9f927efb08826c424
-  data.tar.gz: 2642f719d6ae1427e99efc89b3d841fe7c7471f5cfd2da0597ad4df89d347b0e
+  metadata.gz: 8361c3cfc878d6edc052170cc5fbc5f555d173562c7325d9a939c567402e8b4f
+  data.tar.gz: cc2f7fa419c2fcb750ec70305b942336974cd7e35ad336edc38436027f74e6dd
 SHA512:
-  metadata.gz: ae10ff4d934dac0f08a066d2809930132b736e4cb4bda7f7cf25f30cc48f7554b4b474e8ee7cbb7fcd57b7b4e75157d9a592ff9a8351f3d9fbee431b4006e944
-  data.tar.gz: 287525054ef601031d860c7a8b75b1985e91d7430cee7b489b7fb726c06cbe15223c3ebd63cad3fbdf590793d3cb343dbfc0a6890cba89a9cbf6b632541ab6a2
+  metadata.gz: 1b39af452c4d98899dd787a38ce1394b1781eaee28ab3761b46b824ec4b426f76c27d451da8ae1fb01545676dd572a19f9c9dae09839221a17a5ee807a151f72
+  data.tar.gz: c7953919abc5572b8fba09a5afdf5e32034c0bc2e4fdbca4f649f67f9ec635a10cf49888a194ce67f17afda0424becd1e42467cd9b73e2a990670fd29e2c2c50

data/lib/rakie.rb

@@ -6,5 +6,7 @@ end
 require "rakie/channel"
 require "rakie/event"
 require "rakie/simple_server"
+require "rakie/http_server"
 require "rakie/tcp_channel"
 require "rakie/tcp_server_channel"
+require "rakie/log"

data/lib/rakie/channel.rb

@@ -6,6 +6,7 @@ module Rakie
       @io = io
       @read_buffer = String.new
       @write_buffer = String.new
+      @write_task = []
       @delegate = delegate
       Event.push(io, self, Event::READ_EVENT)
     end
@@ -17,20 +18,19 @@ module Rakie
         end
 
       rescue IO::EAGAINWaitReadable
-        puts("Channel read finished")
+        Log.debug("Channel read finished")
 
-      rescue
+      rescue Exception => e
         # Process the last message on exception
         if @delegate != nil
           @delegate.on_recv(self, @read_buffer)
           @read_buffer = String.new # Reset buffer
         end
 
-        puts("Channel error #{io}")
+        Log.debug("Channel error #{io}: #{e}")
         return Event::HANDLE_FAILED
       end
 
-      puts("Channel has delegate?: #{@delegate}")
       if @delegate != nil
         len = @delegate.on_recv(self, @read_buffer)
 
@@ -39,30 +39,54 @@ module Rakie
         end
 
         @read_buffer = @read_buffer[len .. -1]
-        puts("Channel handle on_recv")
+        Log.debug("Channel handle on_recv")
       end
 
       return Event::HANDLE_CONTINUED
     end
 
+    def handle_write(len)
+      task = @write_task[0]
+
+      while len > 0
+        if len < task
+          @write_task[0] = task - len
+        end
+
+        len -= task
+        @write_task.shift
+
+        if @delegate != nil
+          @delegate.on_send(self)
+           Log.debug("Channel handle on_send")
+        end
+      end
+    end
+
     def on_write(io)
+      len = 0
+
       begin
         while @write_buffer.length > 0
           len = io.write_nonblock(@write_buffer)
           @write_buffer = @write_buffer[len .. -1]
         end
 
-        puts("Channel write finished")
+        Log.debug("Channel write finished")
 
       rescue IO::EAGAINWaitWritable
-        puts("Channel write continue")
+        self.handle_write(len)
+
+        Log.debug("Channel write continue")
         return Event::HANDLE_CONTINUED
 
       rescue
-        puts("Channel close #{io}")
+        Log.debug("Channel close #{io}")
         return Event::HANDLE_FAILED
       end
 
+      self.handle_write(len)
+
       return Event::HANDLE_FINISHED
     end
 
@@ -71,8 +95,10 @@ module Rakie
         io.close
 
       rescue
-        puts("Channel is already closed")
+        Log.debug("Channel is already closed")
       end
+
+      Log.debug("Channel close ok")
     end
 
     def read(size)
@@ -96,7 +122,9 @@ module Rakie
       end
 
       @write_buffer << data
-      Event.modify(@io, self, Event::READ_EVENT | Event::WRITE_EVENT)
+      @write_task << data.length
+
+      Event.modify(@io, self, (Event::READ_EVENT | Event::WRITE_EVENT))
 
       return 0
     end

data/lib/rakie/event.rb

@@ -9,6 +9,10 @@ module Rakie
     HANDLE_CONTINUED = 0
     HANDLE_FINISHED = 1
 
+    OPERATION_ADD = 0
+    OPERATION_MODIFY = 1
+    OPERATION_DELETE = 2
+
     def initialize
       @wait_ios = []
       @lock = Mutex.new
@@ -24,36 +28,39 @@ module Rakie
     
     def process_signal(io)
       signal = io.read(1)
-      puts("Event handling #{signal}")
 
-      if signal == 'a'
-        new_io, new_handler, new_event = @wait_ios.shift
+      if signal == 'q'
+        return 1
+      end
+
+      operation, new_io, new_handler, new_event = @wait_ios.shift
+      if new_io.closed?
+        return 0
+      end
+
+      Log.debug("Event handling #{signal} with #{new_io.fileno} to #{new_event}")
+
+      if operation == OPERATION_ADD
         @ios[new_io] = new_event
         @handlers[new_io] = new_handler
-        puts("Event add all #{new_io} to #{new_event}")
+        Log.debug("Event add all #{new_io.fileno} to #{new_event}")
 
-      elsif signal == 'd'
-        new_io, = @wait_ios.shift
+      elsif operation == OPERATION_DELETE
         handler = @handlers[new_io]
 
         if handler != nil
+          Log.debug("Event close #{new_io}")
           handler.on_close(new_io)
-          puts("Event close #{new_io}")
         end
 
         @ios.delete(new_io)
         @handlers.delete(new_io)
+        Log.debug("Event remove all #{new_io}")
 
-        puts("Event remove all #{new_io}")
-
-      elsif signal == 'm'
-        new_io, new_handler, new_event = @wait_ios.shift
+      elsif operation == OPERATION_MODIFY
         @ios[new_io] = new_event
         @handlers[new_io] = new_handler
-        puts("Event modify all #{new_io} to #{new_event}")
-
-      elsif signal == 'q'
-        return 1
+        Log.debug("Event modify all #{new_io.fileno} to #{new_event}")
       end
 
       return 0
@@ -61,9 +68,18 @@ module Rakie
 
     def run_loop
       loop do
+        # p @ios
+        # begin
+        #   read_ios = @ios.select {|k, v| v & READ_EVENT > 0}
+        #   write_ios = @ios.select {|k, v| v & WRITE_EVENT > 0}
+        # rescue Exception => e
+        #   p @ios
+        # end
+
         read_ios = @ios.select {|k, v| v & READ_EVENT > 0}
         write_ios = @ios.select {|k, v| v & WRITE_EVENT > 0}
 
+        # Log.debug("Event selecting ...")
         read_ready, write_ready = IO.select(read_ios.keys, write_ios.keys, [], 5)
 
         if read_ready != nil
@@ -90,15 +106,15 @@ module Rakie
 
             if result == HANDLE_FINISHED
               @ios[io] = @ios[io] & ~READ_EVENT
-              puts("Event remove read #{io}")
+              Log.debug("Event remove read #{io}")
 
             elsif result == HANDLE_FAILED
               handler.on_close(io)
-              puts("Event close #{io}")
+              Log.debug("Event close #{io}")
 
               @ios.delete(io)
               @handlers.delete(io)
-              puts("Event remove all #{io}")
+              Log.debug("Event remove all #{io}")
             end
           end
         end
@@ -115,15 +131,15 @@ module Rakie
 
             if result == HANDLE_FINISHED
               @ios[io] = @ios[io] & ~WRITE_EVENT
-              puts("Event remove write #{io}")
+              Log.debug("Event remove write #{io}")
 
             elsif result == HANDLE_FAILED
               handler.on_close(io)
-              puts("Event close #{io}")
+              Log.debug("Event close #{io}")
 
               @ios.delete(io)
               @handlers.delete(io)
-              puts("Event remove all #{io}")
+              Log.debug("Event remove all #{io}")
             end
           end
         end
@@ -132,22 +148,22 @@ module Rakie
 
     def push(io, handler, event)
       @lock.lock
-      @wait_ios.push([io, handler, event])
+      @wait_ios.push([OPERATION_ADD, io, handler, event])
       @signal_out.write('a')
       @lock.unlock
     end
 
     def delete(io)
       @lock.lock
-      @wait_ios.push([io, nil, nil])
-      @signal_out.write('d')
+      @wait_ios.push([OPERATION_DELETE, io, nil, nil])
+      @signal_out.write('a')
       @lock.unlock
     end
 
     def modify(io, handler, event)
       @lock.lock
-      @wait_ios.push([io, handler, event])
-      @signal_out.write('m')
+      @wait_ios.push([OPERATION_MODIFY, io, handler, event])
+      @signal_out.write('a')
       @lock.unlock
     end
 

data/lib/rakie/simple_server.rb

@@ -31,7 +31,7 @@ module Rakie
           :entity => ""
         }
       }
-      puts("SimpleServer accept client: #{channel}")
+      Log.debug("SimpleServer accept client: #{channel}")
     end
 
     def parse_data_type(client, data)
@@ -41,7 +41,7 @@ module Rakie
         client[:parse_status] = PARSE_LEN
         client[:parse_offset] += 1
 
-        puts("SimpleServer parse data type ok")
+        Log.debug("SimpleServer parse data type ok")
         return PARSE_OK
       end
 
@@ -63,7 +63,7 @@ module Rakie
         client[:parse_status] = PARSE_ENTITY
         client[:parse_offset] = offset + 4
 
-        puts("SimpleServer parse data len ok")
+        Log.debug("SimpleServer parse data len ok")
         return PARSE_OK
       end
 
@@ -79,7 +79,7 @@ module Rakie
         client[:parse_status] = PARSE_TYPE
         client[:parse_offset] = offset + len
 
-        puts("SimpleServer parse data entity ok")
+        Log.debug("SimpleServer parse data entity ok")
         return PARSE_COMPLETE
       end
 
@@ -104,7 +104,7 @@ module Rakie
         end
       end
 
-      puts("SimpleServer parse data result #{result}")
+      Log.debug("SimpleServer parse data result #{result}")
 
       return result
     end
@@ -117,13 +117,11 @@ module Rakie
     end
 
     def on_recv(channel, data)
-      puts("SimpleServer recv: #{data}")
+      Log.debug("SimpleServer recv: #{data}")
       client = @clients[channel]
       client[:parse_offset] = 0
       result = self.parse_data(client, data)
 
-      pp client
-
       if result == PARSE_COMPLETE
         if @delegate != nil
           @delegate.handle(client[:request], client[:response])
@@ -137,7 +135,7 @@ module Rakie
       elsif result == PARSE_ERROR
         channel.close
         @clients.delete(channel)
-        puts("SimpleServer: Illegal request")
+        Log.debug("SimpleServer: Illegal request")
         return client[:parse_offset]
       end
 
@@ -145,5 +143,3 @@ module Rakie
     end
   end
 end
-
-require "pp"

data/lib/rakie/tcp_server_channel.rb

@@ -22,21 +22,21 @@ module Rakie
         channel = Channel.new(client_io)
 
         if @delegate != nil
-          puts("TCPServerChannel has delegate")
+          Log.debug("TCPServerChannel has delegate")
           @delegate.on_accept(channel)
 
         else
-          puts("TCPServerChannel no delegate")
+          Log.debug("TCPServerChannel no delegate")
           @clients << channel
         end
 
-        puts("TCPServerChannel accept #{channel}")
+        Log.debug("TCPServerChannel accept #{channel}")
 
       rescue IO::EAGAINWaitReadable
-        puts("TCPServerChannel accept wait")
+        Log.debug("TCPServerChannel accept wait")
 
       rescue
-        puts("TCPServerChannel Accept failed #{io}")
+        Log.debug("TCPServerChannel Accept failed #{io}")
         return Event::HANDLE_FAILED
       end
 

data/test/test_rakie.rb

@@ -1,5 +1,10 @@
-require 'test/unit'
+require 'minitest/autorun'
+require "rakie"
 
-class RakieTest < Test::Unit::TestCase
-  
+class RakieTest < Minitest::Test
+  def test_log
+    Rakie::Log.info('test message')
+    Rakie::Log.error('test message')
+    Rakie::Log.debug('test message')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rakie
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jakit Liang