projects
/
yazproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add cast (fix YAZ4 compile in previous commit)
[yazproxy-moved-to-github.git]
/
src
/
msg-thread.cpp
diff --git
a/src/msg-thread.cpp
b/src/msg-thread.cpp
index
2dfd652
..
d7e4eb2
100644
(file)
--- a/
src/msg-thread.cpp
+++ b/
src/msg-thread.cpp
@@
-1,5
+1,5
@@
/* This file is part of YAZ proxy
/* This file is part of YAZ proxy
- Copyright (C) 1998-2009 Index Data
+ Copyright (C) 1998-2011 Index Data
YAZ proxy is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
YAZ proxy is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-130,7
+130,7
@@
Msg_Thread::~Msg_Thread()
m_p->m_stop_flag = true;
pthread_cond_broadcast(&m_p->m_cond_input_data);
pthread_mutex_unlock(&m_p->m_mutex_input_data);
m_p->m_stop_flag = true;
pthread_cond_broadcast(&m_p->m_cond_input_data);
pthread_mutex_unlock(&m_p->m_mutex_input_data);
-
+
int i;
for (i = 0; i<m_p->m_no_threads; i++)
pthread_join(m_p->m_thread_id[i], 0);
int i;
for (i = 0; i<m_p->m_no_threads; i++)
pthread_join(m_p->m_thread_id[i], 0);
@@
-183,7
+183,7
@@
void Msg_Thread::run(void *p)
IMsg_Thread *out = in->handle();
pthread_mutex_lock(&m_p->m_mutex_output_data);
m_p->m_output.enqueue(out);
IMsg_Thread *out = in->handle();
pthread_mutex_lock(&m_p->m_mutex_output_data);
m_p->m_output.enqueue(out);
-
+
write(m_p->m_fd[1], "", 1);
pthread_mutex_unlock(&m_p->m_mutex_output_data);
}
write(m_p->m_fd[1], "", 1);
pthread_mutex_unlock(&m_p->m_mutex_output_data);
}