merona 1.1.6 → 1.1.8

data/frame/handler/ping_handler.rb

@@ -0,0 +1,13 @@
+require 'win32api'
+
+$t = Win32API.new("kernel32", "GetTickCount", nil, 'L')
+$t.call()
+
+class PingHandler < Handler
+	def recv(server,connection,packet)
+		case packet.id
+			when Protocol::PING
+				connection.send packet
+		end
+	end
+end

data/frame/log/2013.2.27.log

@@ -10,3 +10,7 @@
 [2013:2:27:8:27:58] [LOG] : quit by user
 [2013:2:27:8:29:30] [LOG] : Merona engine started
 [2013:2:27:8:29:31] [LOG] : quit by user
+[2013:2:27:18:44:23] [LOG] : Merona engine started
+[2013:2:27:18:44:25] [LOG] : quit by user
+[2013:2:27:18:44:40] [LOG] : Merona engine started
+[2013:2:27:18:44:42] [LOG] : quit by user

data/frame/main.rb

@@ -1,6 +1,9 @@
 # Merona main
 
 import 'merona'
+
+import 'handler/*'
+import 'protocol/*'
 import 'config/*'
 
 begin
@@ -19,6 +22,7 @@ begin
 		test.add_handler ChatHandler
 		test.add_handler PubsubHandler
 		test.add_handler SyncHandler
+		test.add_handler PingHandler
 	end
 	
 rescue

data/frame/merona.rb

@@ -1,20 +1,22 @@
 # Merona entry
 
 require 'rubygems'
+require 'fileutils'
 
-meorna_path = Gem::bin_path('merona', 'merona')
-meorna_path.reverse!
-meorna_path = path.split("/", 3)[2]
-meorna_path.reverse!
-meorna_path += "/lib"
-
-$LOAD_PATH << meorna_path
-$LOAD_PATH << File.dirname(File.expand_path(__FILE__))
+FileUtils.cd(File.dirname(File.expand_path(__FILE__)), :verbose => true)
 
+$merona_path = Gem::bin_path('merona', 'merona')
+$merona_path.reverse!
+$merona_path = $merona_path.split("/", 3)[2]
+$merona_path.reverse!
+$merona_path += "/lib"
+	
+$LOAD_PATH << $merona_path
+$LOAD_PATH << "."
 
 def import(_path)
 	if _path[_path.length-1] == '*'
-		path = meorna_path + _path
+		path = $merona_path + "/" + _path
 		Dir[path[0..path.length-1] + "*.rb"].each {|file| require file }
 		path = "./" + _path
 		Dir[path[0..path.length-1] + "*.rb"].each {|file| require file }

data/frame/protocol/ping_protocol.rb

@@ -0,0 +1,4 @@
+# 1400 ~ 1499
+class Protocol
+	PING = 1
+end

data/lib/channel/channel.rb

@@ -6,10 +6,10 @@ class Channel
 	end
 
 	def subscribe(client)
-		@clients.push name
+		@clients.push client
 	end
 	def unsubscribe(client)
-		@clients.delete name
+		@clients.delete client
 		
 		if @clients.size == 0
 			return nil

data/lib/channel/channel_pool.rb

@@ -5,6 +5,12 @@ class ChannelPool
 	def dispose
 	end
 	
+	# ä�� �̸��� ��ūȭ�ؼ� �ֻ��� ������ ä�ο� ������ �� ����
+	# �ڵ� ������ �����Ų��.
+	#
+	# ex ) "ch.map.party"
+	#       "ch.map"
+	#       "ch"
 	def tokenize(name, &block)
 		token = name.split(".")
 		if token.size > 1
@@ -18,17 +24,20 @@ class ChannelPool
 		end
 	end
 	
+	# ������ �̸��� ä���� �����Ѵ�
 	def subscribe(name, client)
 		tokenize(name) do |t|
 			subscribe t, client
 		end
 		
 		if @channel[name] == nil
-			@channel[name] = Array.new
+			@channel[name] = Channel.new
 		end
 		
-		@channel[name].push client
+		@channel[name].subscribe client
 	end
+	
+	# ������ �̸��� ä���� ������ �����Ѵ�
 	def unsubscribe(name, client)
 		tokenize(name) do |t|
 			unsubscribe t, client
@@ -36,21 +45,25 @@ class ChannelPool
 		
 		return if @channel[name] == nil
 		
-		@channel[name].delete client
-		
-		if @channel[name].size == 0
-			@channel[name] = nil
+		if not @channel[name].unsubscribe(client)
+			@channel[name].delete name
 		end
 	end
-	def publish(name, packet)
-		tokenize(name) do |t|
-			publish t, packet
+	
+	# ������ �̸��� ä�ο� ��Ŷ�� �����Ѵ�
+	# 
+	# to_super ���ڰ� true�� ��� ���� ä�� ��ο��� ��Ŷ�� ����
+	def publish(name, packet, to_super = false)
+		if to_super == true
+			tokenize(name) do |t|
+				publish t, packet
+			end
 		end
 		
 		return if @channel[name] == nil
 		
 		@channel[name].each do |client|
-			client.send packet
+			client.publish packet
 		end
 	end
 end

data/lib/packet/packet.rb

@@ -4,15 +4,16 @@ class Packet
 	attr_accessor :data
 	attr_accessor :ch
 	
-	def initialize
+	def initialize(id = 0, ch = "*")
 		@data = {}
 		
-		@id = -1
-		@ch = "*"
+		@id = id
+		@ch = ch
 	end
 	def dispose
 	end
 	
+	# ��Ŷ�� �����͸� �ִ´�
 	def push(name,data)
 		if name == nil
 			return
@@ -20,6 +21,8 @@ class Packet
 		
 		@data[name] = data
 	end
+	
+	# ��Ŷ���� �����͸� �����´�
 	def get(name)
 		if name == nil
 			return
@@ -28,24 +31,23 @@ class Packet
 		@data[name]
 	end
 	
+	# ��Ŷ�� �����͸� �ִ´�
 	def []=(name,data)
 		push(name, data)
 	end
+	
+	# ��Ŷ���� �����͸� �����´�
 	def [](name)
 		get(name)
 	end
 
+	# ��Ŷ�� ������ ä���� �����Ѵ�
 	def ch=(ch)
 		@ch = ch
 	end
+	
+	# ��Ŷ�� ä�� ���� �����´�
 	def ch
 		@ch
 	end
-	
-	def type=(type)
-		@data["type"] = type
-	end
-	def type
-		@data["type"]
-	end
 end

data/lib/process/process_pool.rb

@@ -28,9 +28,9 @@ class ProcessPool
 						handler.recv(@server, item.sender, item.packet)
 					end
 				end
-				
-				@worker.push thread
 			end
+			
+			@worker.push thread
 		end
 	end
 	def kill

data/lib/server/connection.rb

@@ -6,6 +6,7 @@ class Connection < EM::Connection
 	attr_accessor :id
 	attr_reader :ip, :port
 	
+	# ������ �ʱ�ȭ�� �� �ҷ����� �޼ҵ�
 	def initialize(*args)
 		@port, @ip = Socket.unpack_sockaddr_in(get_peername)
 		@server = args[0]
@@ -18,6 +19,7 @@ class Connection < EM::Connection
 		
 		set_sock_opt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, CONNECTION_NODELAY)
 	end
+	# ������ ������ �� �ҷ����� �޼ҵ�
 	def unbind
 		@server.clients.delete self
 		@db.dispose
@@ -26,17 +28,26 @@ class Connection < EM::Connection
 		disconnect
 	end
 	
+	# ���� Ŭ���̾�Ʈ�� ��Ŷ�� �����Ѵ�
+	#
+	# packet : ���� ��Ŷ
 	def send(packet)
 		send_object packet
 	end
+	
+	# ���� Ŭ���̾�Ʈ�� ��Ŷ�� �޾��� �� �ҷ����� �޼ҵ�
+	#
+	# obj : ���ŵ� ��Ŷ
 	def receive_object(obj)
-		p obj
 		@server.process.enqueue(self, obj)
 	end
 	
+	
+	# ������ �����Ǿ��� �� �ҷ����� �޼ҵ�
 	def connect
 		Log.output("new connection from " + @ip)
 	end
+	# ������ ����� �� �ҷ����� �޼ҵ�
 	def disconnect
 		Log.output("lost connection " + @ip)
 	end

data/lib/server/server.rb

@@ -8,6 +8,11 @@ class Server
 	
 	attr_accessor :clients
 	
+	# ������ �����Ѵ�
+	#
+	# name : ������ �̸�
+	# port : ������ ��Ʈ
+	# klass : Connection �ڵ鷯 Ŭ����
 	def initialize(name,port,klass=Connection)
 		EventMachine.start_server("localhost", port, klass, self)
 
@@ -23,13 +28,22 @@ class Server
 		
 		$server[@name] = self
 	end
+	
+	# ������ �ڿ��� �����Ѵ�
 	def dispose
 		$server.delete @name
 	end
 	
+	# ������ �ڵ鷯�� �߰��Ѵ�
+	#
+	# handler : �߰��� �ڵ鷯 Ŭ����
 	def add_handler(handler)
 		@handler.push handler.new
 	end
+	
+	# ������ ��ϵ� �ڵ鷯�� �����Ѵ�
+	#
+	# handler : ������ �ڵ鷯 Ŭ����
 	def delete_handler(handler)
 		@handler.each do |value|
 			if value.class == handler
@@ -38,9 +52,17 @@ class Server
 		end
 	end
 	
+	# �ش� ������ ������ Ŭ���̾�Ʈ ����� ���´�
+	#
+	# connection : ������ ����
 	def exclude(connection)
 		@clients.reject { |c| connection == c }
 	end
+	
+	# ��� Ŭ���̾�Ʈ���� ��Ŷ�� ��ε�ij�����Ѵ�
+	#
+	# packet : ��ε�ij������ ��Ŷ
+	# exclusion : ������ Ŭ���̾�Ʈ
 	def broadcast(packet, exclusion = nil)
 		(exclusion ? exclude(exclusion) : @clients).each do |client|
 			client.send packet

data/tests/test_ping.rb

@@ -0,0 +1,42 @@
+require 'eventmachine'
+
+load '../lib/packet/packet.rb'
+load '../lib/protocol/pubsub_protocol.rb'
+load '../lib/protocol/sync_protocol.rb'
+
+load 'test_util.rb'
+
+require 'Win32API'
+
+$t = Win32API.new("kernel32", "GetTickCount", nil, 'L')
+$t.call()
+
+class Connection < EM::Connection
+	include EM::P::ObjectProtocol
+	
+	def initialize(*args)
+		p = Packet.new
+		p.id = Protocol::SUBSCRIBE
+		send_object p
+		
+		p.id = 1
+		
+		100.times do
+			p["ping"] = $t.call()	
+			send_object p
+			p "send " + ($t.call() - p["ping"]).to_s
+		end
+	end
+	def unbind
+	end
+	
+	def receive_object(obj)
+		p "reply " + ($t.call() - obj["ping"]).to_s
+	end
+end
+
+EM::run do
+	EM::connect "localhost", 9916, Connection
+end
+
+	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merona
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -80,7 +80,6 @@ files:
 - lib/handler/sync_handler.rb
 - lib/handler/user_handler.rb
 - lib/merona.rb
-- lib/packet/chat_packet.rb
 - lib/packet/packet.rb
 - lib/process/process_pool.rb
 - lib/protocol/chat_protocol.rb
@@ -97,12 +96,15 @@ files:
 - frame/config/config_server.rb
 - frame/config/config_sharedmem.rb
 - frame/database/account.db
+- frame/handler/ping_handler.rb
 - frame/log/2013.2.27.log
 - frame/main.rb
 - frame/merona.rb
+- frame/protocol/ping_protocol.rb
 - frame/run.bat
 - tests/test_chat.rb
 - tests/test_connect.rb
+- tests/test_ping.rb
 - tests/test_sqlite.rb
 - tests/test_util.rb
 - bin/merona

data/lib/packet/chat_packet.rb

@@ -1,26 +0,0 @@
-class ChatPacket < Packet
-	def initialize
-		super
-		@id = Protocol::CHAT
-	end
-	
-	def msg=(msg)
-		@data["msg"] = msg
-	end
-	def msg
-		@data["msg"]
-	end
-	
-	def sender=(id)
-		@data["sender"] = id
-	end
-	def sender
-		@data["sender"]
-	end
-	def receiver(id)
-		@data["receiver"] = id
-	end
-	def receiver
-		@data["receiver"]
-	end
-end