1290 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
zsx	a5b15ee15b	master: changed service_throttle_time from 60 to 10 in main.cf	2017-12-05 15:19:29 +08:00
zsx	11b41819fb	redis: fixed bugs for supporting binaray data	2017-12-05 12:13:50 +08:00
zsx	ea896f9aed	redis: fixed bugs when objs were binary data	2017-12-05 12:01:24 +08:00
zsx	318a2af3e7	master_ctld.conf add internal IP list	2017-12-03 23:53:46 +08:00
ubuntu14	ea4414c31e	polarssl_conf: fixed one bug	2017-12-03 15:16:43 +08:00
ubuntu14	24ba9207c6	Merge branch 'upstream-master'	2017-12-03 15:14:16 +08:00
ubuntu14	42c1eb8b2d	polarssl_conf: fixed one bug when loading polarssl library	2017-12-03 14:54:47 +08:00
郑树新	def8e5b403	Merge pull request #111 from waruqi/master ... add some xmake.lua for app	2017-12-01 17:49:16 +08:00
ruki	a65c0a3484	add some xmake.lua for app	2017-12-01 09:10:16 +08:00
zsx	95d67507d5	fiber's compile: fixed one warning when USE_JMP not be defined.	2017-11-30 10:59:25 +08:00
郑树新	74851a9105	Merge pull request #110 from waruqi/master ... add xmake.lua	2017-11-30 10:48:25 +08:00
ruki	987385ea6e	add xmake.lua	2017-11-30 10:04:15 +08:00
zsx	9af42bfdb7	rpm package: update version	2017-11-28 11:38:04 +08:00
zsx	bc2d7c81c8	fiber: eventfd should be ignored on kernel below 2.6.22.	2017-11-24 15:53:43 +08:00
zsx	71289ca92f	fiber_event is ok	2017-11-24 15:24:17 +08:00
zsx	2f81af614b	samples: fiber_event's sample changed.	2017-11-24 11:40:01 +08:00
zsx	8fca8bc485	fiber_event: delete unused codes.	2017-11-24 11:27:05 +08:00
zsx	3a290a2718	fiber lock: add comments	2017-11-24 11:25:05 +08:00
zsx	450d06a66c	fier: add acl_fiber_event_trywait	2017-11-24 11:10:44 +08:00
zsx	173e43bb47	fiber: rename acl_fiber_event_signal to acl_fibrer_event_notify.	2017-11-24 10:42:10 +08:00
zsx	0ee5df1899	fiber: add fiber_event for synchronize between threads and fibers	2017-11-24 10:39:53 +08:00
zsx	acac0ad2f8	fiber_lock: use the new fiber event lock with high performance.	2017-11-23 12:59:24 +08:00
zsx	41d1e116d1	fiber: add fiber_event.c which can support mutex lock between fibers and threads with very high performance.	2017-11-23 12:23:17 +08:00
zsx	27f13c2a13	fiber: add fiber_lock_r	2017-11-23 00:36:15 +08:00
zsx	1d35005fca	fiber: add fiber_lock_r which can use in threads + fibers	2017-11-23 00:35:51 +08:00
zsx	41d76c8a04	master: can start service with extname of command	2017-11-21 17:40:25 +08:00
zsx	a8d8f40b52	master: can start & restart one service with different extname that maybe be used for different service version	2017-11-21 16:46:39 +08:00
zsx	be83030d8d	master: add master_config command to get master's configure info.	2017-11-21 12:43:34 +08:00
郑树新	ad96211014	vc projects: remove private_global.h and add acl_define_macosx.h	2017-11-21 10:58:44 +08:00
郑树新	23f1915473	compiling: support vc2017	2017-11-20 12:15:19 +08:00
zsx	b705c59e0a	configure: main.cf changed	2017-11-19 18:20:56 +08:00
zhengshuxin	b2b6521a75	compiling error on CentOS6.x	2017-11-16 11:37:57 +08:00
zhengshuxin	0d1494c27e	rpm: add master_ctl into package	2017-11-16 11:18:22 +08:00
郑树新	a00a262f8a	build ok on windows	2017-11-14 12:09:33 +08:00
zhengshuxin	781b0a048a	add acl::tbox class for transfering messages between multi-threads.	2017-11-14 10:52:44 +08:00
zhengshuxin	b92f241603	fiber_server: not notify master in non-daemon mode	2017-11-13 21:45:59 +08:00
zhengshuxin	f931680917	bugfix: don't notify master in alone running mode.	2017-11-13 21:21:26 +08:00
zhengshuxin	54c1836d41	acl_udp_server: check ip auto.	2017-11-13 09:55:00 +08:00
zhengshuxin	3e5a449310	master: upgrade version	2017-11-13 09:51:41 +08:00
zhengshuxin	65b1bb2162	master: update vertion to 2.0	2017-11-13 09:37:54 +08:00
zhengshuxin	314e08b9f0	compiling: fixed one compiling error on FreeBSD	2017-11-13 09:26:48 +08:00
zhengshuxin	e86ae675ae	master: kill&stop one child with the specified configure file.	2017-11-12 20:41:16 +08:00
zhengshuxin	d4fb931056	code style format	2017-11-12 18:32:08 +08:00
zhengshuxin	8c70aae5fa	master: master should not fork child process after starting service failed.	2017-11-12 18:27:27 +08:00
zhengshuxin	ef7e4495ac	master: can start services specified in configure file.	2017-11-12 00:20:15 +08:00
zhengshuxin	41ce67f000	bugfix: acl_udp_server rebinding addrs	2017-11-10 22:36:03 +08:00
zhengshuxin	65a5b15315	acl_udp_server: add/del ip auto	2017-11-10 14:43:21 +08:00
zhengshuxin	8b4d78198e	bugfix: fxied deadlock in acl_mylog.c	2017-11-10 12:57:18 +08:00
zhengshuxin	acb6358d13	bugfix: fixed dead lock in acl_mylog.c	2017-11-10 12:00:43 +08:00
zhengshuxin	037d5d8994	format code style	2017-11-10 10:08:34 +08:00