Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
cdo
Commits
42e1df32
Commit
42e1df32
authored
Jun 27, 2017
by
Oliver Heidmann
Browse files
moved struct def of pstream_t into pstream.h, moved def of varlist_t into its own file
parent
56598d66
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/Makefile.am
View file @
42e1df32
...
...
@@ -162,6 +162,7 @@ libcdo_la_SOURCES = \
uthash.h
\
util.cc
\
util.h
\
varlist.h
\
zaxis_print.cc
\
zaxis.cc
libcdo_la_SOURCES
+=
\
...
...
src/pipe.h
View file @
42e1df32
...
...
@@ -29,44 +29,10 @@
#include
<pthread.h>
#include
"pthread_debug.h"
#include
"pstream.h"
#endif
typedef
struct
{
bool
check_datarange
;
int
gridsize
;
int
datatype
;
double
missval
;
double
addoffset
;
double
scalefactor
;
}
varlist_t
;
typedef
struct
{
int
self
;
int
mode
;
int
fileID
;
int
vlistID
;
int
tsID
;
int
filetype
;
int
tsID0
;
int
mfiles
;
int
nfiles
;
int
varID
;
/* next varID defined with streamDefVar */
bool
ispipe
;
bool
isopen
;
char
*
name
;
char
**
mfnames
;
varlist_t
*
varlist
;
#if defined(HAVE_LIBPTHREAD)
void
*
argument
;
struct
pipe_s
*
pipe
;
pthread_t
rthreadID
;
/* read thread ID */
pthread_t
wthreadID
;
/* write thread ID */
#endif
}
pstream_t
;
#if defined(HAVE_LIBPTHREAD)
struct
pipe_s
{
...
...
src/pstream.h
View file @
42e1df32
...
...
@@ -19,9 +19,34 @@
#define PSTREAM_H
#include
"pstream_write.h"
#include
"varlist.h"
#include
<sys/types.h>
/* off_t */
typedef
struct
{
int
self
;
int
mode
;
int
fileID
;
int
vlistID
;
int
tsID
;
int
filetype
;
int
tsID0
;
int
mfiles
;
int
nfiles
;
int
varID
;
/* next varID defined with streamDefVar */
bool
ispipe
;
bool
isopen
;
char
*
name
;
char
**
mfnames
;
varlist_t
*
varlist
;
#if defined(HAVE_LIBPTHREAD)
void
*
argument
;
struct
pipe_s
*
pipe
;
pthread_t
rthreadID
;
/* read thread ID */
pthread_t
wthreadID
;
/* write thread ID */
#endif
}
pstream_t
;
int
pstreamOpenRead
(
const
argument_t
*
argument
);
int
pstreamOpenAppend
(
const
argument_t
*
argument
);
void
pstreamClose
(
int
pstreamID
);
...
...
src/varlist.h
0 → 100644
View file @
42e1df32
#ifndef VARLIST_H
#define VARLIST_H
typedef
struct
{
bool
check_datarange
;
int
gridsize
;
int
datatype
;
double
missval
;
double
addoffset
;
double
scalefactor
;
}
varlist_t
;
#endif
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment