Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
wendelin.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Joshua
wendelin.core
Commits
30e48319
Commit
30e48319
authored
Mar 04, 2020
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
58e5bc78
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
8 deletions
+10
-8
wcfs/client/wcfs.cpp
wcfs/client/wcfs.cpp
+10
-8
No files found.
wcfs/client/wcfs.cpp
View file @
30e48319
...
@@ -556,6 +556,15 @@ error _Conn::resync(zodb::Tid at) {
...
@@ -556,6 +556,15 @@ error _Conn::resync(zodb::Tid at) {
wconn
.
_atMu
.
RUnlock
();
wconn
.
_atMu
.
RUnlock
();
etrace
(
""
);
etrace
(
""
);
// bring wconn + fileh + mmaps down on error
bool
retok
=
false
;
defer
([
&
]()
{
if
(
!
retok
)
// XXX log?
//fprintf(stderr, "\n\nTODO: bring wconn + fileh + mmaps down on error\n\n\n");
wconn
.
close
();
// ignore error
});
// XXX downErr -> E
// XXX downErr -> E
// XXX at ^ (increases)
// XXX at ^ (increases)
...
@@ -587,13 +596,6 @@ error _Conn::resync(zodb::Tid at) {
...
@@ -587,13 +596,6 @@ error _Conn::resync(zodb::Tid at) {
if
(
err
!=
nil
)
if
(
err
!=
nil
)
return
E
(
err
);
return
E
(
err
);
bool
retok
=
false
;
defer
([
&
]()
{
if
(
!
retok
)
//panic("TODO: bring wconn + fileh + mmaps down on error"); // XXX
fprintf
(
stderr
,
"
\n\n
TODO: bring wconn + fileh + mmaps down on error
\n\n\n
"
);
});
// set new wconn.at early, so that e.g. Conn.open running simultaneously
// set new wconn.at early, so that e.g. Conn.open running simultaneously
// to second part of resync (see below) uses new at.
// to second part of resync (see below) uses new at.
wconn
.
at
=
at
;
wconn
.
at
=
at
;
...
@@ -611,7 +613,7 @@ error _Conn::resync(zodb::Tid at) {
...
@@ -611,7 +613,7 @@ error _Conn::resync(zodb::Tid at) {
FileH
f
=
fit
.
second
;
FileH
f
=
fit
.
second
;
// TODO if file has no mappings and was not used during whole prev
// TODO if file has no mappings and was not used during whole prev
// cycle - forget and stop watching it
// cycle - forget and stop watching it
?
// "opening" or "closing" fileh - their setup/teardown is currently
// "opening" or "closing" fileh - their setup/teardown is currently
// handled by Conn.open and FileH.close correspondingly.
// handled by Conn.open and FileH.close correspondingly.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment