1140 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
zhengshuxin	08e241acb8	add trigger.hpp for trigger events by time.	2017-09-18 18:59:59 +08:00
zsxxsz	00b0561ce2	build acl on Android Studio2.3.3	2017-09-17 00:02:43 +08:00
zhengshuxin	00baff305f	rpm packaging to 3.3.0.12	2017-09-15 10:09:05 +08:00
郑树新	33ce9300d6	add project for Android Studio.	2017-09-13 18:57:12 +08:00
郑树新	0560c4f018	modify comments into thread_cond.hpp	2017-09-13 18:04:09 +08:00
郑树新	0ddf61cd7a	add comments into thread_cond.hpp & thread_mutex.hpp	2017-09-13 18:02:30 +08:00
郑树新	de4ec340a4	compiling ok on Android Studio	2017-09-13 11:30:27 +08:00
zhengshuxin	d5119d3ca1	Merge branch 'master' of https://github.com/zhengshuxin/acl into github-zsx-master	2017-09-13 11:26:28 +08:00
zhengshuxin	52b692221a	merge acl	2017-09-13 11:25:39 +08:00
zhengshuxin	8ada09778c	fixed bugs in acl_dlink.c for adding continuous integers; ... acl_dlink.c supports for adding negative integers.	2017-09-13 11:17:00 +08:00
zhengshuxin	3d864ea148	one compiling warning on clang5.0	2017-09-12 18:11:58 +08:00
zhengshuxin	dbea17b59d	add configure items into server templates' configures	2017-09-11 22:34:56 +08:00
zhengshuxin	32dede69de	add reload_timeout into main.cf of acl_master	2017-09-11 14:28:22 +08:00
zhengshuxin	70957fad04	invalid date submit from FreeBSD	2017-09-11 13:57:59 +08:00
zsx	cb1c642461	build ok for Macosx	2017-07-17 17:53:56 +08:00
zhengshuxin	b9283ffbf5	build ok on FreeBSD	2017-07-11 17:44:14 +08:00
zhengshuxin	e04cf8ec1b	build ok for FreeBSD	2017-09-11 11:59:39 +08:00
zhengshuxin	d5fe28dd8f	compile ok for centos5.x	2017-09-11 11:38:06 +08:00
郑树新	4ac182fdce	fixed compiling error on Windows by vc	2017-09-11 08:49:07 +08:00
zhengshuxin	5101ef3cc6	reload timeout can be set in acl_master	2017-09-10 17:54:07 +08:00
zhengshuxin	f17a0cd32e	modify configure content of server templates used by wizard	2017-09-10 17:39:51 +08:00
zhengshuxin	101ad0e6e1	fiber server template can tell master its status after reloading	2017-09-10 17:16:06 +08:00
zhengshuxin	5f3c319078	master can wait for the callback from children after reloading the specific service's children	2017-09-09 23:05:33 +08:00
zhengshuxin	a67e6a6338	sighup's result status from children can be got by acl_master	2017-09-09 00:30:39 +08:00
zhengshuxin	7d94dd5a04	let mbox::pop be blocked when timeout < 0	2017-09-08 19:18:49 +08:00
zhengshuxin	3d406e7277	init_conf_str_vars in master_params.cpp has memory leak when master reload configure.	2017-09-06 22:03:27 +08:00
zhengshuxin	1a36ede275	fiber_server.c supports setuping SIGTERM;	2017-09-06 15:46:39 +08:00
zhengshuxin	965ecddd16	remove watchdog from master's main.cpp	2017-09-06 13:31:12 +08:00
zhengshuxin	025a9b29f2	make master's reload safety	2017-09-06 13:19:49 +08:00
zhengshuxin	296d5a995d	master can wait until the children exited	2017-09-05 23:47:48 +08:00
zhengshuxin	bc7d725f5c	Merge branch 'master' of github:zhengshuxin/acl into github-zsx-master	2017-09-05 10:59:59 +08:00
zhengshuxin	3d02c72328	all master templates support handling SIGTERM signal.	2017-09-05 10:58:55 +08:00
zsxxsz	27fefa695c	fixed compiling error of demos on windows by vc2008	2017-09-04 23:22:35 +08:00
zhengshuxin	8582d02d2e	remove debug line in istream.cpp	2017-09-03 18:05:08 +08:00
zhengshuxin	b9fc0def8e	Merge branch 'master' of github:zhengshuxin/acl into github-zsx-master	2017-09-02 22:58:40 +08:00
zhengshuxin	89c74a1e7c	delete unused codes	2017-09-02 21:02:37 +08:00
zhengshuxin	c76d603428	remove unused code.	2017-09-02 20:55:48 +08:00
zhengshuxin	7dadf786df	add test code in mbox.hpp	2017-09-02 17:59:32 +08:00
郑树新	e31ae6c7d8	Merge pull request #102 from zhengshuxin/master ... acl::mbox using template to support generic types	2017-09-02 10:14:33 +08:00
zhengshuxin	4ade4ff521	add mbox_free in mbox.cpp	2017-09-02 10:10:17 +08:00
zhengshuxin	3465037c6b	acl::mbox, acl::atomic can be compiled ok on Linux & Windows.	2017-09-02 09:46:03 +08:00
zsxxsz	4afb237dd9	fixed compiling error by vc	2017-09-02 09:42:11 +08:00
zhengshuxin	2af766fb6e	make acl::mbox generic with c++ template method.	2017-09-01 23:14:20 +08:00
zhengshuxin	5291cd0c7a	test only	2017-09-01 18:59:42 +08:00
zhengshuxin	25d33da4de	when acl was installed into system by using rpm, the logger's compiling warn wasn't useful.	2017-09-01 17:43:12 +08:00
郑树新	a7f426cb7f	Merge pull request #100 from zhengshuxin/master ... add fiber module into package when installing	2017-09-01 13:55:23 +08:00
zhengshuxin	56b2d6115a	make lib_fiber into package installing	2017-09-01 13:53:17 +08:00
郑树新	424a543a71	add test in atomic	2017-08-31 17:52:18 +08:00
郑树新	4fae44f41f	Merge pull request #14 from acl-dev/master ... merge	2017-08-31 10:12:14 +08:00
郑树新	0f25951313	Merge pull request #99 from zhengshuxin/master ... delete the surplus ';' in lib_icmp.h	2017-08-31 10:11:34 +08:00