Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
canghaiwuhen
OpenXG-RAN
Commits
b5957763
Commit
b5957763
authored
Mar 02, 2019
by
wujing
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop_nfapi_rm2160' into develop
parents
d9b0b812
abec85f8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c
nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c
+3
-4
No files found.
nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c
View file @
b5957763
...
...
@@ -168,10 +168,9 @@ int nfapi_vnf_p7_start(nfapi_vnf_p7_config_t* config)
if
(
selectRetval
==-
1
&&
errno
==
22
)
{
NFAPI_TRACE
(
NFAPI_TRACE_ERROR
,
"INVAL: pselect_timeout:%d.%ld adj[dur:%d adj:%d]
, sf_dur:%d.%ld
\n
"
,
NFAPI_TRACE
(
NFAPI_TRACE_ERROR
,
"INVAL: pselect_timeout:%d.%ld adj[dur:%d adj:%d]
\n
"
,
pselect_timeout
.
tv_sec
,
pselect_timeout
.
tv_nsec
,
phy
->
insync_minor_adjustment_duration
,
phy
->
insync_minor_adjustment
,
sf_duration
.
tv_sec
,
sf_duration
.
tv_nsec
);
phy
->
insync_minor_adjustment_duration
,
phy
->
insync_minor_adjustment
);
}
if
(
selectRetval
>
0
)
...
...
@@ -191,7 +190,7 @@ int nfapi_vnf_p7_start(nfapi_vnf_p7_config_t* config)
}
else
{
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"P7 select failed result %d errno %d timeout:%d.%d orginal:%d.%d
last_ms:%ld ms:%ld
\n
"
,
selectRetval
,
errno
,
pselect_timeout
.
tv_sec
,
pselect_timeout
.
tv_nsec
,
pselect_timeout
.
tv_sec
,
pselect_timeout
.
tv_nsec
,
last_millisecond
,
millisecond
);
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"P7 select failed result %d errno %d timeout:%d.%d orginal:%d.%d
\n
"
,
selectRetval
,
errno
,
pselect_timeout
.
tv_sec
,
pselect_timeout
.
tv_nsec
,
pselect_timeout
.
tv_sec
,
pselect_timeout
.
tv_nsec
);
// should we exit now?
if
(
selectRetval
==
-
1
&&
errno
==
22
)
// invalid argument??? not sure about timeout duration
{
...
...
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