OSDN Git Service

Fixed a bug in AbstractTool class that could cause a severe slow-down on process...
[lamexp/LameXP.git] / src / Tool_Abstract.cpp
index 5a71890..7d7c96c 100644 (file)
@@ -1,11 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This program 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 Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// (at your option) any later version, but always including the *additional*
+// restrictions defined in the "License.txt" file.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 #include "Tool_Abstract.h"
 
+//Internal
 #include "Global.h"
+#include "JobObject.h"
 
+//MUtils
+#include <MUtils/Global.h>
+#include <MUtils/OSSupport.h>
+
+//Qt
 #include <QProcess>
 #include <QMutex>
 #include <QMutexLocker>
 #include <QDir>
 
 /*
- * Win32 API definitions
+ * Job Object
  */
-typedef HANDLE (WINAPI *CreateJobObjectFun)(__in_opt LPSECURITY_ATTRIBUTES lpJobAttributes, __in_opt LPCSTR lpName);
-typedef BOOL (WINAPI *SetInformationJobObjectFun)(__in HANDLE hJob, __in JOBOBJECTINFOCLASS JobObjectInformationClass, __in_bcount(cbJobObjectInformationLength) LPVOID lpJobObjectInformation, __in DWORD cbJobObjectInformationLength);
-typedef BOOL (WINAPI *AssignProcessToJobObjectFun)(__in HANDLE hJob, __in HANDLE hProcess);
+QScopedPointer<JobObject> AbstractTool::s_jobObject;
+QMutex                    AbstractTool::s_jobObjMtx;
 
 /*
- * Static vars
+ * Process Timer
  */
-quint64 AbstractTool::m_lastLaunchTime = 0ui64;
-QMutex *AbstractTool::m_mutex_startProcess = NULL;
-HANDLE AbstractTool::m_handle_jobObject = NULL;
-unsigned int AbstractTool::m_jobObjRefCount = 0U;
+quint64 AbstractTool::s_startProcessTimer = 0ui64;
+QMutex  AbstractTool::s_startProcessMutex;
 
 /*
  * Const
  */
-static const DWORD START_DELAY = 333; //in milliseconds
-static const quint64 START_DELAY_NANO = START_DELAY * 1000 * 10; //in 100-nanosecond intervals
+static const unsigned int START_DELAY = 50U;                                                           //in milliseconds
+static const quint64 START_DELAY_NANO = quint64(START_DELAY) * 10000ui64;      //in 100-nanosecond intervals
 
 /*
  * Constructor
  */
 AbstractTool::AbstractTool(void)
 {
-       static CreateJobObjectFun CreateJobObjectPtr = NULL;
-       static SetInformationJobObjectFun SetInformationJobObjectPtr = NULL;
+       QMutexLocker lock(&s_jobObjMtx);
 
-       if(!m_mutex_startProcess)
+       if(s_jobObject.isNull())
        {
-               m_mutex_startProcess = new QMutex();
-       }
-
-       QMutexLocker lock(m_mutex_startProcess);
-
-       if(m_jobObjRefCount < 1U)
-       {
-               DWORD osVersionNo = lamexp_get_os_version();
-               if(LAMEXP_MIN_OS_VER(osVersionNo, 5, 1))
-               {
-                       if((!CreateJobObjectPtr) || (!SetInformationJobObjectPtr))
-                       {
-                               QLibrary Kernel32Lib("kernel32.dll");
-                               CreateJobObjectPtr = (CreateJobObjectFun) Kernel32Lib.resolve("CreateJobObjectA");
-                               SetInformationJobObjectPtr = (SetInformationJobObjectFun) Kernel32Lib.resolve("SetInformationJobObject");
-                       }
-               }
-               if(CreateJobObjectPtr && SetInformationJobObjectPtr)
-               {
-                       HANDLE jobObject = CreateJobObjectPtr(NULL, NULL);
-                       if((jobObject != NULL) && (jobObject != INVALID_HANDLE_VALUE))
-                       {
-                               JOBOBJECT_EXTENDED_LIMIT_INFORMATION jobExtendedLimitInfo;
-                               memset(&jobExtendedLimitInfo, 0, sizeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION));
-                               memset(&jobExtendedLimitInfo.BasicLimitInformation, 0, sizeof(JOBOBJECT_BASIC_LIMIT_INFORMATION));
-                               jobExtendedLimitInfo.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE | JOB_OBJECT_LIMIT_DIE_ON_UNHANDLED_EXCEPTION;
-                               if(SetInformationJobObjectPtr(jobObject, JobObjectExtendedLimitInformation, &jobExtendedLimitInfo, sizeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION)))
-                               {
-                                       m_handle_jobObject = jobObject;
-                                       m_jobObjRefCount = 1U;
-                               }
-                               else
-                               {
-                                       qWarning("Failed to set job object information!");
-                                       CloseHandle(jobObject);
-                               }
-                       }
-                       else
-                       {
-                               qWarning("Failed to create the job object!");
-                       }
-               }
-       }
-       else
-       {
-               m_jobObjRefCount++;
+               s_jobObject.reset(new JobObject());
        }
 
        m_firstLaunch = true;
@@ -117,17 +76,6 @@ AbstractTool::AbstractTool(void)
  */
 AbstractTool::~AbstractTool(void)
 {
-       QMutexLocker lock(m_mutex_startProcess);
-
-       if(m_jobObjRefCount >= 1U)
-       {
-               m_jobObjRefCount--;
-               if((m_jobObjRefCount < 1U) && m_handle_jobObject)
-               {
-                       CloseHandle(m_handle_jobObject);
-                       m_handle_jobObject = NULL;
-               }
-       }
 }
 
 /*
@@ -135,48 +83,31 @@ AbstractTool::~AbstractTool(void)
  */
 bool AbstractTool::startProcess(QProcess &process, const QString &program, const QStringList &args)
 {
-       static AssignProcessToJobObjectFun AssignProcessToJobObjectPtr = NULL;
-       
-       QMutexLocker lock(m_mutex_startProcess);
+       QMutexLocker lock(&s_startProcessMutex);
 
-       if(currentTime() <= m_lastLaunchTime)
+       while(MUtils::OS::current_file_time() <= s_startProcessTimer)
        {
-               Sleep(START_DELAY);
+               lock.unlock();
+               MUtils::OS::sleep_ms(START_DELAY);
+               lock.relock();
        }
 
        emit messageLogged(commandline2string(program, args) + "\n");
+       MUtils::init_process(process, QFileInfo(program).absolutePath());
 
-       QProcessEnvironment env = process.processEnvironment();
-       if(env.isEmpty()) env = QProcessEnvironment::systemEnvironment();
-       env.insert("TEMP", QDir::toNativeSeparators(lamexp_temp_folder2()));
-       env.insert("TMP", QDir::toNativeSeparators(lamexp_temp_folder2()));
-       process.setProcessEnvironment(env);
-       
-       if(!AssignProcessToJobObjectPtr)
-       {
-               QLibrary Kernel32Lib("kernel32.dll");
-               AssignProcessToJobObjectPtr = (AssignProcessToJobObjectFun) Kernel32Lib.resolve("AssignProcessToJobObject");
-       }
-       
-       process.setProcessChannelMode(QProcess::MergedChannels);
-       process.setReadChannel(QProcess::StandardOutput);
        process.start(program, args);
        
        if(process.waitForStarted())
        {
-               if(AssignProcessToJobObjectPtr && m_handle_jobObject)
+               if(s_jobObject)
                {
-                       if(!AssignProcessToJobObjectPtr(m_handle_jobObject, process.pid()->hProcess))
+                       if(!s_jobObject->addProcessToJob(&process))
                        {
                                qWarning("Failed to assign process to job object!");
                        }
                }
-               if(!SetPriorityClass(process.pid()->hProcess, BELOW_NORMAL_PRIORITY_CLASS))
-               {
-                       SetPriorityClass(process.pid()->hProcess, IDLE_PRIORITY_CLASS);
-               }
-               
-               lock.unlock();
+
+               MUtils::OS::change_process_priority(&process, -1);
                
                if(m_firstLaunch)
                {
@@ -184,7 +115,7 @@ bool AbstractTool::startProcess(QProcess &process, const QString &program, const
                        m_firstLaunch = false;
                }
                
-               m_lastLaunchTime = currentTime() + START_DELAY_NANO;
+               s_startProcessTimer = MUtils::OS::current_file_time() + START_DELAY_NANO;
                return true;
        }
 
@@ -195,7 +126,7 @@ bool AbstractTool::startProcess(QProcess &process, const QString &program, const
        process.kill();
        process.waitForFinished(-1);
 
-       m_lastLaunchTime = currentTime() + START_DELAY_NANO;
+       s_startProcessTimer = MUtils::OS::current_file_time() + START_DELAY_NANO;
        return false;
 }
 
@@ -214,38 +145,4 @@ QString AbstractTool::commandline2string(const QString &program, const QStringLi
        return commandline;
 }
 
-/*
- * Convert long path to short path
- */
-QString AbstractTool::pathToShort(const QString &longPath)
-{
-       QString shortPath;
-       DWORD buffSize = GetShortPathNameW(reinterpret_cast<const wchar_t*>(longPath.utf16()), NULL, NULL);
-       
-       if(buffSize > 0)
-       {
-               wchar_t *buffer = new wchar_t[buffSize];
-               DWORD result = GetShortPathNameW(reinterpret_cast<const wchar_t*>(longPath.utf16()), buffer, buffSize);
-
-               if(result > 0 && result < buffSize)
-               {
-                       shortPath = QString::fromUtf16(reinterpret_cast<const unsigned short*>(buffer));
-               }
-
-               delete[] buffer;
-       }
-
-       return (shortPath.isEmpty() ? longPath : shortPath);
-}
-
-const quint64 AbstractTool::currentTime(void)
-{
-       FILETIME fileTime;
-       GetSystemTimeAsFileTime(&fileTime);
-
-       ULARGE_INTEGER temp;
-       temp.HighPart = fileTime.dwHighDateTime;
-       temp.LowPart = fileTime.dwLowDateTime;
 
-       return temp.QuadPart;
-}