Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
emper
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lehrstuhl für Informatik 4 (Systemsoftware)
manycore
emper
Commits
d3080cef
Commit
d3080cef
authored
3 years ago
by
Florian Schmaus
Browse files
Options
Downloads
Plain Diff
Merge branch 'improve-fsearch' into 'master'
Improve fsearch See merge request
!215
parents
46cc46b0
08bbef86
No related branches found
Branches containing commit
No related tags found
1 merge request
!215
Improve fsearch
Pipeline
#65973
passed
3 years ago
Stage: smoke-test
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/fsearch/fsearch.cpp
+22
-3
22 additions, 3 deletions
apps/fsearch/fsearch.cpp
emper/Semaphore.hpp
+3
-0
3 additions, 0 deletions
emper/Semaphore.hpp
with
25 additions
and
3 deletions
apps/fsearch/fsearch.cpp
+
22
−
3
View file @
d3080cef
...
...
@@ -15,6 +15,7 @@
#include
"CountingPrivateSemaphore.hpp"
#include
"Fiber.hpp"
#include
"Runtime.hpp"
#include
"Semaphore.hpp"
#include
"emper.hpp"
#include
"io.hpp"
...
...
@@ -25,7 +26,13 @@ namespace fs = std::filesystem;
const
char
*
needle
;
size_t
needle_len
;
emper
::
Semaphore
*
max_running
;
void
search
(
const
std
::
string
&
path
)
{
if
(
max_running
)
{
max_running
->
acquire
();
}
int
fd
=
emper
::
io
::
openAndWait
(
path
.
c_str
(),
O_RDONLY
);
if
(
fd
<
0
)
{
DIE_MSG_ERRNO
(
"open failed"
);
...
...
@@ -38,7 +45,7 @@ void search(const std::string& path) {
while
(
bytes_read
>
0
)
{
if
(
memmem
(
&
buf
[
0
],
bytes_read
,
needle
,
needle_len
))
{
printf
(
"%s
\n
"
,
path
.
c_str
());
return
;
goto
out
;
}
bytes_searched
+=
bytes_read
;
...
...
@@ -48,6 +55,13 @@ void search(const std::string& path) {
if
(
bytes_read
<
0
)
{
DIE_MSG_ERRNO
(
"read failed"
);
}
out
:
if
(
max_running
)
{
max_running
->
release
();
}
emper
::
io
::
closeAndForget
(
fd
);
}
void
walk_dir
()
{
...
...
@@ -64,8 +78,12 @@ void walk_dir() {
auto
main
(
int
argc
,
char
*
argv
[])
->
int
{
if
(
argc
<
2
)
{
std
::
cerr
<<
"Usage: "
<<
argv
[
0
]
<<
" <needle>"
<<
std
::
endl
;
return
EXIT_FAILURE
;
std
::
cerr
<<
"Usage: "
<<
argv
[
0
]
<<
" <needle> [max fibers]"
<<
std
::
endl
;
return
EXIT_SUCCESS
;
}
if
(
argc
==
3
)
{
max_running
=
new
emper
::
Semaphore
(
std
::
stoi
(
argv
[
2
]));
}
needle
=
argv
[
1
];
...
...
@@ -77,4 +95,5 @@ auto main(int argc, char* argv[]) -> int {
runtime
.
scheduleFromAnywhere
(
*
dirWalker
);
runtime
.
waitUntilFinished
();
return
EXIT_SUCCESS
;
}
This diff is collapsed.
Click to expand it.
emper/Semaphore.hpp
+
3
−
0
View file @
d3080cef
...
...
@@ -17,6 +17,9 @@ class Semaphore {
std
::
mutex
mutex
;
public:
Semaphore
()
=
default
;
Semaphore
(
unsigned
int
count
)
:
count
(
count
){};
auto
acquire
()
->
bool
{
bool
blocked
;
mutex
.
lock
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment