Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
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
Esteban Blanc
proview
Commits
2852a3b7
Commit
2852a3b7
authored
Aug 26, 2015
by
Claes Sjofors
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
plc, nmps lock wasn't removed at runtime stop
parent
ba53dd46
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
nmps/lib/nmps/src/nmps_plc.c
nmps/lib/nmps/src/nmps_plc.c
+4
-2
src/exp/rt/src/rt_plc_process.c
src/exp/rt/src/rt_plc_process.c
+6
-8
No files found.
nmps/lib/nmps/src/nmps_plc.c
View file @
2852a3b7
...
@@ -112,8 +112,9 @@ void NMpsCell_init( pwr_sClass_NMpsCell *object)
...
@@ -112,8 +112,9 @@ void NMpsCell_init( pwr_sClass_NMpsCell *object)
{
{
plc_t_DataInfo
*
data_index
;
plc_t_DataInfo
*
data_index
;
int
i
;
int
i
;
pwr_tStatus
sts
;
//
nmps_create_lock( &sts);
nmps_create_lock
(
&
sts
);
if
(
!
(
object
->
Function
&
NMPS_CELLFUNC_BACKUP
))
if
(
!
(
object
->
Function
&
NMPS_CELLFUNC_BACKUP
))
NMpsCell_init_time
(
object
);
NMpsCell_init_time
(
object
);
...
@@ -705,8 +706,9 @@ void NMpsStoreCell_init( pwr_sClass_NMpsStoreCell *object)
...
@@ -705,8 +706,9 @@ void NMpsStoreCell_init( pwr_sClass_NMpsStoreCell *object)
{
{
plc_t_DataInfo
*
data_index
;
plc_t_DataInfo
*
data_index
;
int
i
;
int
i
;
pwr_tStatus
sts
;
//
nmps_create_lock( &sts);
nmps_create_lock
(
&
sts
);
if
(
!
(
object
->
Function
&
NMPS_CELLFUNC_BACKUP
))
if
(
!
(
object
->
Function
&
NMPS_CELLFUNC_BACKUP
))
NMpsCell_init_time
(
(
pwr_sClass_NMpsCell
*
)
object
);
NMpsCell_init_time
(
(
pwr_sClass_NMpsCell
*
)
object
);
...
...
src/exp/rt/src/rt_plc_process.c
View file @
2852a3b7
...
@@ -299,12 +299,12 @@ init_process ( char *name)
...
@@ -299,12 +299,12 @@ init_process ( char *name)
exit
(
sts
);
exit
(
sts
);
}
}
nmps_create_lock
(
&
sts
);
//
nmps_create_lock( &sts);
if
(
EVEN
(
sts
))
{
//
if (EVEN(sts)) {
errh_Fatal
(
"nmps_create_lock, %m"
,
sts
);
//
errh_Fatal("nmps_create_lock, %m", sts);
errh_SetStatus
(
PWR__SRVTERM
);
//
errh_SetStatus( PWR__SRVTERM);
exit
(
sts
);
//
exit(sts);
}
//
}
if
(
strstr
(
name
,
"rt_plc_core"
)
!=
0
)
if
(
strstr
(
name
,
"rt_plc_core"
)
!=
0
)
pp
->
is_core
=
1
;
pp
->
is_core
=
1
;
...
@@ -588,8 +588,6 @@ clean_all (
...
@@ -588,8 +588,6 @@ clean_all (
sts
=
gdh_UnrefObjectInfoAll
();
sts
=
gdh_UnrefObjectInfoAll
();
if
(
EVEN
(
sts
))
if
(
EVEN
(
sts
))
errh_Error
(
"gdh_UnrefObjectInfoAll, %m"
,
sts
);
errh_Error
(
"gdh_UnrefObjectInfoAll, %m"
,
sts
);
nmps_delete_lock
(
&
sts
);
}
}
/* Link to I/O base areas.
/* Link to I/O base areas.
...
...
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