正在显示
3 个修改的文件
包含
11 行增加
和
10 行删除
@@ -208,6 +208,7 @@ Supported operating systems and hardware: | @@ -208,6 +208,7 @@ Supported operating systems and hardware: | ||
208 | * 2013-10-17, Created.<br/> | 208 | * 2013-10-17, Created.<br/> |
209 | 209 | ||
210 | ## History | 210 | ## History |
211 | +* v1.0, 2014-08-28, fix [#167](https://github.com/winlinvip/simple-rtmp-server/issues/167), add openssl includes to utest. 0.9.209. | ||
211 | * v1.0, 2014-08-27, max connections is 32756, for st use mmap default. 0.9.209 | 212 | * v1.0, 2014-08-27, max connections is 32756, for st use mmap default. 0.9.209 |
212 | * v1.0, 2014-08-24, fix [#150](https://github.com/winlinvip/simple-rtmp-server/issues/150), forward should forward the sequence header when retry. 0.9.208. | 213 | * v1.0, 2014-08-24, fix [#150](https://github.com/winlinvip/simple-rtmp-server/issues/150), forward should forward the sequence header when retry. 0.9.208. |
213 | * v1.0, 2014-08-22, for [#165](https://github.com/winlinvip/simple-rtmp-server/issues/165), refine dh wrapper, ensure public key is 128bytes. 0.9.206. | 214 | * v1.0, 2014-08-22, for [#165](https://github.com/winlinvip/simple-rtmp-server/issues/165), refine dh wrapper, ensure public key is 128bytes. 0.9.206. |
@@ -491,7 +491,7 @@ fi | @@ -491,7 +491,7 @@ fi | ||
491 | MODULE_FILES=("srs_utest" "srs_utest_amf0" "srs_utest_protocol" | 491 | MODULE_FILES=("srs_utest" "srs_utest_amf0" "srs_utest_protocol" |
492 | "srs_utest_kernel" "srs_utest_core" "srs_utest_config" | 492 | "srs_utest_kernel" "srs_utest_core" "srs_utest_config" |
493 | "srs_utest_reload") | 493 | "srs_utest_reload") |
494 | -ModuleLibIncs=(${SRS_OBJS} ${LibSTRoot}) | 494 | +ModuleLibIncs=(${SRS_OBJS} ${LibSTRoot} ${LibSSLRoot}) |
495 | ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile}) | 495 | ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile}) |
496 | MODULE_DEPENDS=("CORE" "KERNEL" "RTMP" "APP") | 496 | MODULE_DEPENDS=("CORE" "KERNEL" "RTMP" "APP") |
497 | MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${RTMP_OBJS[@]} ${APP_OBJS[@]}" | 497 | MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${RTMP_OBJS[@]} ${APP_OBJS[@]}" |
@@ -446,21 +446,21 @@ public: | @@ -446,21 +446,21 @@ public: | ||
446 | // data of /proc/meminfo | 446 | // data of /proc/meminfo |
447 | public: | 447 | public: |
448 | // MemActive = MemTotal - MemFree | 448 | // MemActive = MemTotal - MemFree |
449 | - int64_t MemActive; | 449 | + u_int64_t MemActive; |
450 | // RealInUse = MemActive - Buffers - Cached | 450 | // RealInUse = MemActive - Buffers - Cached |
451 | - int64_t RealInUse; | 451 | + u_int64_t RealInUse; |
452 | // NotInUse = MemTotal - RealInUse | 452 | // NotInUse = MemTotal - RealInUse |
453 | // = MemTotal - MemActive + Buffers + Cached | 453 | // = MemTotal - MemActive + Buffers + Cached |
454 | // = MemTotal - MemTotal + MemFree + Buffers + Cached | 454 | // = MemTotal - MemTotal + MemFree + Buffers + Cached |
455 | // = MemFree + Buffers + Cached | 455 | // = MemFree + Buffers + Cached |
456 | - int64_t NotInUse; | 456 | + u_int64_t NotInUse; |
457 | 457 | ||
458 | - int64_t MemTotal; | ||
459 | - int64_t MemFree; | ||
460 | - int64_t Buffers; | ||
461 | - int64_t Cached; | ||
462 | - int64_t SwapTotal; | ||
463 | - int64_t SwapFree; | 458 | + u_int64_t MemTotal; |
459 | + u_int64_t MemFree; | ||
460 | + u_int64_t Buffers; | ||
461 | + u_int64_t Cached; | ||
462 | + u_int64_t SwapTotal; | ||
463 | + u_int64_t SwapFree; | ||
464 | 464 | ||
465 | public: | 465 | public: |
466 | SrsMemInfo(); | 466 | SrsMemInfo(); |
-
请 注册 或 登录 后发表评论