add keyword XCORE for coredump to identify the version. 2.0.207
正在显示
4 个修改的文件
包含
8 行增加
和
2 行删除
| @@ -338,6 +338,7 @@ Remark: | @@ -338,6 +338,7 @@ Remark: | ||
| 338 | 338 | ||
| 339 | ## History | 339 | ## History |
| 340 | 340 | ||
| 341 | +* v2.0, 2016-01-05, add keyword XCORE for coredump to identify the version. 2.0.207 | ||
| 341 | * <strong>v2.0, 2015-12-23, [2.0 alpha3(2.0.205)][r2.0a3] released. 89544 lines.</strong> | 342 | * <strong>v2.0, 2015-12-23, [2.0 alpha3(2.0.205)][r2.0a3] released. 89544 lines.</strong> |
| 342 | * v2.0, 2015-12-22, for [#509][bug #509] always alloc big object at heap. 2.0.205 | 343 | * v2.0, 2015-12-22, for [#509][bug #509] always alloc big object at heap. 2.0.205 |
| 343 | * v2.0, 2015-12-22, for [#418][bug #418] ignore null connect props to make RED5 happy. 2.0.204 | 344 | * v2.0, 2015-12-22, for [#418][bug #418] ignore null connect props to make RED5 happy. 2.0.204 |
| @@ -49,6 +49,9 @@ using namespace std; | @@ -49,6 +49,9 @@ using namespace std; | ||
| 49 | 49 | ||
| 50 | using namespace _srs_internal; | 50 | using namespace _srs_internal; |
| 51 | 51 | ||
| 52 | +// the version to identify the core. | ||
| 53 | +const char* _srs_version = "XCORE-"RTMP_SIG_SRS_SERVER; | ||
| 54 | + | ||
| 52 | #define SRS_WIKI_URL_LOG "https://github.com/ossrs/srs/wiki/v1_CN_SrsLog" | 55 | #define SRS_WIKI_URL_LOG "https://github.com/ossrs/srs/wiki/v1_CN_SrsLog" |
| 53 | 56 | ||
| 54 | // when user config an invalid value, macros to perfer true or false. | 57 | // when user config an invalid value, macros to perfer true or false. |
| @@ -1360,7 +1363,7 @@ int SrsConfig::parse_options(int argc, char** argv) | @@ -1360,7 +1363,7 @@ int SrsConfig::parse_options(int argc, char** argv) | ||
| 1360 | } | 1363 | } |
| 1361 | 1364 | ||
| 1362 | // first hello message. | 1365 | // first hello message. |
| 1363 | - srs_trace(RTMP_SIG_SRS_SERVER); | 1366 | + srs_trace(_srs_version); |
| 1364 | 1367 | ||
| 1365 | if (config_file.empty()) { | 1368 | if (config_file.empty()) { |
| 1366 | ret = ERROR_SYSTEM_CONFIG_INVALID; | 1369 | ret = ERROR_SYSTEM_CONFIG_INVALID; |
| @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 31 | // current release version | 31 | // current release version |
| 32 | #define VERSION_MAJOR 2 | 32 | #define VERSION_MAJOR 2 |
| 33 | #define VERSION_MINOR 0 | 33 | #define VERSION_MINOR 0 |
| 34 | -#define VERSION_REVISION 206 | 34 | +#define VERSION_REVISION 207 |
| 35 | 35 | ||
| 36 | // generated by configure, only macros. | 36 | // generated by configure, only macros. |
| 37 | #include <srs_auto_headers.hpp> | 37 | #include <srs_auto_headers.hpp> |
| @@ -54,6 +54,8 @@ ISrsThreadContext* _srs_context = new SrsThreadContext(); | @@ -54,6 +54,8 @@ ISrsThreadContext* _srs_context = new SrsThreadContext(); | ||
| 54 | // app module. | 54 | // app module. |
| 55 | SrsConfig* _srs_config = new SrsConfig(); | 55 | SrsConfig* _srs_config = new SrsConfig(); |
| 56 | SrsServer* _srs_server = new SrsServer(); | 56 | SrsServer* _srs_server = new SrsServer(); |
| 57 | +// version of srs, which can grep keyword "XCORE" | ||
| 58 | +extern const char* _srs_version; | ||
| 57 | 59 | ||
| 58 | /** | 60 | /** |
| 59 | * show the features by macro, the actual macro values. | 61 | * show the features by macro, the actual macro values. |
-
请 注册 或 登录 后发表评论