Threads-Hybrid: Fix rebase bugs

winlinvip · winlinvip · commit 614a78110eb7 · 2021-04-26T08:14:32.000+08:00
diff --git a/trunk/src/app/srs_app_hourglass.cpp b/trunk/src/app/srs_app_hourglass.cpp
@@ -33,15 +33,15 @@ using namespace std;
 
 __thread SrsPps* _srs_pps_timer = NULL;
 
-extern SrsPps* _srs_pps_clock_15ms;
-extern SrsPps* _srs_pps_clock_20ms;
-extern SrsPps* _srs_pps_clock_25ms;
-extern SrsPps* _srs_pps_clock_30ms;
-extern SrsPps* _srs_pps_clock_35ms;
-extern SrsPps* _srs_pps_clock_40ms;
-extern SrsPps* _srs_pps_clock_80ms;
-extern SrsPps* _srs_pps_clock_160ms;
-extern SrsPps* _srs_pps_timer_s;
+extern __thread SrsPps* _srs_pps_clock_15ms;
+extern __thread SrsPps* _srs_pps_clock_20ms;
+extern __thread SrsPps* _srs_pps_clock_25ms;
+extern __thread SrsPps* _srs_pps_clock_30ms;
+extern __thread SrsPps* _srs_pps_clock_35ms;
+extern __thread SrsPps* _srs_pps_clock_40ms;
+extern __thread SrsPps* _srs_pps_clock_80ms;
+extern __thread SrsPps* _srs_pps_clock_160ms;
+extern __thread SrsPps* _srs_pps_timer_s;
 
 ISrsHourGlass::ISrsHourGlass()
 {
diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp
@@ -1936,6 +1936,7 @@ srs_error_t SrsApiServer::create_session(
 ) {
     srs_error_t err = srs_success;
 
+    // TODO: FIXME: Should update the hybrids for RTMP streams.
     // Serve all connections of a stream, which identified by url, by the same hybrid thread.
     string url = req->get_stream_url();
     SrsThreadEntry* hybrid = NULL;
diff --git a/trunk/src/app/srs_app_threads.cpp b/trunk/src/app/srs_app_threads.cpp
@@ -1,7 +1,7 @@
 /**
  * The MIT License (MIT)
  *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
diff --git a/trunk/src/app/srs_app_threads.hpp b/trunk/src/app/srs_app_threads.hpp
@@ -1,7 +1,7 @@
 /**
  * The MIT License (MIT)
  *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
diff --git a/trunk/src/core/srs_core_version5.cpp b/trunk/src/core/srs_core_version5.cpp
@@ -1,7 +1,7 @@
 /**
  * The MIT License (MIT)
  *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp
@@ -1,7 +1,7 @@
 /**
  * The MIT License (MIT)
  *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/**`
`2`	`2`	`* The MIT License (MIT)`
`3`	`3`	`*`
`4`		`- * Copyright (c) 2013-2020 Winlin`
	`4`	`+ * Copyright (c) 2013-2021 Winlin`
`5`	`5`	`*`
`6`	`6`	`* Permission is hereby granted, free of charge, to any person obtaining a copy of`
`7`	`7`	`* this software and associated documentation files (the "Software"), to deal in`