Skip to content

Commit

Permalink
update the data for 20k
Browse files Browse the repository at this point in the history
  • Loading branch information
winlinvip committed May 28, 2015
1 parent ae2244f commit 6688161
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ The [srs-sharp][SHARP] is a similar project, but srs-sharp is a HTTP FLV reverse
| Project | Goal | Protocol | Performance | Deploy |
| ------- | ----- | -------- | ----------- | ------- |
| srs-sharp | HTTP-FLV | HTTP | 10k, 300%CPU | Manual(*) |
| srs-dolphin | RTMP/HTTP-FLV | TCP | - | Auto(*) |
| srs-dolphin | RTMP/HTTP-FLV | TCP | 20k, 320%CPU | Auto(*) |

Remark:

Expand Down Expand Up @@ -67,8 +67,8 @@ Remark: User can use [SB][SB] to do the benchmark.

## Features

1. [dev] Multiple Processes for SRS edge.
1. [dev] Delivery stream in RTMP.
1. Multiple Processes for SRS edge.
1. Delivery stream in RTMP.
1. [dev] Delivery stream in HTTP FLV.
1. [dev] Support HTTP API for Multiple Processes.
1. [dev] Muktiple Processes for SRS origin.
Expand Down
2 changes: 2 additions & 0 deletions trunk/src/core/dlp_core_proxy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ int DlpProxyConnection::proxy(st_netfd_t srs)
DlpStSocket skt_client(stfd);
DlpStSocket skt_srs(srs);

// TODO: FIXME: check whether 2thread to read write the stfd is ok.
char buf[4096];
while (!rc.terminated) {
ssize_t nread = 0;
Expand Down Expand Up @@ -221,6 +222,7 @@ int DlpProxyConnection::proxy_recv(DlpProxyRecvContext* rc)
rc->cycle = true;
rc->terminated = false;

// TODO: FIXME: check whether 2thread to read write the stfd is ok.
char buf[1024];
while (rc->cycle) {
ssize_t nread = 0;
Expand Down

0 comments on commit 6688161

Please sign in to comment.