这是indexloc提供的服务，不要输入任何密码
Skip to content

Use semaphores for thread synchronization #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 21, 2023
Merged

Use semaphores for thread synchronization #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# <https://www.gnu.org/licenses/>.

SUBDIRS = tests
AM_CXXFLAGS = -std=c++11 -Wall -Wextra -pedantic -pthread
AM_CXXFLAGS = -std=c++20 -Wall -Wextra -pedantic -pthread

bin_PROGRAMS = termux-elf-cleaner

Expand Down
38 changes: 15 additions & 23 deletions elf-cleaner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ along with termux-elf-cleaner. If not, see
#include <unistd.h>

#include <algorithm>
#include <deque>
#include <mutex>
#include <future>
#include <semaphore>
#include <thread>
#include <vector>

Expand Down Expand Up @@ -64,8 +64,6 @@ int api_level = 21;
bool dry_run = false;
bool quiet = false;

std::mutex mutex;

static char const *const usage_message[] =
{ "\
\n\
Expand Down Expand Up @@ -311,16 +309,6 @@ int parse_file(const char *file_name)
return 0;
}

void parse_file_handler(std::deque<const char*>* files, unsigned int &pos) {
while (files->size() > pos) {
mutex.lock();
const char *file = files->at(pos);
pos++;
mutex.unlock();
parse_file(file);
}
}

int main(int argc, char **argv)
{
int skip_args = 0;
Expand Down Expand Up @@ -362,15 +350,19 @@ int main(int argc, char **argv)
if (argc - (skip_args + 1) <= threads_count) threads_count = files_count;
if (threads_count < 1) threads_count = 1;

std::deque<const char*> files;
std::vector<std::thread> threads(threads_count);
unsigned int pos = 0;
std::vector<std::future<void>> futures;
std::counting_semaphore sem(threads_count);

for (int i = skip_args + 1; i < argc; i++) {
sem.acquire();
const char* file = argv[i];
futures.push_back(std::async([file, &sem]() {
parse_file(file);
sem.release();
}));
}

for (auto& future : futures) future.get();

for (int i = skip_args + 1; i < argc; i++)
files.push_back(argv[i]);
for (int i = 0; i < threads_count; i++)
threads[i] = std::thread(parse_file_handler, &files, std::ref(pos));
for (std::thread& thread : threads)
if (thread.joinable()) thread.join();
return 0;
}