nils/shairport-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add more thread numbers

Browse Source
This commit is contained in:
Mike Brady
2017-08-23 12:45:57 +01:00
parent 550eaf2c5e
commit ee8629be2b
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rtp.c
+3 -3
View File
@@ -713,9 +713,9 @@ void get_reference_timestamp_stuff(int64_t *timestamp, uint64_t *timestamp_time,
pthread_mutex_lock(&conn->reference_time_mutex);
*timestamp = conn->reference_timestamp;
*timestamp_time = conn->reference_timestamp_time;
if ((*timestamp == 0) && (*timestamp_time == 0)) {
debug(1,"Reference timestamp is invalid.");
}
//if ((*timestamp == 0) && (*timestamp_time == 0)) {
// debug(1,"Reference timestamp is invalid.");
//}
*remote_timestamp_time = conn->remote_reference_timestamp_time;
pthread_mutex_unlock(&conn->reference_time_mutex);
}
rtsp.c
+7 -2
View File
@@ -289,10 +289,10 @@ static void cleanup_threads(void) {
// debug(2, "culling threads.");
for (i = 0; i < nconns;) {
if (conns[i]->running == 0) {
debug(1, "found a non-running thread");
debug(1, "found RTSP connection thread %d in a non-running state.",conns[i]->connection_number);
pthread_join(conns[i]->thread, &retval);
debug(1, "RTSP connection thread %d deleted...",conns[i]->connection_number);
free(conns[i]);
debug(1, "one thread joined...");
nconns--;
if (nconns)
conns[i] = conns[nconns];
@@ -1401,6 +1401,11 @@ static void handle_announce(rtsp_conn_info *conn, rtsp_message *req, rtsp_messag
if (pthread_mutex_trylock(&play_lock) == 0) {
have_the_player = 1;
} else {
if (playing_conn) {
debug(1,"RTSP Conversation thread %d already playing.",playing_conn->connection_number);
} else {
debug(1,"play_lock locked but no playing_conn.");
}
if (config.allow_session_interruption == 1) {
// some other thread has the player ... ask it to relinquish the thread
if (playing_conn) {