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
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Kirill Smelkov
wendelin.core
Commits
9fe0087c
Commit
9fe0087c
authored
Nov 26, 2019
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
cd923f51
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
6 deletions
+14
-6
wcfs/internal/_wcfs.pyx
wcfs/internal/_wcfs.pyx
+8
-1
wcfs/internal/wcfs_watchlink.cpp
wcfs/internal/wcfs_watchlink.cpp
+3
-2
wcfs/internal/wcfs_watchlink.h
wcfs/internal/wcfs_watchlink.h
+3
-3
No files found.
wcfs/internal/_wcfs.pyx
View file @
9fe0087c
...
...
@@ -23,7 +23,7 @@
# XXX doc
from
golang
cimport
string
,
error
,
refptr
from
golang
cimport
chan
,
structZ
,
string
,
error
,
refptr
,
pychan
from
golang
cimport
context
from
libcpp
cimport
nullptr_t
,
nullptr
as
nil
...
...
@@ -54,7 +54,9 @@ cdef extern from "wcfs_watchlink.h" nogil:
error
closeWrite
()
error
recvReq
(
context
.
Context
ctx
,
PinReq
*
prx
)
pair
[
string
,
error
]
sendReq
(
context
.
Context
ctx
,
const
string
&
req
)
vector
[
string
]
fatalv
chan
[
structZ
]
rx_eof
cppclass
WatchLink
(
refptr
[
_WatchLink
]):
# WatchLink.X = WatchLink->X in C++
...
...
@@ -62,7 +64,9 @@ cdef extern from "wcfs_watchlink.h" nogil:
error
closeWrite
"_ptr()->closeWrite"
()
error
recvReq
"_ptr()->recvReq"
(
context
.
Context
ctx
,
PinReq
*
prx
)
pair
[
string
,
error
]
sendReq
"_ptr()->sendReq"
(
context
.
Context
ctx
,
const
string
&
req
)
vector
[
string
]
fatalv
"_ptr()->fatalv"
chan
[
structZ
]
rx_eof
"_ptr()->rx_eof"
cppclass
PinReq
:
Oid
foid
...
...
@@ -151,6 +155,9 @@ cdef class PyWatchLink:
property
fatalv
:
def
__get__
(
PyWatchLink
pywlink
):
return
pywlink
.
wlink
.
fatalv
property
rx_eof
:
def
__get__
(
PyWatchLink
pywlink
):
return
pychan
.
from_chan_structZ
(
pywlink
.
wlink
.
rx_eof
)
cdef
class
PyPinReq
:
...
...
wcfs/internal/wcfs_watchlink.cpp
View file @
9fe0087c
...
...
@@ -53,11 +53,12 @@ pair<WatchLink, error> WCFS::_openwatch() {
WatchLink
wlink
=
adoptref
(
new
(
_WatchLink
));
wlink
->
_wc
=
wc
;
wlink
->
_f
=
f
;
wlink
->
_rx_eof
=
makechan
<
structZ
>
();
wlink
->
_acceptq
=
makechan
<
rxPkt
>
();
wlink
->
_rxdown
=
false
;
wlink
->
_req_next
=
1
;
wlink
->
rx_eof
=
makechan
<
structZ
>
();
context
::
Context
serveCtx
;
tie
(
serveCtx
,
wlink
->
_serveCancel
)
=
context
::
with_cancel
(
context
::
background
());
wlink
->
_serveWG
=
sync
::
NewWorkGroup
(
serveCtx
);
...
...
@@ -144,7 +145,7 @@ error _WatchLink::_serveRX(context::Context ctx) { // XXX error -> where ?
//printf(" readline -> woken up; l='%s' ; err='%s'\n", l.c_str(), v(err));
if
(
err
==
io
::
EOF_
)
{
// peer closed its tx
// XXX what happens on other errors?
wlink
.
_
rx_eof
.
close
();
wlink
.
rx_eof
.
close
();
}
if
(
err
!=
nil
)
{
// XXX place=ok?
...
...
wcfs/internal/wcfs_watchlink.h
View file @
9fe0087c
...
...
@@ -72,7 +72,6 @@ class _WatchLink : public object {
WCFS
*
_wc
;
os
::
File
_f
;
// head/watch file handle
string
_rxbuf
;
// buffer for read data from _f
chan
<
structZ
>
_rx_eof
;
// becomes ready when wcfs closes its tx side
// inv.protocol message IO
chan
<
rxPkt
>
_acceptq
;
// server originated messages go here
...
...
@@ -89,9 +88,10 @@ class _WatchLink : public object {
func
<
void
()
>
_serveCancel
;
sync
::
WorkGroup
_serveWG
;
// XXX for tests
, ad-hoc, racy. TODO rework to send messeges to control channel
// XXX for tests
public:
vector
<
string
>
fatalv
;
vector
<
string
>
fatalv
;
// ad-hoc, racy. TODO rework to send messeges to control channel
chan
<
structZ
>
rx_eof
;
// becomes ready when wcfs closes its tx side
// don't new - create only via WCFS._openwatch()
private:
...
...
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