X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e059d69c2ce61b1ba1ae2e0b9c75eb53bb26f1bb..59e42503e34758a946ebee1a1405fecb8fe7236d:/lib/components/file_eraser.cpp

diff --git a/lib/components/file_eraser.cpp b/lib/components/file_eraser.cpp
index bc26bf7c..9f92fa44 100644
--- a/lib/components/file_eraser.cpp
+++ b/lib/components/file_eraser.cpp
@@ -1,4 +1,5 @@
 #include <lib/components/file_eraser.h>
+#include <lib/base/ioprio.h>
 #include <lib/base/eerror.h>
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
@@ -10,12 +11,12 @@
 eBackgroundFileEraser *eBackgroundFileEraser::instance;
 
 eBackgroundFileEraser::eBackgroundFileEraser()
-	:messages(this,1), stop_thread_timer(this)
+	:messages(this,1), stop_thread_timer(eTimer::create(this))
 {
 	if (!instance)
 		instance=this;
 	CONNECT(messages.recv_msg, eBackgroundFileEraser::gotMessage);
-	CONNECT(stop_thread_timer.timeout, eBackgroundFileEraser::idle);
+	CONNECT(stop_thread_timer->timeout, eBackgroundFileEraser::idle);
 }
 
 void eBackgroundFileEraser::idle()
@@ -26,18 +27,24 @@ void eBackgroundFileEraser::idle()
 eBackgroundFileEraser::~eBackgroundFileEraser()
 {
 	messages.send(Message::quit);
-	if ( thread_running() )
-		kill();
 	if (instance==this)
 		instance=0;
+	kill();  // i dont understand why this is needed .. in ~eThread::eThread is a kill() to..
 }
 
 void eBackgroundFileEraser::thread()
 {
+	hasStarted();
+
 	nice(5);
+
+	setIoPrio(IOPRIO_CLASS_BE, 7);
+
 	reset();
+
 	runLoop();
-	stop_thread_timer.stop();
+
+	stop_thread_timer->stop();
 }
 
 void eBackgroundFileEraser::erase(const char *filename)
@@ -45,14 +52,13 @@ void eBackgroundFileEraser::erase(const char *filename)
 	if (filename)
 	{
 		char buf[255];
-		snprintf(buf, 255, "%s.$$$", filename);
+		snprintf(buf, 255, "%s.del", filename);
 		if (rename(filename, buf)<0)
 			;/*perror("rename file failed !!!");*/
 		else
 		{
 			messages.send(Message(Message::erase, strdup(buf)));
-			if (!thread_running())
-				run();
+			run();
 		}
 	}
 }
@@ -70,7 +76,7 @@ void eBackgroundFileEraser::gotMessage(const Message &msg )
 					eDebug("file %s erased", msg.filename);
 				free((char*)msg.filename);
 			}
-			stop_thread_timer.start(2000, true); // stop thread in two seconds
+			stop_thread_timer->start(1000, true); // stop thread in one seconds
 			break;
 		case Message::quit:
 			quit(0);