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

Implement multi threaded file processing #27

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 4 commits into from
Dec 15, 2023
Merged

Implement multi threaded file processing #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4384137
Implement multithreading
XniceCraft Dec 9, 2023
04755b3
Use index instead of copying the item
XniceCraft Dec 9, 2023
5e679bc
Pass pos variable by reference
XniceCraft Dec 9, 2023
2d93754
Makefile: compile with -pthread
Grimler91 Dec 15, 2023
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
AM_CXXFLAGS = -std=c++11 -Wall -Wextra -pedantic -pthread

bin_PROGRAMS = termux-elf-cleaner

Expand Down
44 changes: 39 additions & 5 deletions elf-cleaner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ You should have received a copy of the GNU General Public License
along with termux-elf-cleaner. If not, see
<https://www.gnu.org/licenses/>. */

#include <algorithm>
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif

#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
Expand All @@ -29,6 +32,12 @@ along with termux-elf-cleaner. If not, see
#include <sys/types.h>
#include <unistd.h>

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

#include "arghandling.h"

// Include a local elf.h copy as not all platforms have it.
Expand All @@ -55,6 +64,8 @@ int api_level = 21;
bool dry_run = false;
bool quiet = false;

std::mutex mutex;

static char const *const usage_message[] =
{ "\
\n\
Expand All @@ -64,6 +75,7 @@ dynamic section entries which the Android linker warns about.\n\
Options:\n\
\n\
--api-level NN choose target api level, i.e. 21, 24, ..\n\
--jobs N run parallel on n thread(s).\n\
--dry-run print info but but do not remove entries\n\
--quiet do not print info about removed entries\n\
--help display this help and exit\n\
Expand Down Expand Up @@ -299,6 +311,16 @@ 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 @@ -334,9 +356,21 @@ int main(int argc, char **argv)
if (argmatch(argv, argc, "-quiet", "--quiet", 3, NULL, &skip_args))
quiet = true;

for (int i = skip_args+1; i < argc; i++) {
if (parse_file(argv[i]) != 0)
return 1;
}
int threads_count = std::thread::hardware_concurrency();
int files_count = argc - (skip_args + 1);
argmatch(argv, argc, "-jobs", "--jobs", 1, &threads_count, &skip_args);
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;

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;
}