winlin

update readme, use table for performance.

正在显示 1 个修改的文件 包含 215 行增加21 行删除
@@ -728,32 +728,222 @@ Performance benchmark history, on virtual box. @@ -728,32 +728,222 @@ Performance benchmark history, on virtual box.
728 728
729 The play benchmark by [st-load](https://github.com/winlinvip/st-load): 729 The play benchmark by [st-load](https://github.com/winlinvip/st-load):
730 730
731 -* 2013-11-28, SRS 0.5.0, 1.8k(1800)clients, 90%CPU, 41MB.  
732 -* 2014-07-12, SRS 0.9.156, 1.8k(1800)clients, 68%CPU, 38MB.  
733 -* 2014-07-12, SRS 0.9.156, 2.7k(2700)clients, 89%CPU, 61MB. [commit](https://github.com/winlinvip/simple-rtmp-server/commit/1ae3e6c64cc5cee90e6050c26968ebc3c18281be)  
734 -* 2014-11-11, SRS 1.0.5, 2.7k(2700)clients, 85%CPU, 66MB.  
735 -* 2014-11-11, SRS 2.0.12, 2.7k(2700)clients, 85%CPU, 66MB.  
736 -* 2014-11-12, SRS 2.0.14, 2.7k(2700)clients, 69%CPU, 59MB.  
737 -* 2014-11-12, SRS 2.0.14, 3.5k(3500)clients, 95%CPU, 78MB. [commit](https://github.com/winlinvip/simple-rtmp-server/commit/8acd143a7a152885b815999162660fd4e7a3f247)  
738 -* 2014-11-13, SRS 2.0.15, 6.0k(6000)clients, 82%CPU, 203MB. [commit](https://github.com/winlinvip/simple-rtmp-server/commit/cc6aca9ad55342a06440ce7f3b38453776b2b2d1)  
739 -* 2014-11-22, SRS 2.0.30, 7.5k(7500)clients, 87%CPU, 320MB. [commit](https://github.com/winlinvip/simple-rtmp-server/commit/58136ec178e3d47db6c90a59875d7e40946936e5)  
740 -* 2014-12-05, SRS 2.0.55, 8.0k(8000)clients, 89%CPU, 360MB. (mw_sleep=350)[commit](https://github.com/winlinvip/simple-rtmp-server/commit/58136ec178e3d47db6c90a59875d7e40946936e5)  
741 -* 2014-12-05, SRS 2.0.57, 9.0k(9000)clients, 90%CPU, 468MB. [commit](https://github.com/winlinvip/simple-rtmp-server/commit/9ee138746f83adc26f0e236ec017f4d68a300004)  
742 -* 2014-12-07, SRS 2.0.67, 10k(10000)clients, 95%CPU, 656MB. [commit](https://github.com/winlinvip/simple-rtmp-server/commit/1311b6fe6576fd7b9c6d299b0f8f2e8d202f4bf8) 731 +<table>
  732 + <tr>
  733 + <th>Update</th>
  734 + <th>SRS</th>
  735 + <th>Clients</th>
  736 + <th>Type</th>
  737 + <th>CPU</th>
  738 + <th>Memory</th>
  739 + <th>Commit</th>
  740 + </tr>
  741 + <tr>
  742 + <td>2013-11-28</td>
  743 + <td>0.5.0</td>
  744 + <td>1.8k(1800">commit</a></td>
  745 + <td>players</td>
  746 + <td>90%</td>
  747 + <td>41MB</td>
  748 + <td>-</td>
  749 + </tr>
  750 + <tr>
  751 + <td>2014-07-12</td>
  752 + <td>0.9.156</td>
  753 + <td>1.8k(1800">commit</a></td>
  754 + <td>players</td>
  755 + <td>68%</td>
  756 + <td>38MB</td>
  757 + <td>-</td>
  758 + </tr>
  759 + <tr>
  760 + <td>2014-07-12</td>
  761 + <td>0.9.156</td>
  762 + <td>2.7k(2700">commit</a></td>
  763 + <td>players</td>
  764 + <td>89%</td>
  765 + <td>61MB</td>
  766 + <td><a href="https://github.com/winlinvip/simple-rtmp-server/commit/1ae3e6c64cc5cee90e6050c26968ebc3c18281be">commit</a></td>
  767 + </tr>
  768 + <tr>
  769 + <td>2014-11-11</td>
  770 + <td>1.0.5</td>
  771 + <td>2.7k(2700">commit</a></td>
  772 + <td>players</td>
  773 + <td>85%</td>
  774 + <td>66MB</td>
  775 + <td>-</td>
  776 + </tr>
  777 + <tr>
  778 + <td>2014-11-11</td>
  779 + <td>2.0.12</td>
  780 + <td>2.7k(2700">commit</a></td>
  781 + <td>players</td>
  782 + <td>85%</td>
  783 + <td>66MB</td>
  784 + <td>-</td>
  785 + </tr>
  786 + <tr>
  787 + <td>2014-11-12</td>
  788 + <td>2.0.14</td>
  789 + <td>2.7k(2700">commit</a></td>
  790 + <td>players</td>
  791 + <td>69%</td>
  792 + <td>59MB</td>
  793 + <td>-</td>
  794 + </tr>
  795 + <tr>
  796 + <td>2014-11-12</td>
  797 + <td>2.0.14</td>
  798 + <td>3.5k(3500">commit</a></td>
  799 + <td>players</td>
  800 + <td>95%</td>
  801 + <td>78MB</td>
  802 + <td><a href="https://github.com/winlinvip/simple-rtmp-server/commit/8acd143a7a152885b815999162660fd4e7a3f247">commit</a></td>
  803 + </tr>
  804 + <tr>
  805 + <td>2014-11-13</td>
  806 + <td>2.0.15</td>
  807 + <td>6.0k(6000">commit</a></td>
  808 + <td>players</td>
  809 + <td>82%</td>
  810 + <td>203MB</td>
  811 + <td><a href="https://github.com/winlinvip/simple-rtmp-server/commit/cc6aca9ad55342a06440ce7f3b38453776b2b2d1">commit</a></td>
  812 + </tr>
  813 + <tr>
  814 + <td>2014-11-22</td>
  815 + <td>2.0.30</td>
  816 + <td>7.5k(7500">commit</a></td>
  817 + <td>players</td>
  818 + <td>87%</td>
  819 + <td>320MB</td>
  820 + <td><a href="https://github.com/winlinvip/simple-rtmp-server/commit/58136ec178e3d47db6c90a59875d7e40946936e5">commit</a></td>
  821 + </tr>
  822 + <tr>
  823 + <td>2014-12-05</td>
  824 + <td>2.0.55</td>
  825 + <td>8.0k(8000">commit</a></td>
  826 + <td>players</td>
  827 + <td>89%</td>
  828 + <td>360MB</td>
  829 + <td>(mw_sleep=350)<br/><a href="https://github.com/winlinvip/simple-rtmp-server/commit/58136ec178e3d47db6c90a59875d7e40946936e5">commit</a></td>
  830 + </tr>
  831 + <tr>
  832 + <td>2014-12-05</td>
  833 + <td>2.0.57</td>
  834 + <td>9.0k(9000">commit</a></td>
  835 + <td>players</td>
  836 + <td>90%</td>
  837 + <td>468MB</td>
  838 + <td><a href="https://github.com/winlinvip/simple-rtmp-server/commit/9ee138746f83adc26f0e236ec017f4d68a300004">commit</a></td>
  839 + </tr>
  840 + <tr>
  841 + <td>2014-12-07</td>
  842 + <td>2.0.67</td>
  843 + <td>10k(10000">commit</a></td>
  844 + <td>players</td>
  845 + <td>95%</td>
  846 + <td>656MB</td>
  847 + <td><a href="https://github.com/winlinvip/simple-rtmp-server/commit/1311b6fe6576fd7b9c6d299b0f8f2e8d202f4bf8">commit</a></td>
  848 + </tr>
  849 +</table>
743 850
744 ### Publish benchmark 851 ### Publish benchmark
745 852
746 The publish benchmark by [st-load](https://github.com/winlinvip/st-load): 853 The publish benchmark by [st-load](https://github.com/winlinvip/st-load):
747 854
748 -* 2014-12-03, SRS 1.0.10, 1.2k(1200) publishers, 96%CPU, 43MB.  
749 -* 2014-12-03, SRS 2.0.12, 1.2k(1200) publishers, 96%CPU, 43MB.  
750 -* 2014-12-03, SRS 2.0.47, 1.2k(1200) publishers, 84%CPU, 76MB. [commit](https://github.com/winlinvip/simple-rtmp-server/commit/787ab674e38734ea8e0678101614fdcd84645dc8)  
751 -* 2014-12-03, SRS 2.0.47, 1.4k(1400) publishers, 95%CPU, 140MB.  
752 -* 2014-12-03, SRS 2.0.48, 1.4k(1400) publishers, 95%CPU, 140MB. [commit](https://github.com/winlinvip/simple-rtmp-server/commit/f35ec2155b1408d528a9f37da7904c9625186bcf)  
753 -* 2014-12-04, SRS 2.0.49, 1.4k(1400) publishers, 68%CPU, 144MB.  
754 -* 2014-12-04, SRS 2.0.49, 2.5k(2500) publishers, 95%CPU, 404MB. [commit](https://github.com/winlinvip/simple-rtmp-server/commit/29324fab469e0f7cef9ad04ffdbce832ac7dd9ff)  
755 -* 2014-12-04, SRS 2.0.51, 2.5k(2500) publishers, 91%CPU, 259MB. [commit](https://github.com/winlinvip/simple-rtmp-server/commit/f57801eb46c16755b173984b915a4166922df6a6)  
756 -* 2014-12-04, SRS 2.0.52, 4.0k(4000) publishers, 80%CPU, 331MB. (mr_sleep=350)[commit](https://github.com/winlinvip/simple-rtmp-server/commit/5589b13d2e216b91f97afb78ee0c011b2fccf7da) 855 +<table>
  856 + <tr>
  857 + <th>Update</th>
  858 + <th>SRS</th>
  859 + <th>Clients</th>
  860 + <th>Type</th>
  861 + <th>CPU</th>
  862 + <th>Memory</th>
  863 + <th>Commit</th>
  864 + </tr>
  865 + <tr>
  866 + <td>2014-12-03</td>
  867 + <td>1.0.10</td>
  868 + <td>1.2k(1200">commit</a></td>
  869 + <td>publishers</td>
  870 + <td>96%</td>
  871 + <td>43MB</td>
  872 + <td>-</td>
  873 + </tr>
  874 + <tr>
  875 + <td>2014-12-03</td>
  876 + <td>2.0.12</td>
  877 + <td>1.2k(1200">commit</a></td>
  878 + <td>publishers</td>
  879 + <td>96%</td>
  880 + <td>43MB</td>
  881 + <td>-</td>
  882 + </tr>
  883 + <tr>
  884 + <td>2014-12-03</td>
  885 + <td>2.0.47</td>
  886 + <td>1.2k(1200">commit</a></td>
  887 + <td>publishers</td>
  888 + <td>84%</td>
  889 + <td>76MB</td>
  890 + <td><a href="https://github.com/winlinvip/simple-rtmp-server/commit/787ab674e38734ea8e0678101614fdcd84645dc8">commit</a></td>
  891 + </tr>
  892 + <tr>
  893 + <td>2014-12-03</td>
  894 + <td>2.0.47</td>
  895 + <td>1.4k(1400">commit</a></td>
  896 + <td>publishers</td>
  897 + <td>95%</td>
  898 + <td>140MB</td>
  899 + <td>-</td>
  900 + </tr>
  901 + <tr>
  902 + <td>2014-12-03</td>
  903 + <td>2.0.48</td>
  904 + <td>1.4k(1400">commit</a></td>
  905 + <td>publishers</td>
  906 + <td>95%</td>
  907 + <td>140MB</td>
  908 + <td><a href="https://github.com/winlinvip/simple-rtmp-server/commit/f35ec2155b1408d528a9f37da7904c9625186bcf">commit</a></td>
  909 + </tr>
  910 + <tr>
  911 + <td>2014-12-04</td>
  912 + <td>2.0.49</td>
  913 + <td>1.4k(1400">commit</a></td>
  914 + <td>publishers</td>
  915 + <td>68%</td>
  916 + <td>144MB</td>
  917 + <td>-</td>
  918 + </tr>
  919 + <tr>
  920 + <td>2014-12-04</td>
  921 + <td>2.0.49</td>
  922 + <td>2.5k(2500">commit</a></td>
  923 + <td>publishers</td>
  924 + <td>95%</td>
  925 + <td>404MB</td>
  926 + <td><a href="https://github.com/winlinvip/simple-rtmp-server/commit/29324fab469e0f7cef9ad04ffdbce832ac7dd9ff">commit</a></td>
  927 + </tr>
  928 + <tr>
  929 + <td>2014-12-04</td>
  930 + <td>2.0.51</td>
  931 + <td>2.5k(2500">commit</a></td>
  932 + <td>publishers</td>
  933 + <td>91%</td>
  934 + <td>259MB</td>
  935 + <td><a href="https://github.com/winlinvip/simple-rtmp-server/commit/f57801eb46c16755b173984b915a4166922df6a6">commit</a></td>
  936 + </tr>
  937 + <tr>
  938 + <td>2014-12-04</td>
  939 + <td>2.0.52</td>
  940 + <td>4.0k(4000">commit</a></td>
  941 + <td>publishers</td>
  942 + <td>80%</td>
  943 + <td>331MB</td>
  944 + <td>(mr_sleep=350)<br/><a href="https://github.com/winlinvip/simple-rtmp-server/commit/5589b13d2e216b91f97afb78ee0c011b2fccf7da">commit</a></td>
  945 + </tr>
  946 +</table>
757 947
758 ### Latency benchmark 948 ### Latency benchmark
759 949
@@ -764,6 +954,7 @@ The latency between encoder and player with realtime config( @@ -764,6 +954,7 @@ The latency between encoder and player with realtime config(
764 954
765 <table> 955 <table>
766 <tr> 956 <tr>
  957 + <th>Update</th>
767 <th>SRS</th> 958 <th>SRS</th>
768 <th>VP6</th> 959 <th>VP6</th>
769 <th>H.264</th> 960 <th>H.264</th>
@@ -771,6 +962,7 @@ The latency between encoder and player with realtime config( @@ -771,6 +962,7 @@ The latency between encoder and player with realtime config(
771 <th>H.264+mp3</th> 962 <th>H.264+mp3</th>
772 </tr> 963 </tr>
773 <tr> 964 <tr>
  965 + <td>2014-12-03</td>
774 <td>1.0.10</td> 966 <td>1.0.10</td>
775 <td>0.4s</td> 967 <td>0.4s</td>
776 <td>0.4s</td> 968 <td>0.4s</td>
@@ -778,6 +970,7 @@ The latency between encoder and player with realtime config( @@ -778,6 +970,7 @@ The latency between encoder and player with realtime config(
778 <td>1.2s</td> 970 <td>1.2s</td>
779 </tr> 971 </tr>
780 <tr> 972 <tr>
  973 + <td>2014-12-12</td>
781 <td>2.0.70</td> 974 <td>2.0.70</td>
782 <td><a href="https://github.com/winlinvip/simple-rtmp-server/commit/10297fab519811845b549a8af40a6bcbd23411e8">0.1s</a></td> 975 <td><a href="https://github.com/winlinvip/simple-rtmp-server/commit/10297fab519811845b549a8af40a6bcbd23411e8">0.1s</a></td>
783 <td><a href="https://github.com/winlinvip/simple-rtmp-server/commit/10297fab519811845b549a8af40a6bcbd23411e8">0.4s</a></td> 976 <td><a href="https://github.com/winlinvip/simple-rtmp-server/commit/10297fab519811845b549a8af40a6bcbd23411e8">0.4s</a></td>
@@ -785,6 +978,7 @@ The latency between encoder and player with realtime config( @@ -785,6 +978,7 @@ The latency between encoder and player with realtime config(
785 <td>0.9s</td> 978 <td>0.9s</td>
786 </tr> 979 </tr>
787 <tr> 980 <tr>
  981 + <td>2014-12-16</td>
788 <td>2.0.72</td> 982 <td>2.0.72</td>
789 <td>0.1s</td> 983 <td>0.1s</td>
790 <td>0.4s</td> 984 <td>0.4s</td>