Commit Graph

1513 Commits

Author SHA1 Message Date
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
zhengshuxin
ea42de6642 delete the surplus ';' in lib_icmp.h 2017-08-31 10:06:33 +08:00
郑树新
9c19a565cc Merge pull request #98 from zhengshuxin/master
add bitmap class into xcode's project
2017-08-29 18:08:07 +08:00
郑树新
a687d09c21 Merge pull request #97 from zhengshuxin/master
there's one bug in acl_aqueue_pop_timedwait when computing timeout fo…
2017-08-29 17:48:34 +08:00
zhengshuxin
3191bf51db there's one bug in acl_aqueue_pop_timedwait when computing timeout for waiting 2017-08-29 17:46:41 +08:00
郑树新
9f9a95a114 Merge pull request #96 from zhengshuxin/master
acl_mbox_read's timeout use millisecond precision
2017-08-29 11:34:18 +08:00
zhengshuxin
85b55d4e4e acl_mbox_read's timeout use millisecond precision 2017-08-29 11:32:07 +08:00
zsxxsz
2fe103d041 replace assert by acl_assert 2017-08-27 13:23:28 +08:00
zhengshuxin
c9f0a6b92e add fiber timer for C++ module 2017-08-25 13:34:48 +08:00
zhengshuxin
4b52fad552 fixed one bug in icmp module. 2017-08-24 09:31:20 +08:00
zhengshuxin
7aad3b6f4a Merge branch 'master' of https://github.com/zhengshuxin/acl into github-zsx-master 2017-08-24 09:14:14 +08:00
zhengshuxin
bdeccf1db1 modify icmp protocol 2017-08-24 09:12:10 +08:00
zhengshuxin
3554fd6b25 add lost files 2017-08-24 09:09:05 +08:00
zsxxsz
6c7fa88358 modify bitmap.hpp 2017-08-23 22:35:24 +08:00
郑树新
e4c37aed2a Merge pull request #95 from zhengshuxin/master
add bitmap class for bit operation
2017-08-23 21:37:45 +08:00
zhengshuxin
5b0cdc1fc9 add bitmap class for bit operation 2017-08-23 15:14:40 +08:00
郑树新
7b9d738afe Merge pull request #94 from zhengshuxin/master
lpop and rpop's comments are invalid in acl::redis_list
2017-08-22 22:42:16 +08:00
zsxxsz
28f805981e lpop and rpop's comments are invalid in acl::redis_list 2017-08-22 22:37:54 +08:00
郑树新
d9f6dac807 Merge pull request #92 from zhengshuxin/master
add thread_cond, thread_mutex class
2017-08-22 15:50:50 +08:00
郑树新
c45b881677 Merge pull request #91 from zhengshuxin/master
merge acl
2017-08-21 18:23:22 +08:00
zhengshuxin
c8d1252a1c Merge branch 'master' of https://github.com/zhengshuxin/acl into github-zsx-master 2017-08-21 18:21:11 +08:00
郑树新
1e0c9de674 Merge pull request #13 from acl-dev/master
add reuseport support for fiber_server.c
2017-08-21 18:09:43 +08:00
zhengshuxin
2016e3b46a fiber_server.c can support reuseport when running alonely. 2017-08-21 17:39:48 +08:00
郑树新
8e951b957d Merge pull request #90 from zhengshuxin/master
fixed vc warning about the utf-8 format with no BOM header.
2017-08-18 23:12:01 +08:00
zsxxsz
c1cf8f09a8 fixed vc warning about the utf-8 format with no BOM header. 2017-08-18 23:08:24 +08:00
郑树新
9e667f3a89 Merge pull request #89 from zhengshuxin/master
add atomic operation and modify vc projects for adding  atomic class.
2017-08-18 22:57:39 +08:00
zhengshuxin
8f58d773b4 add atomic operation and modify vc projects for adding atomic class. 2017-08-18 22:55:31 +08:00
郑树新
9bf9a5af08 Merge pull request #88 from zhengshuxin/master
icmp module can support client and server modes.
2017-08-18 18:13:48 +08:00