Revision: 40577
http://brlcad.svn.sourceforge.net/brlcad/?rev=40577&view=rev
Author: davidloman
Date: 2010-09-15 15:07:36 +0000 (Wed, 15 Sep 2010)
Log Message:
-----------
Remove old ThreadUtils and replace it with GSThread. GSThread contains all the
functionality of ThreadUtils.
Modified Paths:
--------------
rt^3/trunk/src/libJob/JobManager.cxx
rt^3/trunk/src/utility/CMakeLists.txt
rt^3/trunk/src/utility/GSThread.cxx
Removed Paths:
-------------
rt^3/trunk/include/ThreadUtils.h
rt^3/trunk/src/utility/ThreadUtils.cxx
Deleted: rt^3/trunk/include/ThreadUtils.h
===================================================================
--- rt^3/trunk/include/ThreadUtils.h 2010-09-15 14:59:28 UTC (rev 40576)
+++ rt^3/trunk/include/ThreadUtils.h 2010-09-15 15:07:36 UTC (rev 40577)
@@ -1,53 +0,0 @@
-/* T H R E A D U T I L S . H
- * BRLCAD
- *
- * Copyright (c) 2010 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-/** @file ThreadUtils.h
- * ThreadUtils.h
- *
- */
-
-#ifndef __THREADUTILS_H__
-#define __THREADUTILS_H__
-
-#include <QtCore/QThread>
-
-class ThreadUtils: public QThread
-{
-public:
- virtual ~ThreadUtils();
-
- void static sleep(unsigned long secs);
- void static msleep(unsigned long msecs);
- void static usleep(unsigned long usecs);
-
-private:
- ThreadUtils();
-};
-
-#endif /* __THREADUTILS_H__ */
-
-/*
- * Local Variables:
- * tab-width: 8
- * mode: C
- * indent-tabs-mode: t
- * c-file-style: "stroustrup"
- * End:
- * ex: shiftwidth=4 tabstop=8
- */
Modified: rt^3/trunk/src/libJob/JobManager.cxx
===================================================================
--- rt^3/trunk/src/libJob/JobManager.cxx 2010-09-15 14:59:28 UTC (rev
40576)
+++ rt^3/trunk/src/libJob/JobManager.cxx 2010-09-15 15:07:36 UTC (rev
40577)
@@ -85,7 +85,7 @@
while (this->jobQueue->size() != 0 && finishJobQueue) {
this->log->logINFO("JobManager", "Waiting for JobWorkers to process
JobQueue. " + QString::number(this->jobQueue->size()) + " items remain...");
- ThreadUtils::sleep(waitTimePerLoopSecs);
+ GSThread::sleep(waitTimePerLoopSecs);
++curPasses;
if (curPasses >= maxPasses) {
this->log->logINFO("JobManager", "Shutdown Wait-time fail safe
reached. Forcing Shutdown.");
Modified: rt^3/trunk/src/utility/CMakeLists.txt
===================================================================
--- rt^3/trunk/src/utility/CMakeLists.txt 2010-09-15 14:59:28 UTC (rev
40576)
+++ rt^3/trunk/src/utility/CMakeLists.txt 2010-09-15 15:07:36 UTC (rev
40577)
@@ -45,7 +45,6 @@
DataStreamUtils.cxx
GSException.cxx
Logger.cxx
- ThreadUtils.cxx
GSThread.cxx
)
@@ -55,7 +54,6 @@
DataStreamUtils.h
GSException.h
Logger.h
- ThreadUtils.h
GSThread.h
)
Modified: rt^3/trunk/src/utility/GSThread.cxx
===================================================================
--- rt^3/trunk/src/utility/GSThread.cxx 2010-09-15 14:59:28 UTC (rev 40576)
+++ rt^3/trunk/src/utility/GSThread.cxx 2010-09-15 15:07:36 UTC (rev 40577)
@@ -25,7 +25,7 @@
#include "GSThread.h"
-QList<GSThread*> threads();
+QList<GSThread*> GSThread::threads;
GSThread::GSThread()
{
Deleted: rt^3/trunk/src/utility/ThreadUtils.cxx
===================================================================
--- rt^3/trunk/src/utility/ThreadUtils.cxx 2010-09-15 14:59:28 UTC (rev
40576)
+++ rt^3/trunk/src/utility/ThreadUtils.cxx 2010-09-15 15:07:36 UTC (rev
40577)
@@ -1,57 +0,0 @@
-/* T H R E A D U T I L S . C X X
- * BRLCAD
- *
- * Copyright (c) 2010 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-/** @file ThreadUtils.cxx
- * ThreadUtils.cpp
- *
- * Created on: Apr 21, 2010
- * Author: dloman
- */
-
-#include "ThreadUtils.h"
-
-ThreadUtils::ThreadUtils()
-{
- // TODO Auto-generated constructor stub
-
-}
-
-ThreadUtils::~ThreadUtils()
-{
- // TODO Auto-generated destructor stub
-}
-void ThreadUtils::sleep(unsigned long secs) {
- QThread::sleep(secs);
-}
-
-void ThreadUtils::msleep(unsigned long msecs) {
- QThread::msleep(msecs);
-}
-
-void ThreadUtils::usleep(unsigned long usecs) {
- QThread::usleep(usecs);
-}
-// Local Variables:
-// tab-width: 8
-// mode: C++
-// c-basic-offset: 4
-// indent-tabs-mode: t
-// c-file-style: "stroustrup"
-// End:
-// ex: shiftwidth=4 tabstop=8
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
