merona 1.1.8 → 1.1.9

data/frame/handler/ping_handler.rb

@@ -1,8 +1,3 @@
-require 'win32api'
-
-$t = Win32API.new("kernel32", "GetTickCount", nil, 'L')
-$t.call()
-
 class PingHandler < Handler
 	def recv(server,connection,packet)
 		case packet.id

data/frame/main.rb

@@ -2,8 +2,11 @@
 
 import 'merona'
 
+import 'dbms/*'
+import 'sharedmem/*'
 import 'handler/*'
 import 'protocol/*'
+
 import 'config/*'
 
 begin
@@ -26,5 +29,5 @@ begin
 	end
 	
 rescue
-	Log.error "[Error] : #{$!}"
+	Log.error "#{$!}"
 end

data/frame/protocol/ping_protocol.rb

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

data/lib/channel/channel.rb

@@ -18,8 +18,9 @@ class Channel
 		end
 	end
 	def publish(packet)
+		freezed = packet.freeze
 		@clients.each do |client|
-			client.send packet
+			client.send_data freezed
 		end
 	end
 end

data/lib/channel/channel_pool.rb

@@ -1,13 +1,19 @@
 class ChannelPool
+	# ChannelPool�� �ʱ�ȭ�Ѵ�.
 	def initialize
 		@channel = {}
 	end
+	
+	# ChannelPool�� �����Ѵ�.
 	def dispose
 	end
 	
 	# ä�� �̸��� ��ūȭ�ؼ� �ֻ��� ������ ä�ο� ������ �� ����
 	# �ڵ� ������ �����Ų��.
 	#
+	# name : ��ūȭ�� ä�� �̸�
+	# &block : ��ū �� ����� ����
+	#
 	# ex ) "ch.map.party"
 	#       "ch.map"
 	#       "ch"
@@ -25,6 +31,9 @@ class ChannelPool
 	end
 	
 	# ������ �̸��� ä���� �����Ѵ�
+	#
+	# name : ������ ä���� �̸�
+	# client : ������ Ŭ���̾�Ʈ
 	def subscribe(name, client)
 		tokenize(name) do |t|
 			subscribe t, client
@@ -38,6 +47,9 @@ class ChannelPool
 	end
 	
 	# ������ �̸��� ä���� ������ �����Ѵ�
+	#
+	# name : ���� ������ ä���� �̸�
+	# client : ���� ������ Ŭ���̾�Ʈ
 	def unsubscribe(name, client)
 		tokenize(name) do |t|
 			unsubscribe t, client
@@ -51,19 +63,12 @@ class ChannelPool
 	end
 	
 	# ������ �̸��� ä�ο� ��Ŷ�� �����Ѵ�
-	# 
-	# to_super ���ڰ� true�� ��� ���� ä�� ��ο��� ��Ŷ�� ����
-	def publish(name, packet, to_super = false)
-		if to_super == true
-			tokenize(name) do |t|
-				publish t, packet
-			end
-		end
-		
+	#
+	# name : ������ ä���� �̸�
+	# packet : ������ ��Ŷ
+	def publish(name, packet)
 		return if @channel[name] == nil
 		
-		@channel[name].each do |client|
-			client.publish packet
-		end
+		@channel[name].publish packet
 	end
 end

data/lib/handler/chat_handler.rb

@@ -2,7 +2,7 @@ class ChatHandler < Handler
 	def recv(server,connection,packet)
 		case packet.id
 			when Protocol::CHAT
-				puts "[#{packet["sender"]}] : #{packet["msg"]}"
+				#puts "[#{packet["sender"]}] : #{packet["msg"]}"
 				
 				reply = Packet.new
 				reply.id = Protocol::CHAT

data/lib/handler/handler.rb

@@ -4,6 +4,11 @@ class Handler
 	def dispose
 	end
 	
+	# ��Ŷ�� �������� �� �ҷ����� �޼ҵ�
+	#
+	# server : ������ ����
+	# connection : ��Ŷ�� ���� Ŭ���̾�Ʈ
+	# packet : ������ ��Ŷ
 	def recv(server,connection,packet)
 		#case packet.id
 		#	when Protocol::PacketID

data/lib/packet/packet.rb

@@ -13,6 +13,11 @@ class Packet
 	def dispose
 	end
 	
+	def freeze
+		data = Marshal.dump(self)
+        [data.respond_to?(:bytesize) ? data.bytesize : data.size, data].pack('Na*')
+	end
+	
 	# ��Ŷ�� �����͸� �ִ´�
 	def push(name,data)
 		if name == nil

data/lib/process/process_pool.rb

@@ -18,12 +18,19 @@ class ProcessPool
 	def dispose
 	end
 	
+	# ������ ������ŭ�� �ϲ��� �����Ѵ�
+	#
+	# n : ������ �ϲ��� ����
 	def create_worker(n)
 		n.times do
 			thread = Thread.new do
 				while true
 					item = @queue.deq(false)
-
+					
+					if item.sender.is_alive? == false
+						next
+					end
+					
 					@server.handler.each do |handler|
 						handler.recv(@server, item.sender, item.packet)
 					end
@@ -33,12 +40,18 @@ class ProcessPool
 			@worker.push thread
 		end
 	end
+	
+	# ��� �ϲ��� ������
 	def kill
 		@worker.each do |worker|
 			worker.kill
 		end
 	end
 	
+	# ť�� ��Ŷ�� �ִ´�
+	#
+	# sender : ��Ŷ�� ������ Ŭ���̾�Ʈ
+	# item : ���� ��Ŷ
 	def enqueue(sender, item)
 		@queue.push WorkItem.new(sender, item)
 	end

data/lib/server/connection.rb

@@ -18,6 +18,8 @@ class Connection < EM::Connection
 		connect
 		
 		set_sock_opt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, CONNECTION_NODELAY)
+		
+		@connected = true
 	end
 	# ������ ������ �� �ҷ����� �޼ҵ�
 	def unbind
@@ -26,13 +28,8 @@ class Connection < EM::Connection
 		@mem.dispose
 		
 		disconnect
-	end
-	
-	# ���� Ŭ���̾�Ʈ�� ��Ŷ�� �����Ѵ�
-	#
-	# packet : ���� ��Ŷ
-	def send(packet)
-		send_object packet
+		
+		@connected = false
 	end
 	
 	# ���� Ŭ���̾�Ʈ�� ��Ŷ�� �޾��� �� �ҷ����� �޼ҵ�
@@ -51,4 +48,9 @@ class Connection < EM::Connection
 	def disconnect
 		Log.output("lost connection " + @ip)
 	end
+	
+	# ���� Ŭ���̾�Ʈ�� ���� ���¸� �����Ѵ�.
+	def is_alive?
+		@connected
+	end
 end

data/lib/server/server.rb

@@ -14,7 +14,7 @@ class Server
 	# port : ������ ��Ʈ
 	# klass : Connection �ڵ鷯 Ŭ����
 	def initialize(name,port,klass=Connection)
-		EventMachine.start_server("localhost", port, klass, self)
+		EventMachine.start_server("0.0.0.0", port, klass, self)
 
 		@clients = Array.new
 		@handler = Array.new

data/tests/{test_chat.rb → old/test_chat.rb}

@@ -1,23 +1,23 @@
-require 'socket'
-
-load '../lib/protocol/chat_protocol.rb'
-load '../lib/packet/packet.rb'
-load '../lib/packet/chat_packet.rb'
-
-load 'test_util.rb'
-
-if ARGV.size == 2
-	addr = ARGV[0]
-	port = ARGV[1]
-else
-	addr = "localhost"
-	port = 9916
-end
-sock = TCPSocket.new addr, port
-
-packet = ChatPacket.new
-packet.id = Protocol::CHAT
-packet.sender = "Aqwer"
-packet.msg = "AEWF"
-
+require 'socket'
+
+load '../lib/protocol/chat_protocol.rb'
+load '../lib/packet/packet.rb'
+load '../lib/packet/chat_packet.rb'
+
+load 'test_util.rb'
+
+if ARGV.size == 2
+	addr = ARGV[0]
+	port = ARGV[1]
+else
+	addr = "localhost"
+	port = 9916
+end
+sock = TCPSocket.new addr, port
+
+packet = ChatPacket.new
+packet.id = Protocol::CHAT
+packet.sender = "Aqwer"
+packet.msg = "AEWF"
+
 send_obj(sock, packet)

data/tests/{test_connect.rb → old/test_connect.rb}

@@ -1,42 +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'
-
-class Connection < EM::Connection
-	include EM::P::ObjectProtocol
-	
-	def initialize(*args)
-		p = Packet.new
-		p.id = Protocol::SUBSCRIBE
-		send_object p
-		
-		p.id = Protocol::SYNC
-		p["x"] = 1
-		p["y"] = 2
-		p["oid"] = 3
-		
-		100.times do
-			send_object p
-		end
-	end
-	def unbind
-	end
-	
-	def receive_object(obj)
-		p obj
-	end
-end
-
-EM::run do
-	EM::connect "localhost", 9916, Connection
-end
-
-while true
-	sleep 1
-end
-
+require 'eventmachine'
+
+load '../lib/packet/packet.rb'
+load '../lib/protocol/pubsub_protocol.rb'
+load '../lib/protocol/sync_protocol.rb'
+
+load 'test_util.rb'
+
+class Connection < EM::Connection
+	include EM::P::ObjectProtocol
+	
+	def initialize(*args)
+		p = Packet.new
+		p.id = Protocol::SUBSCRIBE
+		send_object p
+		
+		p.id = Protocol::SYNC
+		p["x"] = 1
+		p["y"] = 2
+		p["oid"] = 3
+		
+		100.times do
+			send_object p
+		end
+	end
+	def unbind
+	end
+	
+	def receive_object(obj)
+		p obj
+	end
+end
+
+EM::run do
+	EM::connect "localhost", 9916, Connection
+end
+
+while true
+	sleep 1
+end
+
 	

data/tests/{test_ping.rb → old/test_ping.rb}

@@ -1,42 +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
-
+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
+
 	

data/tests/{test_sqlite.rb → old/test_sqlite.rb}

@@ -1,29 +1,29 @@
-load '../lib/db/database.rb'
-load '../lib/db/sqlite.rb'
-
-load 'test_util.rb'
-
-begin
-
-	db = SQLite.new("test.db")
-
-	# create table
-	db.execute "create table account(id TEXT, nick TEXT)"
-	db.insert("account", "id, nick", "'hello', 'world'")
-	db.insert("account", "id, nick", "'aaa', 'bbb'")
-	db.insert("account", "id, nick", "'foo', 'bar'")
-
-	# enum table data
-	rs = db.select("account", "*")
-	
-	while (row = rs.next)
-		p row
-	end
-	
-	rs.close
-
-	db.dispose
-	
-rescue SQLite3::Exception => e 
-	puts "[error] " + e.to_s
+load '../lib/db/database.rb'
+load '../lib/db/sqlite.rb'
+
+load 'test_util.rb'
+
+begin
+
+	db = SQLite.new("test.db")
+
+	# create table
+	db.execute "create table account(id TEXT, nick TEXT)"
+	db.insert("account", "id, nick", "'hello', 'world'")
+	db.insert("account", "id, nick", "'aaa', 'bbb'")
+	db.insert("account", "id, nick", "'foo', 'bar'")
+
+	# enum table data
+	rs = db.select("account", "*")
+	
+	while (row = rs.next)
+		p row
+	end
+	
+	rs.close
+
+	db.dispose
+	
+rescue SQLite3::Exception => e 
+	puts "[error] " + e.to_s
 end

data/tests/{test_util.rb → old/test_util.rb}

@@ -1,6 +1,6 @@
-require 'socket'
-
-def send_obj(sock,obj)
-	data = Marshal.dump(obj)
-	sock.send [data.respond_to?(:bytesize) ? data.bytesize : data.size, data].pack('Na*'), 0
+require 'socket'
+
+def send_obj(sock,obj)
+	data = Marshal.dump(obj)
+	sock.send [data.respond_to?(:bytesize) ? data.bytesize : data.size, data].pack('Na*'), 0
 end

data/tests/server/echo_server/config/config_connection.rb

@@ -0,0 +1 @@
+CONNECTION_NODELAY = 1

data/tests/server/echo_server/config/config_db.rb

@@ -0,0 +1,3 @@
+DB = SQLite
+
+DB_ACCOUNT = "database/account.db"

data/tests/server/echo_server/config/config_server.rb

@@ -0,0 +1 @@
+SERVER_WORKERS = 5

data/tests/server/echo_server/config/config_sharedmem.rb

@@ -0,0 +1,4 @@
+SHAREDMEM = RedisMemory
+
+SHAREDMEM_HOST = "localhost"
+SHAREDMEM_PORT = 6379

data/tests/server/echo_server/handler/echo_handler.rb

@@ -0,0 +1,8 @@
+class EchoHandler < Handler
+	def recv(server,connection,packet)
+		case packet.id
+			when Protocol::ECHO
+				connection.send packet
+		end
+	end
+end

data/tests/server/echo_server/main.rb

@@ -0,0 +1,30 @@
+# Merona main
+
+import 'merona'
+
+import 'dbms/*'
+import 'sharedmem/*'
+import 'handler/*'
+import 'protocol/*'
+
+import 'config/*'
+
+begin
+	if meInitialize
+		Log.output "Merona engine started"
+	else
+		Log.error "Cannot initialize Merona!!"
+	end
+	
+	polling do
+		# write code here
+		
+		$oid = 0
+	
+		echo = Server.new("echo_server", 9916)
+		echo.add_handler EchoHandler
+	end
+	
+rescue
+	Log.error "#{$!}"
+end

data/tests/server/echo_server/merona.rb

@@ -0,0 +1,29 @@
+# Merona entry
+
+require 'rubygems'
+require 'fileutils'
+
+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 = $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 }
+	else
+		require _path
+	end
+end
+
+import 'main.rb'
+

data/tests/server/echo_server/protocol/ping_protocol.rb

@@ -0,0 +1,3 @@
+class Protocol
+	ECHO = 1
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merona
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -97,16 +97,23 @@ files:
 - 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
+- tests/old/test_chat.rb
+- tests/old/test_connect.rb
+- tests/old/test_ping.rb
+- tests/old/test_sqlite.rb
+- tests/old/test_util.rb
+- tests/server/echo_server/config/config_connection.rb
+- tests/server/echo_server/config/config_db.rb
+- tests/server/echo_server/config/config_server.rb
+- tests/server/echo_server/config/config_sharedmem.rb
+- tests/server/echo_server/handler/echo_handler.rb
+- tests/server/echo_server/main.rb
+- tests/server/echo_server/merona.rb
+- tests/server/echo_server/protocol/ping_protocol.rb
 - bin/merona
 homepage: http://github.com/pjc0247/Merona
 licenses: []

data/frame/log/2013.2.27.log

@@ -1,16 +0,0 @@
-[2013:2:27:8:24:13] [LOG] : Merona engine started
-[2013:2:27:8:24:14] [LOG] : quit by user
-[2013:2:27:8:24:23] [LOG] : Merona engine started
-[2013:2:27:8:24:24] [LOG] : quit by user
-[2013:2:27:8:24:34] [LOG] : Merona engine started
-[2013:2:27:8:24:43] [LOG] : quit by user
-[2013:2:27:8:27:36] [LOG] : Merona engine started
-[2013:2:27:8:27:37] [LOG] : quit by user
-[2013:2:27:8:27:55] [LOG] : Merona engine started
-[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