2226 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	de5e2d0a40	Revert "Revert "for bug #194, refine the config"" ... This reverts commit b4c1d55311.	2014-11-11 17:12:45 +08:00
winlin	c3d98fd720	Merge branch 'srs.master'	2014-11-11 17:06:49 +08:00
winlin	b4c1d55311	Revert "for bug #194, refine the config" ... This reverts commit 2a55ae4317.	2014-11-11 17:05:36 +08:00
winlin	e87eacd499	Revert "add srs pipe for bug #194" ... This reverts commit f9756ea14c.	2014-11-11 17:05:25 +08:00
winlin	73abb1a31d	Revert "for bug #194, add pipe to consumer." ... This reverts commit 1e601a6efc.	2014-11-11 17:04:56 +08:00
winlin	306f75b267	Revert "for bug#194, open pipe for each connection." ... This reverts commit ade81bb244.	2014-11-11 17:04:32 +08:00
winlin	0e2c8da2a2	Merge branch 'srs.master'	2014-11-11 17:02:40 +08:00
winlin	bf5206d049	Revert "Revert "add test file to show the max open files."" ... This reverts commit ea70f29648.	2014-11-11 17:02:16 +08:00
winlin	9d01210515	Merge branch 'srs.master'	2014-11-11 16:57:04 +08:00
winlin	ea70f29648	Revert "add test file to show the max open files." ... This reverts commit c8673cd50e.	2014-11-11 16:55:46 +08:00
winlin	0285395628	Merge branch 'srs.master'	2014-11-11 16:42:28 +08:00
winlin	ade81bb244	for bug#194, open pipe for each connection.	2014-11-11 16:41:39 +08:00
winlin	0b0f65665f	Merge branch 'srs.master'	2014-11-11 16:28:21 +08:00
winlin	1e601a6efc	for bug #194, add pipe to consumer.	2014-11-11 16:27:35 +08:00
winlin	2ea3440a12	Merge branch 'srs.master'	2014-11-11 16:10:32 +08:00
winlin	f9756ea14c	add srs pipe for bug #194	2014-11-11 16:09:44 +08:00
winlin	ca836cd306	Merge branch 'srs.master'	2014-11-11 15:38:53 +08:00
winlin	2a55ae4317	for bug #194, refine the config	2014-11-11 15:38:21 +08:00
winlin	f972f9ec69	Merge branch 'srs.master'	2014-11-11 15:03:54 +08:00
winlin	c8673cd50e	add test file to show the max open files.	2014-11-11 15:02:58 +08:00
winlin	51f0e6d48a	Merge branch 'srs.master'	2014-11-11 14:42:20 +08:00
winlin	36d12dd8ea	for bug #194, change server main cycle to 1s.	2014-11-11 14:41:48 +08:00
winlin	8cc9a11b81	for bug #194, set the server main cycle to 1s	2014-11-11 14:38:54 +08:00
winlin	51f15e9be0	Merge branch 'srs.master'	2014-11-11 13:43:36 +08:00
winlin	2adf2550dc	refine the depends to make st script	2014-11-11 13:42:06 +08:00
winlin	6191e3791d	Merge branch 'srs.master'	2014-11-11 13:40:54 +08:00
winlin	46330dd196	fix #195: remove the confuse code st_usleep(0). 2.0.13.	2014-11-11 13:40:09 +08:00
winlin	7924ef9716	Merge branch 'srs.master'	2014-11-11 13:37:51 +08:00
winlin	4f34ac022f	add benchmark for 1.0.5/2.0.12, 2700clients, 85%CPU, 66MB.	2014-11-11 13:36:54 +08:00
winlin	b7d964ee5a	Merge branch 'srs.master'	2014-11-11 12:59:58 +08:00
winlin	8ab6b57612	research st, the timeout and coroutine scheduler.	2014-11-11 12:58:25 +08:00
winlin	691b784ae9	Merge branch 'srs.master'	2014-11-11 11:26:44 +08:00
winlin	be46e428ad	research st, for bug #193, remove the code with bug, exit when fork.	2014-11-11 11:25:52 +08:00
winlin	f4dfee0e9f	research st, add comments for bug #193.	2014-11-11 11:24:19 +08:00
winlin	044de0eb75	Merge branch 'srs.master'	2014-11-11 11:16:58 +08:00
winlin	cd09fcaf55	research st, remove all events except epoll.	2014-11-11 11:15:58 +08:00
winlin	b6f35336ba	Merge branch 'srs.master'	2014-11-10 16:51:31 +08:00
winlin	91f6dbe479	research st, add test for setjmp and longjmp.	2014-11-10 16:50:36 +08:00
winlin	a934f9fb7b	Merge branch 'srs.master'	2014-11-10 15:22:54 +08:00
winlin	4d4e840209	research st, add jmp_flow.	2014-11-10 15:22:30 +08:00
winlin	a4a752e125	Merge branch 'srs.master'	2014-11-10 14:56:23 +08:00
winlin	683b01a6c9	research st, add comments about the thread cycle	2014-11-10 14:54:52 +08:00
winlin	ccf1abbd8a	Merge branch 'srs.master'	2014-11-10 14:03:57 +08:00
winlin	8327a57b7e	never use stack variable for setjmp	2014-11-10 14:02:49 +08:00
winlin	b2e1e40ded	Merge branch 'srs.master'	2014-11-10 13:53:13 +08:00
winlin	2c01f7e943	research st, expand MD_INIT_CONTEXT macro, the thread start.	2014-11-10 13:52:17 +08:00
winlin	8da8c49f39	research st, add comments	2014-11-10 11:49:14 +08:00
winlin	6a86537729	Merge branch 'srs.master'	2014-11-10 11:48:31 +08:00
winlin	2b70212649	research st, add stack struct comments.	2014-11-10 11:47:24 +08:00
winlin	922cdc5512	Merge branch 'srs.master'	2014-11-10 11:11:23 +08:00