X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=src%2Fmsg-thread.cpp;h=d7e4eb28044d4cb052b156d885bd2c3a0a75ae11;hp=2c361634174ef58d2e783718274e659c4d428872;hb=4f79f9b5b0095b2f81b1ce583f0f82462f9ee36a;hpb=21650b252dff0a3942972c37421dc5d3c61502d5 diff --git a/src/msg-thread.cpp b/src/msg-thread.cpp index 2c36163..d7e4eb2 100644 --- a/src/msg-thread.cpp +++ b/src/msg-thread.cpp @@ -1,7 +1,5 @@ -/* $Id: msg-thread.cpp,v 1.14 2006-03-30 14:16:34 adam Exp $ - Copyright (c) 1998-2006, Index Data. - -This file is part of the yazproxy. +/* This file is part of YAZ proxy + 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 @@ -14,10 +12,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with YAZ proxy; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ #if YAZ_POSIX_THREADS #include @@ -133,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); - + int i; for (i = 0; im_no_threads; i++) pthread_join(m_p->m_thread_id[i], 0); @@ -186,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); - + write(m_p->m_fd[1], "", 1); pthread_mutex_unlock(&m_p->m_mutex_output_data); } @@ -209,6 +206,7 @@ void Msg_Thread::put(IMsg_Thread *m) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab