Browse Source

A bit more explicit debug messages.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4496 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.8
sletz 14 years ago
parent
commit
620e0b84d6
5 changed files with 19 additions and 19 deletions
  1. +1
    -1
      common/JackControlAPI.cpp
  2. +1
    -1
      common/JackServerGlobals.cpp
  3. +7
    -7
      macosx/JackMachSemaphore.cpp
  4. +8
    -8
      posix/JackPosixSemaphore.cpp
  5. +2
    -2
      windows/JackWinNamedPipeServerChannel.cpp

+ 1
- 1
common/JackControlAPI.cpp View File

@@ -1203,7 +1203,7 @@ LIB_EXPORT bool jackctl_server_unload_internal(
{ {
int status; int status;
if (server_ptr->engine != NULL && internal->refnum > 0) { if (server_ptr->engine != NULL && internal->refnum > 0) {
// Client object is internally kept in JackEngine, and will be desallocated in InternalClientUnload
// Client object is internally kept in JackEngine, and will be deallocated in InternalClientUnload
return ((server_ptr->engine->GetEngine()->InternalClientUnload(internal->refnum, &status)) == 0); return ((server_ptr->engine->GetEngine()->InternalClientUnload(internal->refnum, &status)) == 0);
} else { } else {
return false; return false;


+ 1
- 1
common/JackServerGlobals.cpp View File

@@ -84,7 +84,7 @@ void JackServerGlobals::Delete()
int status; int status;
int refnum = (*it2).second; int refnum = (*it2).second;
if (refnum > 0) { if (refnum > 0) {
// Client object is internally kept in JackEngine, and will be desallocated in InternalClientUnload
// Client object is internally kept in JackEngine, and will be deallocated in InternalClientUnload
fInstance->GetEngine()->InternalClientUnload(refnum, &status); fInstance->GetEngine()->InternalClientUnload(refnum, &status);
} }
} }


+ 7
- 7
macosx/JackMachSemaphore.cpp View File

@@ -12,7 +12,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details. GNU Lesser General Public License for more details.


You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with this program; if not, write to the Free Software
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.


*/ */
@@ -38,7 +38,7 @@ void JackMachSemaphore::BuildName(const char* client_name, const char* server_na
bool JackMachSemaphore::Signal() bool JackMachSemaphore::Signal()
{ {
if (!fSemaphore) { if (!fSemaphore) {
jack_error("JackMachSemaphore::Signal name = %s already desallocated!!", fName);
jack_error("JackMachSemaphore::Signal name = %s already deallocated!!", fName);
return false; return false;
} }


@@ -55,13 +55,13 @@ bool JackMachSemaphore::Signal()
bool JackMachSemaphore::SignalAll() bool JackMachSemaphore::SignalAll()
{ {
if (!fSemaphore) { if (!fSemaphore) {
jack_error("JackMachSemaphore::SignalAll name = %s already desallocated!!", fName);
jack_error("JackMachSemaphore::SignalAll name = %s already deallocated!!", fName);
return false; return false;
} }


if (fFlush) if (fFlush)
return true; return true;
kern_return_t res; kern_return_t res;
// When signaled several times, do not accumulate signals... // When signaled several times, do not accumulate signals...
if ((res = semaphore_signal_all(fSemaphore)) != KERN_SUCCESS) { if ((res = semaphore_signal_all(fSemaphore)) != KERN_SUCCESS) {
@@ -73,7 +73,7 @@ bool JackMachSemaphore::SignalAll()
bool JackMachSemaphore::Wait() bool JackMachSemaphore::Wait()
{ {
if (!fSemaphore) { if (!fSemaphore) {
jack_error("JackMachSemaphore::Wait name = %s already desallocated!!", fName);
jack_error("JackMachSemaphore::Wait name = %s already deallocated!!", fName);
return false; return false;
} }


@@ -87,10 +87,10 @@ bool JackMachSemaphore::Wait()
bool JackMachSemaphore::TimedWait(long usec) bool JackMachSemaphore::TimedWait(long usec)
{ {
if (!fSemaphore) { if (!fSemaphore) {
jack_error("JackMachSemaphore::TimedWait name = %s already desallocated!!", fName);
jack_error("JackMachSemaphore::TimedWait name = %s already deallocated!!", fName);
return false; return false;
} }
kern_return_t res; kern_return_t res;
mach_timespec time; mach_timespec time;
time.tv_sec = usec / 1000000; time.tv_sec = usec / 1000000;


+ 8
- 8
posix/JackPosixSemaphore.cpp View File

@@ -40,7 +40,7 @@ bool JackPosixSemaphore::Signal()
int res; int res;


if (!fSemaphore) { if (!fSemaphore) {
jack_error("JackPosixSemaphore::Signal name = %s already desallocated!!", fName);
jack_error("JackPosixSemaphore::Signal name = %s already deallocated!!", fName);
return false; return false;
} }


@@ -58,7 +58,7 @@ bool JackPosixSemaphore::SignalAll()
int res; int res;


if (!fSemaphore) { if (!fSemaphore) {
jack_error("JackPosixSemaphore::SignalAll name = %s already desallocated!!", fName);
jack_error("JackPosixSemaphore::SignalAll name = %s already deallocated!!", fName);
return false; return false;
} }


@@ -77,7 +77,7 @@ bool JackPosixSemaphore::Wait()
int res; int res;


if (!fSemaphore) { if (!fSemaphore) {
jack_error("JackPosixSemaphore::Wait name = %s already desallocated!!", fName);
jack_error("JackPosixSemaphore::Wait name = %s already deallocated!!", fName);
return false; return false;
} }


@@ -102,14 +102,14 @@ bool JackPosixSemaphore::Wait()


#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) // glibc feature test #if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) // glibc feature test


bool JackPosixSemaphore::TimedWait(long usec)
bool JackPosixSemaphore::TimedWait(long usec)
{ {
int res; int res;
struct timeval now; struct timeval now;
timespec time; timespec time;


if (!fSemaphore) { if (!fSemaphore) {
jack_error("JackPosixSemaphore::TimedWait name = %s already desallocated!!", fName);
jack_error("JackPosixSemaphore::TimedWait name = %s already deallocated!!", fName);
return false; return false;
} }
gettimeofday(&now, 0); gettimeofday(&now, 0);
@@ -155,7 +155,7 @@ bool JackPosixSemaphore::Allocate(const char* name, const char* server_name, int
bool JackPosixSemaphore::ConnectInput(const char* name, const char* server_name) bool JackPosixSemaphore::ConnectInput(const char* name, const char* server_name)
{ {
BuildName(name, server_name, fName); BuildName(name, server_name, fName);
jack_log("JackPosixSemaphore::Connect %s", fName);
jack_log("JackPosixSemaphore::Connect name = %s", fName);


// Temporary... // Temporary...
if (fSemaphore) { if (fSemaphore) {
@@ -187,7 +187,7 @@ bool JackPosixSemaphore::ConnectOutput(const char* name, const char* server_name
bool JackPosixSemaphore::Disconnect() bool JackPosixSemaphore::Disconnect()
{ {
if (fSemaphore) { if (fSemaphore) {
jack_log("JackPosixSemaphore::Disconnect %s", fName);
jack_log("JackPosixSemaphore::Disconnect name = %s", fName);
if (sem_close(fSemaphore) != 0) { if (sem_close(fSemaphore) != 0) {
jack_error("Disconnect: can't disconnect named semaphore name = %s err = %s", fName, strerror(errno)); jack_error("Disconnect: can't disconnect named semaphore name = %s err = %s", fName, strerror(errno));
return false; return false;
@@ -204,7 +204,7 @@ bool JackPosixSemaphore::Disconnect()
void JackPosixSemaphore::Destroy() void JackPosixSemaphore::Destroy()
{ {
if (fSemaphore != NULL) { if (fSemaphore != NULL) {
jack_log("JackPosixSemaphore::Destroy");
jack_log("JackPosixSemaphore::Destroy name = %s", fName);
sem_unlink(fName); sem_unlink(fName);
if (sem_close(fSemaphore) != 0) { if (sem_close(fSemaphore) != 0) {
jack_error("Destroy: can't destroy semaphore name = %s err = %s", fName, strerror(errno)); jack_error("Destroy: can't destroy semaphore name = %s err = %s", fName, strerror(errno));


+ 2
- 2
windows/JackWinNamedPipeServerChannel.cpp View File

@@ -71,7 +71,7 @@ void JackClientPipeThread::Close() // Close
/* /*
TODO : solve WIN32 thread Kill issue TODO : solve WIN32 thread Kill issue
This would hang.. since Close will be followed by a delete, This would hang.. since Close will be followed by a delete,
all ressources will be desallocated at the end.
all ressources will be deallocated at the end.
*/ */


fThread.Kill(); fThread.Kill();
@@ -479,7 +479,7 @@ void JackWinNamedPipeServerChannel::Close()
{ {
/* TODO : solve WIN32 thread Kill issue /* TODO : solve WIN32 thread Kill issue
This would hang the server... since we are quitting it, its not really problematic, This would hang the server... since we are quitting it, its not really problematic,
all ressources will be desallocated at the end.
all ressources will be deallocated at the end.


fRequestListenPipe.Close(); fRequestListenPipe.Close();
fThread.Stop(); fThread.Stop();


Loading…
Cancel
Save