Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
PhoenixSocket
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
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CTA-LAPP
PHOENIX_LIBS2
PhoenixSocket
Commits
4b355bcc
Commit
4b355bcc
authored
3 months ago
by
Pierre Aubert
Browse files
Options
Downloads
Patches
Plain Diff
Add conversion of flags type between backends
parent
987eb4d6
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#374706
passed
3 months ago
Stage: BuildTestinstall
Stage: DocCoverage
Stage: deploy
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/PEmptyBackend.h
+4
-0
4 additions, 0 deletions
src/PEmptyBackend.h
src/PGenericSocket.h
+12
-12
12 additions, 12 deletions
src/PGenericSocket.h
src/PMockBackend.h
+4
-0
4 additions, 0 deletions
src/PMockBackend.h
with
20 additions
and
12 deletions
src/PEmptyBackend.h
+
4
−
0
View file @
4b355bcc
...
...
@@ -26,6 +26,10 @@ class PEmptyBackend{
typedef
std
::
vector
<
char
>
Message
;
///Define the type of extra parameters which can be used to create a Socket used by the PAbstractSocketManager
typedef
PEmptyParam
Param
;
///Type of the send flag
typedef
int
SendFlag
;
///Type of the recv flag
typedef
int
RecvFlag
;
///Default send flags of the PZmqBackend used by the PAbstractSocketManager
static
const
int
defaultSendFlag
=
0
;
...
...
This diff is collapsed.
Click to expand it.
src/PGenericSocket.h
+
12
−
12
View file @
4b355bcc
...
...
@@ -35,7 +35,7 @@ class PGenericSocket{
_TMockBackend
::
msgResize
(
msg
,
dataSize
);
char
*
iter
=
_TMockBackend
::
msgData
(
msg
);
if
(
data_message_save
<
char
*
,
U
>
(
iter
,
data
)){
//Save the message
b
&=
_TMockBackend
::
send
(
p_mockSocket
,
msg
,
flags
);
b
&=
_TMockBackend
::
send
(
p_mockSocket
,
msg
,
(
typename
_TMockBackend
::
SendFlag
)
flags
);
}
else
{
b
=
false
;
}
...
...
@@ -45,7 +45,7 @@ class PGenericSocket{
_TBackend
::
msgResize
(
msg
,
dataSize
);
char
*
iter
=
_TBackend
::
msgData
(
msg
);
if
(
data_message_save
<
char
*
,
U
>
(
iter
,
data
)){
//Save the message
b
&=
_TBackend
::
send
(
p_socket
,
msg
,
flags
);
b
&=
_TBackend
::
send
(
p_socket
,
msg
,
(
typename
_TBackend
::
SendFlag
)
flags
);
}
else
{
b
=
false
;
}
...
...
@@ -66,10 +66,10 @@ class PGenericSocket{
typename
_TMockBackend
::
Message
vecTmp
;
_TMockBackend
::
msgResize
(
vecTmp
,
dataSize
);
memcpy
(
_TMockBackend
::
msgData
(
vecTmp
),
_TBackend
::
msgData
(
msg
),
dataSize
);
b
&=
_TMockBackend
::
send
(
p_mockSocket
,
vecTmp
,
flags
);
b
&=
_TMockBackend
::
send
(
p_mockSocket
,
vecTmp
,
(
typename
_TMockBackend
::
SendFlag
)
flags
);
}
if
(
p_mode
!=
PSocketMode
::
MOCK
){
b
&=
_TBackend
::
send
(
p_socket
,
msg
,
flags
);
b
&=
_TBackend
::
send
(
p_socket
,
msg
,
(
typename
_TBackend
::
SendFlag
)
flags
);
}
return
b
;
}
...
...
@@ -84,7 +84,7 @@ class PGenericSocket{
bool
b
(
true
);
if
(
p_mode
==
PSocketMode
::
NO_MOCK
){
//Normal mode
typename
_TBackend
::
Message
msg
;
b
&=
_TBackend
::
recv
(
p_socket
,
msg
,
flags
);
b
&=
_TBackend
::
recv
(
p_socket
,
msg
,
(
typename
_TBackend
::
RecvFlag
)
flags
);
//If the message is empty we cannot initialise the given data, so, this is an error
b
&=
_TBackend
::
msgSize
(
msg
)
!=
0lu
;
if
(
b
){
...
...
@@ -93,7 +93,7 @@ class PGenericSocket{
}
}
else
if
(
p_mode
==
PSocketMode
::
MOCK
){
//Mock mode
typename
_TMockBackend
::
Message
msg
;
b
&=
_TMockBackend
::
recv
(
p_mockSocket
,
msg
,
flags
);
b
&=
_TMockBackend
::
recv
(
p_mockSocket
,
msg
,
(
typename
_TMockBackend
::
RecvFlag
)
flags
);
//If the message is empty we cannot initialise the given data, so, this is an error
b
&=
_TMockBackend
::
msgSize
(
msg
)
!=
0lu
;
if
(
b
){
...
...
@@ -102,7 +102,7 @@ class PGenericSocket{
}
}
else
{
//Mock record mode
typename
_TBackend
::
Message
msg
;
b
&=
_TBackend
::
recv
(
p_socket
,
msg
,
flags
);
b
&=
_TBackend
::
recv
(
p_socket
,
msg
,
(
typename
_TBackend
::
RecvFlag
)
flags
);
//If the message is empty we cannot initialise the given data, so, this is an error
b
&=
_TBackend
::
msgSize
(
msg
)
!=
0lu
;
if
(
b
){
...
...
@@ -114,7 +114,7 @@ class PGenericSocket{
size_t
dataSize
(
_TBackend
::
msgSize
(
msg
));
_TMockBackend
::
msgResize
(
msgMock
,
dataSize
);
memcpy
(
_TMockBackend
::
msgData
(
msgMock
),
_TBackend
::
msgData
(
msg
),
dataSize
);
b
&=
_TMockBackend
::
recv
(
p_mockSocket
,
msgMock
,
flags
);
b
&=
_TMockBackend
::
recv
(
p_mockSocket
,
msgMock
,
(
typename
_TMockBackend
::
RecvFlag
)
flags
);
}
}
}
...
...
@@ -130,23 +130,23 @@ class PGenericSocket{
bool
recvMsg
(
typename
_TBackend
::
Message
&
msg
,
_TFlag
flags
){
bool
b
(
true
);
if
(
p_mode
==
PSocketMode
::
NO_MOCK
){
//Normal mode
b
&=
_TBackend
::
recv
(
p_socket
,
msg
,
flags
);
b
&=
_TBackend
::
recv
(
p_socket
,
msg
,
(
typename
_TBackend
::
RecvFlag
)
flags
);
}
else
if
(
p_mode
==
PSocketMode
::
MOCK
){
//Mock mode
typename
_TMockBackend
::
Message
msgMock
;
b
&=
_TMockBackend
::
recv
(
p_mockSocket
,
msgMock
,
flags
);
b
&=
_TMockBackend
::
recv
(
p_mockSocket
,
msgMock
,
(
typename
_TMockBackend
::
RecvFlag
)
flags
);
if
(
b
){
size_t
dataSize
(
_TMockBackend
::
msgSize
(
msgMock
));
_TBackend
::
msgResize
(
msg
,
dataSize
);
memcpy
(
_TBackend
::
msgData
(
msg
),
_TMockBackend
::
msgData
(
msgMock
),
dataSize
);
}
}
else
{
//Mock record mode
b
&=
_TBackend
::
recv
(
p_socket
,
msg
,
flags
);
b
&=
_TBackend
::
recv
(
p_socket
,
msg
,
(
typename
_TBackend
::
RecvFlag
)
flags
);
if
(
b
){
typename
_TMockBackend
::
Message
msgMock
;
size_t
dataSize
(
_TBackend
::
msgSize
(
msg
));
_TMockBackend
::
msgResize
(
msgMock
,
dataSize
);
memcpy
(
_TMockBackend
::
msgData
(
msgMock
),
_TBackend
::
msgData
(
msg
),
dataSize
);
b
&=
_TMockBackend
::
recv
(
p_mockSocket
,
msgMock
,
flags
);
b
&=
_TMockBackend
::
recv
(
p_mockSocket
,
msgMock
,
(
typename
_TMockBackend
::
RecvFlag
)
flags
);
}
}
return
b
;
...
...
This diff is collapsed.
Click to expand it.
src/PMockBackend.h
+
4
−
0
View file @
4b355bcc
...
...
@@ -42,6 +42,10 @@ class PMockBackend{
typedef
std
::
vector
<
char
>
Message
;
///Define the type of extra parameters which can be used to create a Socket used by the PAbstractSocketManager
typedef
PMockParam
Param
;
///Type of the send flag
typedef
int
SendFlag
;
///Type of the recv flag
typedef
int
RecvFlag
;
///Default send flags of the PZmqBackend used by the PAbstractSocketManager
static
const
int
defaultSendFlag
=
0
;
...
...
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