games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

convert line endings from CRLF (Windows) to LF (Linux/Unix)

Browse Source 
Mixed line endings cause problems when exporting patches with
git-format-patch and then trying to "git am" a patch with mixed and
non-matching line endings. In such a situation git will fail to apply
the patch.

This commit runs the dos2unix tools on the remaining files with CRLF
(\r\n) line endings to convert them to line-feeds (\n) only.

Files that are Windows specific like *.vcxproj and *.props files were
not converted.

Closes: #3073
This commit is contained in:
Johannes Schauer Marin Rodrigues
2023-10-19 16:19:09 +02:00
parent d295840c64
commit a1a5bc28c2
309 changed files with 98656 additions and 98656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
lib/CThreadHelper.h
View File

@@ -1,87 +1,87 @@
/*
* CThreadHelper.h, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
VCMI_LIB_NAMESPACE_BEGIN
///DEPRECATED
/// Can assign CPU work to other threads/cores
class DLL_LINKAGE CThreadHelper
{
public:
using Task = std::function<void()>;
CThreadHelper(std::vector<std::function<void()> > *Tasks, int Threads);
void run();
private:
boost::mutex rtinm;
int currentTask, amount, threads;
std::vector<Task> *tasks;
void processTasks();
};
template<typename Payload>
class ThreadPool
{
public:
using Task = std::function<void(std::shared_ptr<Payload>)>;
using Tasks = std::vector<Task>;
ThreadPool(Tasks * tasks_, std::vector<std::shared_ptr<Payload>> context_)
: currentTask(0),
amount(tasks_->size()),
threads(context_.size()),
tasks(tasks_),
context(context_)
{}
void run()
{
std::vector<boost::thread> group;
for(size_t i=0; i<threads; i++)
{
std::shared_ptr<Payload> payload = context.at(i);
group.emplace_back(std::bind(&ThreadPool::processTasks, this, payload));
}
for (auto & thread : group)
thread.join();
//thread group deletes threads, do not free manually
}
private:
boost::mutex rtinm;
size_t currentTask, amount, threads;
Tasks * tasks;
std::vector<std::shared_ptr<Payload>> context;
void processTasks(std::shared_ptr<Payload> payload)
{
while(true)
{
size_t pom;
{
boost::unique_lock<boost::mutex> lock(rtinm);
if((pom = currentTask) >= amount)
break;
else
++currentTask;
}
(*tasks)[pom](payload);
}
}
};
void DLL_LINKAGE setThreadName(const std::string &name);
VCMI_LIB_NAMESPACE_END
/*
* CThreadHelper.h, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once
VCMI_LIB_NAMESPACE_BEGIN
///DEPRECATED
/// Can assign CPU work to other threads/cores
class DLL_LINKAGE CThreadHelper
{
public:
using Task = std::function<void()>;
CThreadHelper(std::vector<std::function<void()> > *Tasks, int Threads);
void run();
private:
boost::mutex rtinm;
int currentTask, amount, threads;
std::vector<Task> *tasks;
void processTasks();
};
template<typename Payload>
class ThreadPool
{
public:
using Task = std::function<void(std::shared_ptr<Payload>)>;
using Tasks = std::vector<Task>;
ThreadPool(Tasks * tasks_, std::vector<std::shared_ptr<Payload>> context_)
: currentTask(0),
amount(tasks_->size()),
threads(context_.size()),
tasks(tasks_),
context(context_)
{}
void run()
{
std::vector<boost::thread> group;
for(size_t i=0; i<threads; i++)
{
std::shared_ptr<Payload> payload = context.at(i);
group.emplace_back(std::bind(&ThreadPool::processTasks, this, payload));
}
for (auto & thread : group)
thread.join();
//thread group deletes threads, do not free manually
}
private:
boost::mutex rtinm;
size_t currentTask, amount, threads;
Tasks * tasks;
std::vector<std::shared_ptr<Payload>> context;
void processTasks(std::shared_ptr<Payload> payload)
{
while(true)
{
size_t pom;
{
boost::unique_lock<boost::mutex> lock(rtinm);
if((pom = currentTask) >= amount)
break;
else
++currentTask;
}
(*tasks)[pom](payload);
}
}
};
void DLL_LINKAGE setThreadName(const std::string &name);
VCMI_LIB_NAMESPACE_END