Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
KOS
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Martin Karsten
KOS
Commits
768cec27
Commit
768cec27
authored
6 years ago
by
Martin Karsten
Browse files
Options
Downloads
Patches
Plain Diff
- fixed yet another compile-time error left over from
c56e9d4e
parent
af077034
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/libfibre/EventEngine.h
+2
-2
2 additions, 2 deletions
src/libfibre/EventEngine.h
src/libfibre/FibreCluster.h
+3
-2
3 additions, 2 deletions
src/libfibre/FibreCluster.h
src/libfibre/Poller.cc
+1
-1
1 addition, 1 deletion
src/libfibre/Poller.cc
src/libfibre/Poller.h
+1
-1
1 addition, 1 deletion
src/libfibre/Poller.h
with
7 additions
and
6 deletions
src/libfibre/EventEngine.h
+
2
−
2
View file @
768cec27
...
...
@@ -49,8 +49,8 @@ class EventEngine {
// file operations are not considered blocking in terms of select/poll/epoll
// therefore, all file operations are executed on dedicated Cluster/SP(s)
Fibre
Cluster
Generic
<
NoPoller
>
diskCluster
;
SystemProcessor
diskProcessor
;
Disk
Cluster
diskCluster
;
SystemProcessor
diskProcessor
;
MasterPoller
masterPoller
;
// runs without cluster
...
...
This diff is collapsed.
Click to expand it.
src/libfibre/FibreCluster.h
+
3
−
2
View file @
768cec27
...
...
@@ -29,7 +29,7 @@ class FibreClusterGeneric : public Cluster {
SystemSemaphore
<
true
>
pauseWaitSem
;
SystemSemaphore
<
true
>
pauseContSem
;
P
poller
;
P
poller
;
public:
FibreClusterGeneric
(
size_t
t
=
1
)
:
paused
(
false
),
pauseContSem
(
1
),
poller
(
*
this
,
t
)
{}
...
...
@@ -97,7 +97,8 @@ public:
#endif
};
typedef
FibreClusterGeneric
<
Poller
>
FibreCluster
;
typedef
FibreClusterGeneric
<
Poller
>
FibreCluster
;
typedef
FibreClusterGeneric
<
NoPoller
>
DiskCluster
;
static
inline
FibreCluster
&
CurrCluster
()
{
return
reinterpret_cast
<
FibreCluster
&>
(
CurrProcessor
().
getCluster
());
...
...
This diff is collapsed.
Click to expand it.
src/libfibre/Poller.cc
+
1
−
1
View file @
768cec27
...
...
@@ -101,7 +101,7 @@ void Poller::pollLoopSetup(void* This) {
pollLoop
(
*
reinterpret_cast
<
Poller
*>
(
This
),
true
);
}
Poller
::
Poller
(
FibreCluster
&
cluster
)
:
BasePoller
(
"PollerFibre"
)
{
Poller
::
Poller
(
FibreCluster
&
cluster
,
size_t
)
:
BasePoller
(
"PollerFibre"
)
{
pollFibre
=
new
Fibre
(
cluster
,
defaultStackSize
,
true
);
pollFibre
->
setPriority
(
lowPriority
);
pollFibre
->
run
(
pollLoopSetup
,
this
);
...
...
This diff is collapsed.
Click to expand it.
src/libfibre/Poller.h
+
1
−
1
View file @
768cec27
...
...
@@ -181,7 +181,7 @@ class Poller : public BasePoller {
FifoSemaphore
<
BinaryLock
<>
,
true
>
pauseSem
;
static
void
pollLoopSetup
(
void
*
);
public:
Poller
(
FibreClusterGeneric
<
Poller
>&
,
size_t
t
);
Poller
(
FibreClusterGeneric
<
Poller
>&
,
size_t
);
~
Poller
()
{
if
(
!
pollTerminate
)
stop
();
}
bool
stopped
()
{
return
pollTerminate
;
}
void
stop
();
...
...
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