Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libcdi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
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
mpim-sw
libcdi
Commits
94371d86
Commit
94371d86
authored
10 months ago
by
Uwe Schulzweida
Browse files
Options
Downloads
Patches
Plain Diff
cdiInqContents: missing lock of non thread-safe netCDF4/HDF5 calls (bug fix)
parent
7ef2784a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!85
M214003/develop
Pipeline
#68313
passed
10 months ago
Stage: external
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+4
-0
4 additions, 0 deletions
ChangeLog
src/stream.c
+5
-1
5 additions, 1 deletion
src/stream.c
with
9 additions
and
1 deletion
ChangeLog
+
4
−
0
View file @
94371d86
2024-05-22 Uwe Schulzweida
* cdiInqContents: missing lock of non thread-safe netCDF4/HDF5 calls (bug fix)
2024-05-21 Uwe Schulzweida
* Version 2.4.1 released
...
...
This diff is collapsed.
Click to expand it.
src/stream.c
+
5
−
1
View file @
94371d86
...
...
@@ -380,6 +380,8 @@ streamFilename(int streamID)
static
int
cdiInqContents
(
stream_t
*
streamptr
)
{
if
(
streamptr
->
lockIO
)
CDI_IO_LOCK
();
int
status
=
0
;
int
filetype
=
streamptr
->
filetype
;
...
...
@@ -418,6 +420,8 @@ cdiInqContents(stream_t *streamptr)
}
}
if
(
streamptr
->
lockIO
)
CDI_IO_UNLOCK
();
if
(
status
==
0
)
{
int
taxisID
=
vlistInqTaxis
(
streamptr
->
vlistID
);
...
...
@@ -667,7 +671,7 @@ streamOpenID(const char *filename, char filemode, int filetype, int resH)
if
(
CDI_Threadsafe
)
{
#ifndef HAVE_LIBPTHREAD
Error
(
"CDI threadsafe failed, pthread support not compiled!"
);
Error
(
"CDI threadsafe failed, pthread support not compiled
in
!"
);
#endif
if
(
filetype
==
CDI_FILETYPE_NC4
||
filetype
==
CDI_FILETYPE_NC4C
)
streamptr
->
lockIO
=
true
;
}
...
...
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