pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/DarwinStreamingServer Fetch is no longer interacti...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f0ec4aff68fd
branches: trunk
changeset: 616311:f0ec4aff68fd
user: joerg <joerg%pkgsrc.org@localhost>
date: Sun Mar 24 16:51:07 2013 +0000
description:
Fetch is no longer interactive. Allow building on 64bit platforms, even
if it is likely not going to run. Fix CONF_FILES.
diffstat:
net/DarwinStreamingServer/Makefile | 26 +-
net/DarwinStreamingServer/distinfo | 48 +++--
net/DarwinStreamingServer/patches/patch-APIModules_QTSSAdminModule_AdminElementNode.cpp | 13 +
net/DarwinStreamingServer/patches/patch-APIModules_QTSSMP3StreamingModule_QTSSMP3StreamingModule.cpp | 22 ++
net/DarwinStreamingServer/patches/patch-APIModules_QTSSReflectorModule_QTSSReflectorModule.cpp | 13 +
net/DarwinStreamingServer/patches/patch-CommonUtilitiesLib_EventContext.h | 28 +++
net/DarwinStreamingServer/patches/patch-CommonUtilitiesLib_Task.cpp | 82 ++++++++++
net/DarwinStreamingServer/patches/patch-CommonUtilitiesLib_Task.h | 13 +
net/DarwinStreamingServer/patches/patch-QTFileTools_QTBroadcaster.tproj_QTBroadcaster.cpp | 13 +
net/DarwinStreamingServer/patches/patch-Server.tproj_main.cpp | 13 +
net/DarwinStreamingServer/patches/patch-ab | 6 +-
net/DarwinStreamingServer/patches/patch-ac | 10 +-
net/DarwinStreamingServer/patches/patch-ad | 50 +++++-
net/DarwinStreamingServer/patches/patch-ae | 17 +-
net/DarwinStreamingServer/patches/patch-af | 10 +-
net/DarwinStreamingServer/patches/patch-ag | 6 +-
net/DarwinStreamingServer/patches/patch-ah | 6 +-
net/DarwinStreamingServer/patches/patch-ai | 8 +-
net/DarwinStreamingServer/patches/patch-aj | 17 +-
net/DarwinStreamingServer/patches/patch-al | 38 ++++-
net/DarwinStreamingServer/patches/patch-am | 8 +-
net/DarwinStreamingServer/patches/patch-an | 52 +++++-
net/DarwinStreamingServer/patches/patch-ap | 4 +-
net/DarwinStreamingServer/patches/patch-aq | 4 +-
net/DarwinStreamingServer/patches/patch-ar | 4 +-
net/DarwinStreamingServer/patches/patch-as | 4 +-
net/DarwinStreamingServer/patches/patch-at | 4 +-
net/DarwinStreamingServer/patches/patch-au | 12 +-
net/DarwinStreamingServer/patches/patch-av | 12 +-
29 files changed, 438 insertions(+), 105 deletions(-)
diffs (truncated from 815 to 300 lines):
diff -r 033f36b71e71 -r f0ec4aff68fd net/DarwinStreamingServer/Makefile
--- a/net/DarwinStreamingServer/Makefile Sun Mar 24 16:49:44 2013 +0000
+++ b/net/DarwinStreamingServer/Makefile Sun Mar 24 16:51:07 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/10/23 17:18:07 asau Exp $
+# $NetBSD: Makefile,v 1.12 2013/03/24 16:51:07 joerg Exp $
DISTNAME= DarwinStreamingSrvr5.5.5-Source
PKGNAME= DarwinStreamingServer-5.5.5
@@ -11,6 +11,8 @@
COMMENT= Open source version of Apple QuickTime Streaming Server
LICENSE= apple-public-source-license
+MAKE_JOBS_SAFE= no
+
RESTRICTED= Under APSL (see http://www.opensource.apple.com/apsl/).
NO_BIN_ON_CDROM=${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
@@ -20,7 +22,7 @@
USE_LANGUAGES= c c++
MAKE_FILE= Makefile.POSIX
-MAKE_ENV+= CCOMP=${CC:Q} CPLUS=${CXX:Q} LINKER=${CXX:Q}
+MAKE_ENV+= CCOMP=${CC:Q} CPLUS=${CXX:Q}\ -fPIC LINKER=${CXX:Q}
MAKE_ENV+= COMPILER_FLAGS=${CFLAGS:Q} INCLUDE_FLAG="-include"
MAKE_ENV+= CORE_LINK_LIBS="-pthread -lm -lcrypt -lstdc++"
MAKE_ENV+= SHARED="-shared" MODULE_LIBS="-lgcc -lstdc++"
@@ -46,6 +48,7 @@
BUILD_DIRS+= QTFileTools/QTSampleLister.tproj
BUILD_DIRS+= QTFileTools/QTTrackInfo.tproj
+INSTALLATION_DIRS+= bin sbin
INSTALLATION_DIRS+= libexec/StreamingServerModules
INSTALLATION_DIRS+= share/examples/streaming
INSTALLATION_DIRS+= share/streaming
@@ -60,15 +63,6 @@
PKG_GROUPS= qtss
PKG_GECOS.qtss= Darwin Streaming Server user
-INTERACTIVE_STAGE= fetch build
-
-FETCH_MESSAGE= "Darwin Streaming Server is available as a free download"
-FETCH_MESSAGE+= "under the APSL. Downloading the source code components"
-FETCH_MESSAGE+= "requires APSL registration."
-FETCH_MESSAGE+= "You should fetch the source code manually from"
-FETCH_MESSAGE+= "${MASTER_SITES}${DISTFILES} and put into"
-FETCH_MESSAGE+= "${DISTDIR}/${DISTFILES} directory."
-
REPLACE_PERL+= WebAdmin/WebAdminHtml/broadcaster_lib.pl
REPLACE_PERL+= WebAdmin/WebAdminHtml/parse_xml.cgi
REPLACE_PERL+= WebAdmin/WebAdminHtml/playlist-lib.pl
@@ -78,11 +72,11 @@
REPLACE_PERL+= WebAdmin/src/streamingadminserver.pl
REPLACE_PERL+= WinNTSupport/WinPasswdAssistant.pl
-CONF_FILES= ${PKG_SYSCONFDIR:Q}/streaming/qtgroups ${PKG_SYSCONFDIR:Q}/streaming/qtgroups
-CONF_FILES+= ${PKG_SYSCONFDIR:Q}/streaming/qtusers ${PKG_SYSCONFDIR:Q}/streaming/qtusers
-CONF_FILES+= ${PKG_SYSCONFDIR:Q}/streaming/relayconfig.xml-Sample ${PKG_SYSCONFDIR:Q}/streaming/relayconfig.xml
-CONF_FILES+= ${PKG_SYSCONFDIR:Q}/streaming/streamingloadtool.conf ${PKG_SYSCONFDIR:Q}/streaming/streamingloadtool.conf
-CONF_FILES+= ${PKG_SYSCONFDIR:Q}/streaming/streamingserver.xml-POSIX ${PKG_SYSCONFDIR:Q}/streaming/streamingserver.xml
+REQUIRE_DIRS+= ${PKG_SYSCONFDIR}/streaming
+CONF_FILES= share/examples/streaming/qtgroups ${PKG_SYSCONFDIR}/streaming/qtgroups
+CONF_FILES+= share/examples/streaming/qtusers ${PKG_SYSCONFDIR}/streaming/qtusers
+CONF_FILES+= share/examples/streaming/relayconfig.xml-Sample ${PKG_SYSCONFDIR}/streaming/relayconfig.xml
+CONF_FILES+= share/examples/streaming/streamingserver.xml-POSIX ${PKG_SYSCONFDIR}/streaming/streamingserver.xml
SUBST_CLASSES+= makefile
SUBST_STAGE.makefile= post-patch
diff -r 033f36b71e71 -r f0ec4aff68fd net/DarwinStreamingServer/distinfo
--- a/net/DarwinStreamingServer/distinfo Sun Mar 24 16:49:44 2013 +0000
+++ b/net/DarwinStreamingServer/distinfo Sun Mar 24 16:51:07 2013 +0000
@@ -1,26 +1,34 @@
-$NetBSD: distinfo,v 1.3 2007/05/23 07:52:15 adam Exp $
+$NetBSD: distinfo,v 1.4 2013/03/24 16:51:07 joerg Exp $
SHA1 (DarwinStreamingSrvr5.5.5-Source.tar.gz) = ba8419be20e1911f7167dbd48722b2ba5e6f1fe1
RMD160 (DarwinStreamingSrvr5.5.5-Source.tar.gz) = 62996496da51971e384fc26dd336ef2785c2dca7
Size (DarwinStreamingSrvr5.5.5-Source.tar.gz) = 21468268 bytes
+SHA1 (patch-APIModules_QTSSAdminModule_AdminElementNode.cpp) = 3138cf323890d3c1789467f29efcc65f6489d5eb
+SHA1 (patch-APIModules_QTSSMP3StreamingModule_QTSSMP3StreamingModule.cpp) = 0461ce97cdf2e7dd062d75b0139ee4c29e347218
+SHA1 (patch-APIModules_QTSSReflectorModule_QTSSReflectorModule.cpp) = 52238d46381f3cfe8f0425e4d5e93e8ce8959179
+SHA1 (patch-CommonUtilitiesLib_EventContext.h) = e6d8f19e54670141e35a811df64366ad9983fbd7
+SHA1 (patch-CommonUtilitiesLib_Task.cpp) = 5274c99a1f9239ef5a2096a48e3925a024868615
+SHA1 (patch-CommonUtilitiesLib_Task.h) = 7b231d0f84548c7b11fd392ebad9b96b6764428b
+SHA1 (patch-QTFileTools_QTBroadcaster.tproj_QTBroadcaster.cpp) = 2c3efe74e286e3d2cb66448461f0b7b8d278705c
+SHA1 (patch-Server.tproj_main.cpp) = d50e581a54609dab6a8146a39faf036de9c39ebf
SHA1 (patch-aa) = 2fc84964264f9b6529d031801b36bcca89f591a6
-SHA1 (patch-ab) = a2eb1ed133e3ebdc7e520a14062a48dcce58d9a6
-SHA1 (patch-ac) = be78f45065581e635457f3e345b674e0d720e8c2
-SHA1 (patch-ad) = d31372ce9770e98ad5fba665a32a3be079849a3b
-SHA1 (patch-ae) = 2759de18749753cb3243641122a0c2dd9f6d6506
-SHA1 (patch-af) = 043799c14d7c1c1ed8068d161eba820afc33317a
-SHA1 (patch-ag) = 3f788ef927e9d4206e73c74a4176213088ae8232
-SHA1 (patch-ah) = bc32a0b4f367d45810b80764c5f7468ef5f71577
-SHA1 (patch-ai) = 91248634b1ab3e1961ce800183d965b45bd686dd
-SHA1 (patch-aj) = b6fa42c1550a80d77a10da3c4537a321a858f783
+SHA1 (patch-ab) = cbd5aee473fcdd474fbdb13c0f9a769b544f250c
+SHA1 (patch-ac) = a9d9ae530402c0976bcb93386b7d202aea633fab
+SHA1 (patch-ad) = c3364ac4f520bae65ef8f63081cd8878c027bd08
+SHA1 (patch-ae) = a0b7cc02576b8488702a4fc280a1a6aa17313974
+SHA1 (patch-af) = 2e96215958104910c17b0abb149fb99551bfd5e8
+SHA1 (patch-ag) = 1d0457166760a3dace57934418912cf82f7f9793
+SHA1 (patch-ah) = fc7cf868dc5c9a01e703532ef81f02d70e07e1da
+SHA1 (patch-ai) = 8d48abfe3c8def3de806d05f15a685b79acde3b9
+SHA1 (patch-aj) = c430e97b3c99c31722474801cb3dfa31f8332413
SHA1 (patch-ak) = d573cee55a6097caf36de30cf95ea542c1f7a24f
-SHA1 (patch-al) = bd076ddc40df092d92cc18aba319f732287cdb6b
-SHA1 (patch-am) = 68de6ee8be78b602a5c615a5ed72c2e97d0eb953
-SHA1 (patch-an) = 9477b41eddeb0496cf8d3326a4e5fb9800efc157
-SHA1 (patch-ap) = 775ea3c983f874c7cda960e0442a749349d76a13
-SHA1 (patch-aq) = 229a6f94e731cbaf2ddcc4dbd6176be03251e2d8
-SHA1 (patch-ar) = 2abf9960c777a976d60b6189cd66696c39dd18de
-SHA1 (patch-as) = fd17b346afc4c4ebaa0c7bbf84229a2187860d6b
-SHA1 (patch-at) = d1d879ae4c072c7780b524611c5102c6bdad2fb8
-SHA1 (patch-au) = 89fe0648eb3acd83a9138f0b79c12e54086fa2a2
-SHA1 (patch-av) = 6408826975740e2e75a1a1c019516542d44552ed
+SHA1 (patch-al) = e8aa206cca186c568569da743344225efbef4c44
+SHA1 (patch-am) = 69f6c214a5922a7803708b35525d212b4bd3cff9
+SHA1 (patch-an) = a87b660201f7c5674634966fab232aabd7467276
+SHA1 (patch-ap) = 6fa5a543b0e20fb94e1695bd422600ade3612ce5
+SHA1 (patch-aq) = ce5e88b4454139c0f7f7b3ae19b9d02e088a3cf4
+SHA1 (patch-ar) = 31681ff6208969a1a44b7161187868b367ea4140
+SHA1 (patch-as) = a149fedb77925063c64cef500e57e7e2fca90622
+SHA1 (patch-at) = ce7db215f0650c1ee558b9c494aa14c30e8fda89
+SHA1 (patch-au) = e8a060399da968e078ec38ff35de9c8928b0ef46
+SHA1 (patch-av) = 9336a4a15f5af43d3b404ade340f7f571782a14a
diff -r 033f36b71e71 -r f0ec4aff68fd net/DarwinStreamingServer/patches/patch-APIModules_QTSSAdminModule_AdminElementNode.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/DarwinStreamingServer/patches/patch-APIModules_QTSSAdminModule_AdminElementNode.cpp Sun Mar 24 16:51:07 2013 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-APIModules_QTSSAdminModule_AdminElementNode.cpp,v 1.1 2013/03/24 16:51:07 joerg Exp $
+
+--- APIModules/QTSSAdminModule/AdminElementNode.cpp.orig 2003-08-15 23:52:42.000000000 +0000
++++ APIModules/QTSSAdminModule/AdminElementNode.cpp
+@@ -883,7 +883,7 @@ inline SInt32 ElementNode::ResolveSPLKe
+ if (fElementMap != NULL && keyPtr != NULL && keyPtr->Len > 0)
+ { osrefptr = fElementMap->Resolve(keyPtr);
+ if (osrefptr != NULL)
+- index = (SInt32) osrefptr->GetObject();
++ index = (SInt32)(intptr_t) osrefptr->GetObject();
+ }
+
+ return index;
diff -r 033f36b71e71 -r f0ec4aff68fd net/DarwinStreamingServer/patches/patch-APIModules_QTSSMP3StreamingModule_QTSSMP3StreamingModule.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/DarwinStreamingServer/patches/patch-APIModules_QTSSMP3StreamingModule_QTSSMP3StreamingModule.cpp Sun Mar 24 16:51:07 2013 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-APIModules_QTSSMP3StreamingModule_QTSSMP3StreamingModule.cpp,v 1.1 2013/03/24 16:51:07 joerg Exp $
+
+--- APIModules/QTSSMP3StreamingModule/QTSSMP3StreamingModule.cpp.orig 2004-12-01 13:05:34.000000000 +0000
++++ APIModules/QTSSMP3StreamingModule/QTSSMP3StreamingModule.cpp
+@@ -1172,7 +1172,7 @@ MP3SessionRefKey::MP3SessionRefKey(MP3Se
+ {
+ fMP3Session = fKeyValue->GetMP3Session();
+ if (fMP3Session != NULL)
+- fHashValue = (SInt32)fMP3Session->GetSession();
++ fHashValue = (SInt32)(intptr_t)fMP3Session->GetSession();
+ }
+ else
+ {
+@@ -1182,7 +1182,7 @@ MP3SessionRefKey::MP3SessionRefKey(MP3Se
+
+ MP3SessionRefKey::MP3SessionRefKey(QTSS_RTSPSessionObject rtspSessRef) :
+ fKeyValue(NULL),
+- fHashValue((SInt32)rtspSessRef),
++ fHashValue((SInt32)(intptr_t)rtspSessRef),
+ fMP3Session(NULL)
+ {
+ }
diff -r 033f36b71e71 -r f0ec4aff68fd net/DarwinStreamingServer/patches/patch-APIModules_QTSSReflectorModule_QTSSReflectorModule.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/DarwinStreamingServer/patches/patch-APIModules_QTSSReflectorModule_QTSSReflectorModule.cpp Sun Mar 24 16:51:07 2013 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-APIModules_QTSSReflectorModule_QTSSReflectorModule.cpp,v 1.1 2013/03/24 16:51:07 joerg Exp $
+
+--- APIModules/QTSSReflectorModule/QTSSReflectorModule.cpp.orig 2005-07-31 09:00:31.000000000 +0000
++++ APIModules/QTSSReflectorModule/QTSSReflectorModule.cpp
+@@ -1114,7 +1114,7 @@ void DoDescribeAddRequiredSDPLines(QTSS_
+ editedSDP->Put("o=broadcast_sdp ");
+ char tempBuff[256]= "";
+ tempBuff[255] = 0;
+- qtss_snprintf(tempBuff,sizeof(tempBuff) - 1, "%lu", (UInt32) theSession);
++ qtss_snprintf(tempBuff,sizeof(tempBuff) - 1, "%lu", (UInt32)(uintptr_t) theSession);
+ editedSDP->Put(tempBuff);
+
+ editedSDP->Put(" ");
diff -r 033f36b71e71 -r f0ec4aff68fd net/DarwinStreamingServer/patches/patch-CommonUtilitiesLib_EventContext.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/DarwinStreamingServer/patches/patch-CommonUtilitiesLib_EventContext.h Sun Mar 24 16:51:07 2013 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-CommonUtilitiesLib_EventContext.h,v 1.1 2013/03/24 16:51:07 joerg Exp $
+
+--- CommonUtilitiesLib/EventContext.h.orig 2005-05-18 08:01:14.000000000 +0000
++++ CommonUtilitiesLib/EventContext.h
+@@ -83,9 +83,9 @@ class EventContext
+ if (EVENTCONTEXT_DEBUG)
+ {
+ if (fTask== NULL)
+- qtss_printf("EventContext::SetTask context=%lu task= NULL\n", (UInt32) this);
++ qtss_printf("EventContext::SetTask context=%lu task= NULL\n", (UInt32)(uintptr_t) this);
+ else
+- qtss_printf("EventContext::SetTask context=%lu task= %lu name=%s\n",(UInt32) this,(UInt32) fTask, fTask->fTaskName);
++ qtss_printf("EventContext::SetTask context=%lu task= %lu name=%s\n",(UInt32)(uintptr_t) this,(UInt32)(uintptr_t) fTask, fTask->fTaskName);
+ }
+ }
+
+@@ -119,9 +119,9 @@ class EventContext
+ if (EVENTCONTEXT_DEBUG)
+ {
+ if (fTask== NULL)
+- qtss_printf("EventContext::ProcessEvent context=%lu task=NULL\n",(UInt32) this);
++ qtss_printf("EventContext::ProcessEvent context=%lu task=NULL\n",(UInt32)(uintptr_t) this);
+ else
+- qtss_printf("EventContext::ProcessEvent context=%lu task=%lu TaskName=%s\n",(UInt32)this,(UInt32) fTask, fTask->fTaskName);
++ qtss_printf("EventContext::ProcessEvent context=%lu task=%lu TaskName=%s\n",(UInt32)(uintptr_t)this,(UInt32)(uintptr_t) fTask, fTask->fTaskName);
+ }
+
+ if (fTask != NULL)
diff -r 033f36b71e71 -r f0ec4aff68fd net/DarwinStreamingServer/patches/patch-CommonUtilitiesLib_Task.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/DarwinStreamingServer/patches/patch-CommonUtilitiesLib_Task.cpp Sun Mar 24 16:51:07 2013 +0000
@@ -0,0 +1,82 @@
+$NetBSD: patch-CommonUtilitiesLib_Task.cpp,v 1.1 2013/03/24 16:51:07 joerg Exp $
+
+--- CommonUtilitiesLib/Task.cpp.orig 2005-05-31 10:54:25.000000000 +0000
++++ CommonUtilitiesLib/Task.cpp
+@@ -104,7 +104,7 @@ void Task::Signal(EventFlags events)
+ // Task needs to be placed on a particular thread.
+ {
+ if (TASK_DEBUG) if (fTaskName[0] == 0) ::strcpy(fTaskName, " corrupt task");
+- if (TASK_DEBUG) qtss_printf("Task::Signal enque TaskName=%s fUseThisThread=%lu q elem=%lu enclosing=%lu\n", fTaskName, (UInt32) fUseThisThread, (UInt32) &fTaskQueueElem, (UInt32) this);
++ if (TASK_DEBUG) qtss_printf("Task::Signal enque TaskName=%s fUseThisThread=%lu q elem=%lu enclosing=%lu\n", fTaskName, (UInt32)(uintptr_t) fUseThisThread, (UInt32)(uintptr_t)
&fTaskQueueElem, (UInt32)(uintptr_t) this);
+ fUseThisThread->fTaskQueue.EnQueue(&fTaskQueueElem);
+ }
+ else
+@@ -113,12 +113,12 @@ void Task::Signal(EventFlags events)
+ unsigned int theThread = atomic_add(&sThreadPicker, 1);
+ theThread %= TaskThreadPool::sNumTaskThreads;
+ if (TASK_DEBUG) if (fTaskName[0] == 0) ::strcpy(fTaskName, " corrupt task");
+- if (TASK_DEBUG) qtss_printf("Task::Signal enque TaskName=%s thread=%lu q elem=%lu enclosing=%lu\n", fTaskName, (UInt32)TaskThreadPool::sTaskThreadArray[theThread],(UInt32)
&fTaskQueueElem,(UInt32) this);
++ if (TASK_DEBUG) qtss_printf("Task::Signal enque TaskName=%s thread=%lu q elem=%lu enclosing=%lu\n", fTaskName,
(UInt32)(uintptr_t)TaskThreadPool::sTaskThreadArray[theThread],(UInt32)(uintptr_t) &fTaskQueueElem,(UInt32)(uintptr_t) this);
+ TaskThreadPool::sTaskThreadArray[theThread]->fTaskQueue.EnQueue(&fTaskQueueElem);
+ }
+ }
+ else
+- if (TASK_DEBUG) qtss_printf("Task::Signal sent to dead TaskName=%s q elem=%lu enclosing=%lu\n", fTaskName, (UInt32) &fTaskQueueElem, (UInt32) this);
++ if (TASK_DEBUG) qtss_printf("Task::Signal sent to dead TaskName=%s q elem=%lu enclosing=%lu\n", fTaskName, (UInt32)(uintptr_t) &fTaskQueueElem, (UInt32)(uintptr_t) this);
+
+
+ }
+@@ -165,7 +165,7 @@ void TaskThread::Entry()
+ if (theTask->fWriteLock)
+ {
+ OSMutexWriteLocker mutexLocker(&TaskThreadPool::sMutexRW);
+- if (TASK_DEBUG) qtss_printf("TaskThread::Entry run global locked TaskName=%s CurMSec=%.3f thread=%ld task=%ld\n", theTask->fTaskName, OS::StartTimeMilli_Float() ,(SInt32)
this,(SInt32) theTask);
++ if (TASK_DEBUG) qtss_printf("TaskThread::Entry run global locked TaskName=%s CurMSec=%.3f thread=%ld task=%ld\n", theTask->fTaskName, OS::StartTimeMilli_Float() ,(SInt32)(uintptr_t)
this,(SInt32)(uintptr_t) theTask);
+
+ theTimeout = theTask->Run();
+ theTask->fWriteLock = false;
+@@ -173,7 +173,7 @@ void TaskThread::Entry()
+ else
+ {
+ OSMutexReadLocker mutexLocker(&TaskThreadPool::sMutexRW);
+- if (TASK_DEBUG) qtss_printf("TaskThread::Entry run TaskName=%s CurMSec=%.3f thread=%ld task=%ld\n", theTask->fTaskName, OS::StartTimeMilli_Float(), (SInt32) this,(SInt32) theTask);
++ if (TASK_DEBUG) qtss_printf("TaskThread::Entry run TaskName=%s CurMSec=%.3f thread=%ld task=%ld\n", theTask->fTaskName, OS::StartTimeMilli_Float(), (SInt32)(uintptr_t)
this,(SInt32)(uintptr_t) theTask);
+
+ theTimeout = theTask->Run();
+
+@@ -187,7 +187,7 @@ void TaskThread::Entry()
+ {
+ if (TASK_DEBUG)
+ {
+- qtss_printf("TaskThread::Entry delete TaskName=%s CurMSec=%.3f thread=%ld task=%ld\n", theTask->fTaskName, OS::StartTimeMilli_Float(), (SInt32) this, (SInt32) theTask);
++ qtss_printf("TaskThread::Entry delete TaskName=%s CurMSec=%.3f thread=%ld task=%ld\n", theTask->fTaskName, OS::StartTimeMilli_Float(), (SInt32)(uintptr_t) this,
(SInt32)(uintptr_t) theTask);
+
+ theTask->fUseThisThread = NULL;
+
+@@ -226,7 +226,7 @@ void TaskThread::Entry()
+ {
+ //note that if we get here, we don't reset theTask, so it will get passed into
+ //WaitForTask
+- if (TASK_DEBUG) qtss_printf("TaskThread::Entry insert TaskName=%s in timer heap thread=%lu elem=%lu task=%ld timeout=%.2f\n", theTask->fTaskName, (UInt32) this, (UInt32)
&theTask->fTimerHeapElem,(SInt32) theTask, (float)theTimeout / (float) 1000);
++ if (TASK_DEBUG) qtss_printf("TaskThread::Entry insert TaskName=%s in timer heap thread=%lu elem=%lu task=%ld timeout=%.2f\n", theTask->fTaskName, (UInt32)(uintptr_t) this,
(UInt32)(uintptr_t) &theTask->fTimerHeapElem,(SInt32)(uintptr_t) theTask, (float)theTimeout / (float) 1000);
+ theTask->fTimerHeapElem.SetValue(OS::Milliseconds() + theTimeout);
+ fHeap.Insert(&theTask->fTimerHeapElem);
+ (void)atomic_or(&theTask->fEvents, Task::kIdleEvent);
+@@ -264,7 +264,7 @@ Task* TaskThread::WaitForTask()
+
+ if ((fHeap.PeekMin() != NULL) && (fHeap.PeekMin()->GetValue() <= theCurrentTime))
+ {
+- if (TASK_DEBUG) qtss_printf("TaskThread::WaitForTask found timer-task=%s thread %lu fHeap.CurrentHeapSize(%lu) taskElem = %lu
enclose=%lu\n",((Task*)fHeap.PeekMin()->GetEnclosingObject())->fTaskName, (UInt32) this, fHeap.CurrentHeapSize(), (UInt32) fHeap.PeekMin(), (UInt32) fHeap.PeekMin()->GetEnclosingObject());
++ if (TASK_DEBUG) qtss_printf("TaskThread::WaitForTask found timer-task=%s thread %lu fHeap.CurrentHeapSize(%lu) taskElem = %lu
enclose=%lu\n",((Task*)fHeap.PeekMin()->GetEnclosingObject())->fTaskName, (UInt32)(uintptr_t) this, fHeap.CurrentHeapSize(), (UInt32)(uintptr_t) fHeap.PeekMin(), (UInt32)(uintptr_t)
fHeap.PeekMin()->GetEnclosingObject());
+ return (Task*)fHeap.ExtractMin()->GetEnclosingObject();
+ }
+
+@@ -286,7 +286,7 @@ Task* TaskThread::WaitForTask()
+ OSQueueElem* theElem = fTaskQueue.DeQueueBlocking(this, (SInt32) theTimeout);
+ if (theElem != NULL)
+ {
+- if (TASK_DEBUG) qtss_printf("TaskThread::WaitForTask found signal-task=%s thread %lu fTaskQueue.GetLength(%lu) taskElem = %lu enclose=%lu\n",
((Task*)theElem->GetEnclosingObject())->fTaskName, (UInt32) this, fTaskQueue.GetQueue()->GetLength(), (UInt32) theElem, (UInt32)theElem->GetEnclosingObject() );
Home |
Main Index |
Thread Index |
Old Index