mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-11-21 03:13:42 +08:00
fixed opendap perf. bug for nc_get_vars
This commit is contained in:
Dennis Heimbigner
parent
ca6b34a92c
commit
bc5abe766e
@ -5,6 +5,9 @@ VERSION COMMENTS
|
||||
------- --------
|
||||
4.1.2-beta3 2011-02-11
|
||||
|
||||
Fixed opendap performance bug for nc_get_vars; required
|
||||
adding nc_get_var{s,m} to the dispatch table.
|
||||
|
||||
Now check for libz in configure.ac.
|
||||
|
||||
Fixed some bugs and some performance problems with
|
||||
|
||||
@ -67,6 +67,11 @@ NULL, /*inq_varid*/
|
||||
NULL, /*rename_var*/
|
||||
NCCR_get_vara,
|
||||
NCCR_put_vara,
|
||||
NULL, /*get_vars*/
|
||||
NULL, /*put_vars*/
|
||||
NULL, /*get_varm*/
|
||||
NULL, /*put_varm*/
|
||||
|
||||
NULL, /*inq_var_all*/
|
||||
|
||||
#ifdef USE_NETCDF4
|
||||
|
||||
@ -175,6 +175,18 @@ int NC_open(const char *path, int cmode,
|
||||
int useparallel, void* mpi_info,
|
||||
int *ncidp);
|
||||
|
||||
/* Expose the default vars and varm dispatch entries */
|
||||
extern int NCDEFAULT_get_vars(int, int, const size_t*,
|
||||
const size_t*, const ptrdiff_t*, void*, nc_type);
|
||||
extern int NCDEFAULT_put_vars(int, int, const size_t*,
|
||||
const size_t*, const ptrdiff_t*, const void*, nc_type);
|
||||
extern int NCDEFAULT_get_varm(int, int, const size_t*,
|
||||
const size_t*, const ptrdiff_t*, const ptrdiff_t*,
|
||||
void*, nc_type);
|
||||
extern int NCDEFAULT_put_varm(int, int, const size_t*,
|
||||
const size_t*, const ptrdiff_t*, const ptrdiff_t*,
|
||||
const void*, nc_type);
|
||||
|
||||
/**************************************************/
|
||||
/* Forward */
|
||||
struct NCHDR;
|
||||
@ -232,6 +244,14 @@ int (*rename_var)(int, int, const char*);
|
||||
int (*get_vara)(int, int, const size_t*, const size_t*, void*, nc_type);
|
||||
int (*put_vara)(int, int, const size_t*, const size_t*, const void*, nc_type);
|
||||
|
||||
/* Added to solve Ferret performance problem with Opendap */
|
||||
int (*get_vars)(int, int, const size_t*, const size_t*, const ptrdiff_t*, void*, nc_type);
|
||||
int (*put_vars)(int, int, const size_t*, const size_t*, const ptrdiff_t*, const void*, nc_type);
|
||||
|
||||
int (*get_varm)(int, int, const size_t*, const size_t*, const ptrdiff_t*, const ptrdiff_t*, void*, nc_type);
|
||||
int (*put_varm)(int, int, const size_t*, const size_t*, const ptrdiff_t*, const ptrdiff_t*, const void*, nc_type);
|
||||
|
||||
|
||||
int (*inq_var_all)(int ncid, int varid, char *name, nc_type *xtypep,
|
||||
int *ndimsp, int *dimidsp, int *nattsp,
|
||||
int *shufflep, int *deflatep, int *deflate_levelp,
|
||||
|
||||
@ -23,6 +23,8 @@ static size_t coord_one[NC_MAX_VAR_DIMS];
|
||||
|
||||
static nc_type longtype = (sizeof(long) == sizeof(int) ? NC_INT : NC_INT64);
|
||||
|
||||
#define MINVARSSPACE 1024;
|
||||
|
||||
static int
|
||||
getshape(int ncid, int varid, int ndims, size_t* shape)
|
||||
{
|
||||
@ -129,7 +131,7 @@ nc_inq_var(int ncid, int varid, char *name, nc_type *xtypep,
|
||||
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
|
||||
}
|
||||
|
||||
int
|
||||
static int
|
||||
NC_put_vara(int ncid, int varid, const size_t *start,
|
||||
const size_t *edges, const void *value, nc_type memtype)
|
||||
{
|
||||
@ -171,7 +173,7 @@ NC_get_vara(int ncid, int varid,
|
||||
return ncp->dispatch->get_vara(ncid,varid,start,edges,value,memtype);
|
||||
}
|
||||
|
||||
int
|
||||
static int
|
||||
NC_get_var(int ncid, int varid, void *value, nc_type memtype)
|
||||
{
|
||||
int ndims;
|
||||
@ -183,7 +185,7 @@ NC_get_var(int ncid, int varid, void *value, nc_type memtype)
|
||||
return NC_get_vara(ncid, varid, coord_zero, shape, value, memtype);
|
||||
}
|
||||
|
||||
int
|
||||
static int
|
||||
NC_put_var(int ncid, int varid, const void *value, nc_type memtype)
|
||||
{
|
||||
int ndims;
|
||||
@ -195,7 +197,7 @@ NC_put_var(int ncid, int varid, const void *value, nc_type memtype)
|
||||
return NC_put_vara(ncid, varid, coord_zero, shape, value, memtype);
|
||||
}
|
||||
|
||||
int
|
||||
static int
|
||||
NC_get_var1(int ncid, int varid, const size_t *coord, void* value,
|
||||
nc_type memtype)
|
||||
{
|
||||
@ -203,7 +205,7 @@ NC_get_var1(int ncid, int varid, const size_t *coord, void* value,
|
||||
return NC_get_vara(ncid, varid, coord, coord_one, value, memtype);
|
||||
}
|
||||
|
||||
int
|
||||
static int
|
||||
NC_put_var1(int ncid, int varid, const size_t *coord, const void* value,
|
||||
nc_type memtype)
|
||||
{
|
||||
@ -231,8 +233,33 @@ is_recvar(int ncid, int varid, size_t* nrecs)
|
||||
return (dimset[0] == unlimid ? 1: 0);
|
||||
}
|
||||
|
||||
static int
|
||||
NC_get_varm(int ncid, int varid, const size_t *start,
|
||||
/* Most dispatch tables will use the default procedures */
|
||||
int
|
||||
NCDEFAULT_get_vars(int ncid, int varid, const size_t * start,
|
||||
const size_t * edges, const ptrdiff_t * stride,
|
||||
void *value, nc_type memtype)
|
||||
{
|
||||
NC* ncp;
|
||||
int stat = NC_check_id(ncid, &ncp);
|
||||
|
||||
if(stat != NC_NOERR) return stat;
|
||||
return ncp->dispatch->get_varm(ncid,varid,start,edges,stride,NULL,value,memtype);
|
||||
}
|
||||
|
||||
int
|
||||
NCDEFAULT_put_vars(int ncid, int varid, const size_t * start,
|
||||
const size_t * edges, const ptrdiff_t * stride,
|
||||
const void *value, nc_type memtype)
|
||||
{
|
||||
NC* ncp;
|
||||
int stat = NC_check_id(ncid, &ncp);
|
||||
|
||||
if(stat != NC_NOERR) return stat;
|
||||
return ncp->dispatch->put_varm(ncid,varid,start,edges,stride,NULL,value,memtype);
|
||||
}
|
||||
|
||||
int
|
||||
NCDEFAULT_get_varm(int ncid, int varid, const size_t *start,
|
||||
const size_t *edges, const ptrdiff_t *stride,
|
||||
const ptrdiff_t *imapp, void *value0, nc_type memtype)
|
||||
{
|
||||
@ -253,6 +280,9 @@ NC_get_varm(int ncid, int varid, const size_t *start,
|
||||
|
||||
status = nc_inq_vartype(ncid, varid, &vartype);
|
||||
if(status != NC_NOERR) return status;
|
||||
/* Check that this is an atomic type */
|
||||
if(vartype >= NC_MAX_ATOMIC_TYPE)
|
||||
return NC_EMAPTYPE;
|
||||
|
||||
status = nc_inq_varndims(ncid, varid, &varndims);
|
||||
if(status != NC_NOERR) return status;
|
||||
@ -482,8 +512,8 @@ NC_get_varm(int ncid, int varid, const size_t *start,
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
NC_put_varm(
|
||||
int
|
||||
NCDEFAULT_put_varm(
|
||||
int ncid,
|
||||
int varid,
|
||||
const size_t * start,
|
||||
@ -512,6 +542,9 @@ NC_put_varm(
|
||||
/* mid body */
|
||||
status = nc_inq_vartype(ncid, varid, &vartype);
|
||||
if(status != NC_NOERR) return status;
|
||||
/* Check that this is an atomic type */
|
||||
if(vartype >= NC_MAX_ATOMIC_TYPE)
|
||||
return NC_EMAPTYPE;
|
||||
|
||||
status = nc_inq_varndims(ncid, varid, &varndims);
|
||||
if(status != NC_NOERR) return status;
|
||||
@ -714,22 +747,66 @@ NC_put_varm(
|
||||
return status;
|
||||
}
|
||||
|
||||
int
|
||||
/* Called by externally visible nc_get_vars_xxx routines */
|
||||
static int
|
||||
NC_get_vars(int ncid, int varid, const size_t *start,
|
||||
const size_t *edges, const ptrdiff_t *stride, void *value,
|
||||
nc_type memtype)
|
||||
{
|
||||
return NC_get_varm(ncid, varid, start, edges, stride, NULL,
|
||||
value, memtype);
|
||||
NC* ncp;
|
||||
int stat = NC_check_id(ncid, &ncp);
|
||||
|
||||
if(stat != NC_NOERR) return stat;
|
||||
#ifdef USE_NETCDF4
|
||||
if(memtype >= NC_FIRSTUSERTYPEID) memtype = NC_NAT;
|
||||
#endif
|
||||
return ncp->dispatch->get_vars(ncid,varid,start,edges,stride,value,memtype);
|
||||
}
|
||||
|
||||
int
|
||||
static int
|
||||
NC_put_vars(int ncid, int varid, const size_t *start,
|
||||
const size_t *edges, const ptrdiff_t *stride,
|
||||
const void *value, nc_type memtype)
|
||||
{
|
||||
return NC_put_varm(ncid, varid, start, edges,
|
||||
stride, NULL, value, memtype);
|
||||
NC* ncp;
|
||||
int stat = NC_check_id(ncid, &ncp);
|
||||
|
||||
if(stat != NC_NOERR) return stat;
|
||||
#ifdef USE_NETCDF4
|
||||
if(memtype >= NC_FIRSTUSERTYPEID) memtype = NC_NAT;
|
||||
#endif
|
||||
return ncp->dispatch->put_vars(ncid,varid,start,edges,stride,value,memtype);
|
||||
}
|
||||
|
||||
/* Called by externally visible nc_get_vars_xxx routines */
|
||||
static int
|
||||
NC_get_varm(int ncid, int varid, const size_t *start,
|
||||
const size_t *edges, const ptrdiff_t *stride, const ptrdiff_t* map,
|
||||
void *value, nc_type memtype)
|
||||
{
|
||||
NC* ncp;
|
||||
int stat = NC_check_id(ncid, &ncp);
|
||||
|
||||
if(stat != NC_NOERR) return stat;
|
||||
#ifdef USE_NETCDF4
|
||||
if(memtype >= NC_FIRSTUSERTYPEID) memtype = NC_NAT;
|
||||
#endif
|
||||
return ncp->dispatch->get_varm(ncid,varid,start,edges,stride,map,value,memtype);
|
||||
}
|
||||
|
||||
static int
|
||||
NC_put_varm(int ncid, int varid, const size_t *start,
|
||||
const size_t *edges, const ptrdiff_t *stride, const ptrdiff_t* map,
|
||||
const void *value, nc_type memtype)
|
||||
{
|
||||
NC* ncp;
|
||||
int stat = NC_check_id(ncid, &ncp);
|
||||
|
||||
if(stat != NC_NOERR) return stat;
|
||||
#ifdef USE_NETCDF4
|
||||
if(memtype >= NC_FIRSTUSERTYPEID) memtype = NC_NAT;
|
||||
#endif
|
||||
return ncp->dispatch->put_varm(ncid,varid,start,edges,stride,map,value,memtype);
|
||||
}
|
||||
|
||||
/* Ok to use NC pointers because
|
||||
@ -892,7 +969,12 @@ nc_get_varm(int ncid, int varid, const size_t * start,
|
||||
const size_t * edges, const ptrdiff_t * stride,
|
||||
const ptrdiff_t * imapp, void *value)
|
||||
{
|
||||
return NC_get_varm(ncid, varid, start, edges, stride, imapp,
|
||||
NC* ncp;
|
||||
int stat;
|
||||
|
||||
if ((stat = NC_check_id(ncid, &ncp)))
|
||||
return stat;
|
||||
return ncp->dispatch->get_varm(ncid, varid, start, edges, stride, imapp,
|
||||
value, NC_NAT);
|
||||
}
|
||||
|
||||
@ -901,17 +983,27 @@ nc_put_varm (int ncid, int varid, const size_t * start,
|
||||
const size_t * edges, const ptrdiff_t * stride,
|
||||
const ptrdiff_t * imapp, const void *value)
|
||||
{
|
||||
return NC_put_varm(ncid, varid, start, edges, stride, imapp,
|
||||
NC* ncp;
|
||||
int stat;
|
||||
|
||||
if ((stat = NC_check_id(ncid, &ncp)))
|
||||
return stat;
|
||||
return ncp->dispatch->put_varm(ncid, varid, start, edges, stride, imapp,
|
||||
value, NC_NAT);
|
||||
}
|
||||
|
||||
int
|
||||
nc_get_vars(int ncid, int varid, const size_t * start,
|
||||
const size_t * edges, const ptrdiff_t * stride,
|
||||
void *value)
|
||||
nc_get_vars (int ncid, int varid, const size_t * start,
|
||||
const size_t * edges, const ptrdiff_t * stride,
|
||||
void *value)
|
||||
{
|
||||
return nc_get_varm(ncid, varid, start, edges,
|
||||
stride, NULL, value);
|
||||
NC* ncp;
|
||||
int stat;
|
||||
|
||||
if ((stat = NC_check_id(ncid, &ncp)))
|
||||
return stat;
|
||||
return ncp->dispatch->get_vars(ncid, varid, start, edges, stride,
|
||||
value, NC_NAT);
|
||||
}
|
||||
|
||||
int
|
||||
@ -919,9 +1011,15 @@ nc_put_vars (int ncid, int varid, const size_t * start,
|
||||
const size_t * edges, const ptrdiff_t * stride,
|
||||
const void *value)
|
||||
{
|
||||
return nc_put_varm(ncid, varid, start, edges,
|
||||
stride, NULL, value);
|
||||
NC* ncp;
|
||||
int stat;
|
||||
|
||||
if ((stat = NC_check_id(ncid, &ncp)))
|
||||
return stat;
|
||||
return ncp->dispatch->put_vars(ncid, varid, start, edges, stride,
|
||||
value, NC_NAT);
|
||||
}
|
||||
|
||||
int
|
||||
nc_get_var1_text(int ncid, int varid, const size_t *coord, char *value)
|
||||
{
|
||||
|
||||
@ -2,7 +2,7 @@ set PARMS=""; set ARGS=""; set CON="" ; set CE=""; set OCON=""
|
||||
set PARMS="[log]"
|
||||
|
||||
set F="http://nomads.ncdc.noaa.gov:80/dods/SEAWINDS/clm/uvclm95to05"
|
||||
set CON="time[1:2]"
|
||||
set CON="time[1:2:11]"
|
||||
if (1 == 0) then
|
||||
set F="file:///home/dmh/nc/oc/dataset-duacs-nrt-over30d-global-merged-madt-h"
|
||||
set F="http://oceanwatch.pfeg.noaa.gov/opendap/GLOBEC/GLOBEC_cetaceans"
|
||||
|
||||
@ -23,6 +23,7 @@ static int NCD3_redef(int ncid);
|
||||
static int NCD3__enddef(int ncid, size_t h_minfree, size_t v_align, size_t v_minfree, size_t r_align);
|
||||
static int NCD3_sync(int ncid);
|
||||
static int NCD3_abort(int ncid);
|
||||
|
||||
static int NCD3_put_vara(int ncid, int varid,
|
||||
const size_t *start, const size_t *edges0,
|
||||
const void *value0,
|
||||
@ -33,6 +34,14 @@ static int NCD3_get_vara(int ncid, int varid,
|
||||
void *value,
|
||||
nc_type memtype);
|
||||
|
||||
static int NCD3_put_vars(int ncid, int varid,
|
||||
const size_t *start, const size_t *edges, const ptrdiff_t* stride,
|
||||
const void *value0, nc_type memtype);
|
||||
|
||||
static int NCD3_get_vars(int ncid, int varid,
|
||||
const size_t *start, const size_t *edges, const ptrdiff_t* stride,
|
||||
void *value, nc_type memtype);
|
||||
|
||||
ptrdiff_t dapsinglestride3[NC_MAX_VAR_DIMS];
|
||||
size_t dapzerostart3[NC_MAX_VAR_DIMS];
|
||||
size_t dapsinglecount3[NC_MAX_VAR_DIMS];
|
||||
@ -78,6 +87,11 @@ NULL, /*inq_varid*/
|
||||
NULL, /*rename_var*/
|
||||
NCD3_get_vara,
|
||||
NCD3_put_vara,
|
||||
NCD3_get_vars,
|
||||
NCD3_put_vars,
|
||||
NULL, /*get_varm*/
|
||||
NULL, /*put_varm*/
|
||||
|
||||
NULL, /*inq_var_all*/
|
||||
|
||||
#ifdef USE_NETCDF4
|
||||
@ -173,8 +187,8 @@ NCD3_create(const char *path, int cmode,
|
||||
|
||||
static int
|
||||
NCD3_put_vara(int ncid, int varid,
|
||||
const size_t *start, const size_t *edges0,
|
||||
const void *value0,
|
||||
const size_t *start, const size_t *edges,
|
||||
const void *value,
|
||||
nc_type memtype)
|
||||
{
|
||||
return NC_EPERM;
|
||||
@ -189,3 +203,20 @@ NCD3_get_vara(int ncid, int varid,
|
||||
int stat = nc3d_getvarx(ncid, varid, start, edges, dapsinglestride3,value,memtype);
|
||||
return stat;
|
||||
}
|
||||
|
||||
static int
|
||||
NCD3_put_vars(int ncid, int varid,
|
||||
const size_t *start, const size_t *edges, const ptrdiff_t* stride,
|
||||
const void *value0, nc_type memtype)
|
||||
{
|
||||
return NC_EPERM;
|
||||
}
|
||||
|
||||
static int
|
||||
NCD3_get_vars(int ncid, int varid,
|
||||
const size_t *start, const size_t *edges, const ptrdiff_t* stride,
|
||||
void *value, nc_type memtype)
|
||||
{
|
||||
int stat = nc3d_getvarx(ncid, varid, start, edges, stride, value, memtype);
|
||||
return stat;
|
||||
}
|
||||
|
||||
@ -71,6 +71,11 @@ NULL, /*inq_varid*/
|
||||
NULL, /*rename_var*/
|
||||
NCD4_get_vara,
|
||||
NCD4_put_vara,
|
||||
NULL, /*get_vars*/
|
||||
NULL, /*put_vars*/
|
||||
NULL, /*get_varm*/
|
||||
NULL, /*put_varm*/
|
||||
|
||||
NULL, /*inq_var_all*/
|
||||
|
||||
#ifdef USE_NETCDF4
|
||||
|
||||
@ -117,6 +117,11 @@ NC3_inq_varid,
|
||||
NC3_rename_var,
|
||||
NC3_get_vara,
|
||||
NC3_put_vara,
|
||||
NCDEFAULT_get_vars,
|
||||
NCDEFAULT_put_vars,
|
||||
NCDEFAULT_get_varm,
|
||||
NCDEFAULT_put_varm,
|
||||
|
||||
NC3_inq_var_all,
|
||||
|
||||
#ifdef USE_NETCDF4
|
||||
|
||||
@ -50,6 +50,10 @@ NC4_inq_varid,
|
||||
NC4_rename_var,
|
||||
NC4_get_vara,
|
||||
NC4_put_vara,
|
||||
NCDEFAULT_get_vars,
|
||||
NCDEFAULT_put_vars,
|
||||
NCDEFAULT_get_varm,
|
||||
NCDEFAULT_put_varm,
|
||||
|
||||
NC4_inq_var_all,
|
||||
|
||||
|
||||
@ -1,13 +1,3 @@
|
||||
@multitable {@code{Linux 2.6.18-1.2257.fc5smp}} {@code{/opt/SUNWspro/bin/c99}} {@code{--disable-shared}}
|
||||
@headitem O/S @tab Compiler @tab @code{configure} Option
|
||||
@item @code{Darwin 10.3.0} @tab @code{/usr/bin/c89} @tab @code{}
|
||||
@item @code{Darwin 8.11.0} @tab @code{/usr/bin/c89} @tab @code{}
|
||||
@item @code{HP-UX B.11.00} @tab @code{/bin/c89} @tab @code{}
|
||||
@item @code{HP-UX B.11.00} @tab @code{/bin/cc} @tab @code{}
|
||||
@item @code{HP-UX B.11.00} @tab @code{/usr/ccs/bin/cc} @tab @code{}
|
||||
@item @code{HP-UX B.11.00} @tab @code{/usr/ccs/bin/cc} @tab @code{--disable-shared}
|
||||
@item @code{SunOS 5.10} @tab @code{/opt/SUNWspro/bin/c99} @tab @code{}
|
||||
@item @code{SunOS 5.10} @tab @code{/opt/SUNWspro/bin/c99} @tab @code{--disable-shared}
|
||||
@item @code{SunOS 5.9} @tab @code{/opt/SUNWspro/bin/c99} @tab @code{}
|
||||
@item @code{SunOS 5.9} @tab @code{/opt/SUNWspro/bin/c99} @tab @code{--disable-shared}
|
||||
@end multitable
|
||||
|
||||
@ -1,28 +1,3 @@
|
||||
@multitable {@code{Linux 2.6.18-1.2257.fc5smp}} {@code{/usr/bin/posix/make}}
|
||||
@headitem O/S @tab @code{make} Utility
|
||||
@item @code{AIX 1 5} @tab @code{/bin/make}
|
||||
@item @code{AIX 1 5} @tab @code{/opt/gnu/bin/make}
|
||||
@item @code{AIX 1 5} @tab @code{/usr/ccs/bin/make}
|
||||
@item @code{Darwin 10.3.0} @tab @code{/usr/bin/gnumake}
|
||||
@item @code{Darwin 10.3.0} @tab @code{/usr/bin/make}
|
||||
@item @code{Darwin 8.11.0} @tab @code{/usr/bin/gnumake}
|
||||
@item @code{Darwin 8.11.0} @tab @code{/usr/bin/make}
|
||||
@item @code{HP-UX B.11.00} @tab @code{/bin/make}
|
||||
@item @code{HP-UX B.11.00} @tab @code{/opt/gnu/bin/make}
|
||||
@item @code{IRIX64 6.5} @tab @code{/bin/make}
|
||||
@item @code{IRIX64 6.5} @tab @code{/opt/gnu/bin/make}
|
||||
@item @code{Linux 2.6.27.41-170.2.117.fc10.x86_64} @tab @code{/usr/bin/gmake}
|
||||
@item @code{Linux 2.6.27.41-170.2.117.fc10.x86_64} @tab @code{/usr/bin/make}
|
||||
@item @code{Linux 2.6.32.11-99.fc12.x86_64} @tab @code{/usr/bin/gmake}
|
||||
@item @code{Linux 2.6.32.11-99.fc12.x86_64} @tab @code{/usr/bin/make}
|
||||
@item @code{OSF1 V5.1} @tab @code{/bin/make}
|
||||
@item @code{OSF1 V5.1} @tab @code{/opt/gnu/bin/gmake}
|
||||
@item @code{OSF1 V5.1} @tab @code{/usr/bin/posix/make}
|
||||
@item @code{OSF1 V5.1} @tab @code{/usr/ccs/bin/make}
|
||||
@item @code{SunOS 5.10} @tab @code{/opt/csw/bin/gmake}
|
||||
@item @code{SunOS 5.10} @tab @code{/usr/ccs/bin/make}
|
||||
@item @code{SunOS 5.10} @tab @code{/usr/xpg4/bin/make}
|
||||
@item @code{SunOS 5.9} @tab @code{/opt/gnu/bin/gmake}
|
||||
@item @code{SunOS 5.9} @tab @code{/usr/ccs/bin/make}
|
||||
@item @code{SunOS 5.9} @tab @code{/usr/xpg4/bin/make}
|
||||
@end multitable
|
||||
|
||||
Binary file not shown.
@ -1,69 +1,3 @@
|
||||
@multitable {@code{Linux 2.6.18-1.2257.fc5smp}} {@code{/opt/csw/gcc4/bin/gcc}} {@code{--disable-shared}}
|
||||
@headitem O/S @tab Compiler @tab @code{configure} Option
|
||||
@item @code{AIX 1 5} @tab @code{/opt/gnu/bin/gcc} @tab @code{}
|
||||
@item @code{AIX 1 5} @tab @code{/opt/gnu/bin/gcc} @tab @code{--disable-shared}
|
||||
@item @code{AIX 1 5} @tab @code{/usr/vac/bin/c89} @tab @code{}
|
||||
@item @code{AIX 1 5} @tab @code{/usr/vac/bin/c89} @tab @code{--disable-shared}
|
||||
@item @code{AIX 1 5} @tab @code{/usr/vac/bin/cc} @tab @code{}
|
||||
@item @code{AIX 1 5} @tab @code{/usr/vac/bin/cc} @tab @code{--disable-shared}
|
||||
@item @code{AIX 1 5} @tab @code{/usr/vac/bin/xlc} @tab @code{}
|
||||
@item @code{AIX 1 5} @tab @code{/usr/vac/bin/xlc} @tab @code{--disable-shared}
|
||||
@item @code{Darwin 10.3.0} @tab @code{/usr/bin/c89} @tab @code{--disable-shared}
|
||||
@item @code{Darwin 10.3.0} @tab @code{/usr/bin/cc} @tab @code{}
|
||||
@item @code{Darwin 10.3.0} @tab @code{/usr/bin/cc} @tab @code{--disable-shared}
|
||||
@item @code{Darwin 10.3.0} @tab @code{/usr/bin/gcc} @tab @code{}
|
||||
@item @code{Darwin 10.3.0} @tab @code{/usr/bin/gcc} @tab @code{--disable-shared}
|
||||
@item @code{Darwin 8.11.0} @tab @code{/usr/bin/c89} @tab @code{--disable-shared}
|
||||
@item @code{Darwin 8.11.0} @tab @code{/usr/bin/cc} @tab @code{}
|
||||
@item @code{Darwin 8.11.0} @tab @code{/usr/bin/cc} @tab @code{--disable-shared}
|
||||
@item @code{Darwin 8.11.0} @tab @code{/usr/bin/gcc} @tab @code{}
|
||||
@item @code{Darwin 8.11.0} @tab @code{/usr/bin/gcc} @tab @code{--disable-shared}
|
||||
@item @code{HP-UX B.11.00} @tab @code{/bin/c89} @tab @code{--disable-shared}
|
||||
@item @code{HP-UX B.11.00} @tab @code{/bin/cc} @tab @code{--disable-shared}
|
||||
@item @code{HP-UX B.11.00} @tab @code{/opt/gnu/bin/gcc} @tab @code{}
|
||||
@item @code{HP-UX B.11.00} @tab @code{/opt/gnu/bin/gcc} @tab @code{--disable-shared}
|
||||
@item @code{IRIX64 6.5} @tab @code{/bin/c89} @tab @code{}
|
||||
@item @code{IRIX64 6.5} @tab @code{/bin/c89} @tab @code{--disable-shared}
|
||||
@item @code{IRIX64 6.5} @tab @code{/bin/cc} @tab @code{}
|
||||
@item @code{IRIX64 6.5} @tab @code{/bin/cc} @tab @code{--disable-shared}
|
||||
@item @code{IRIX64 6.5} @tab @code{/opt/gnu/bin/gcc} @tab @code{}
|
||||
@item @code{IRIX64 6.5} @tab @code{/opt/gnu/bin/gcc} @tab @code{--disable-shared}
|
||||
@item @code{Linux 2.6.27.41-170.2.117.fc10.x86_64} @tab @code{/usr/bin/c89} @tab @code{}
|
||||
@item @code{Linux 2.6.27.41-170.2.117.fc10.x86_64} @tab @code{/usr/bin/c89} @tab @code{--disable-shared}
|
||||
@item @code{Linux 2.6.27.41-170.2.117.fc10.x86_64} @tab @code{/usr/bin/cc} @tab @code{}
|
||||
@item @code{Linux 2.6.27.41-170.2.117.fc10.x86_64} @tab @code{/usr/bin/cc} @tab @code{--disable-shared}
|
||||
@item @code{Linux 2.6.27.41-170.2.117.fc10.x86_64} @tab @code{/usr/bin/gcc} @tab @code{}
|
||||
@item @code{Linux 2.6.27.41-170.2.117.fc10.x86_64} @tab @code{/usr/bin/gcc} @tab @code{--disable-shared}
|
||||
@item @code{Linux 2.6.32.11-99.fc12.x86_64} @tab @code{/usr/bin/c89} @tab @code{}
|
||||
@item @code{Linux 2.6.32.11-99.fc12.x86_64} @tab @code{/usr/bin/c89} @tab @code{--disable-shared}
|
||||
@item @code{Linux 2.6.32.11-99.fc12.x86_64} @tab @code{/usr/bin/cc} @tab @code{}
|
||||
@item @code{Linux 2.6.32.11-99.fc12.x86_64} @tab @code{/usr/bin/cc} @tab @code{--disable-shared}
|
||||
@item @code{Linux 2.6.32.11-99.fc12.x86_64} @tab @code{/usr/bin/gcc} @tab @code{}
|
||||
@item @code{Linux 2.6.32.11-99.fc12.x86_64} @tab @code{/usr/bin/gcc} @tab @code{--disable-shared}
|
||||
@item @code{OSF1 V5.1} @tab @code{/bin/c89} @tab @code{}
|
||||
@item @code{OSF1 V5.1} @tab @code{/bin/c89} @tab @code{--disable-shared}
|
||||
@item @code{OSF1 V5.1} @tab @code{/bin/cc} @tab @code{}
|
||||
@item @code{OSF1 V5.1} @tab @code{/bin/cc} @tab @code{--disable-shared}
|
||||
@item @code{OSF1 V5.1} @tab @code{/opt/gnu/bin/gcc} @tab @code{}
|
||||
@item @code{OSF1 V5.1} @tab @code{/opt/gnu/bin/gcc} @tab @code{--disable-shared}
|
||||
@item @code{OSF1 V5.1} @tab @code{/usr/ccs/bin/c89} @tab @code{}
|
||||
@item @code{OSF1 V5.1} @tab @code{/usr/ccs/bin/c89} @tab @code{--disable-shared}
|
||||
@item @code{OSF1 V5.1} @tab @code{/usr/ccs/bin/cc} @tab @code{}
|
||||
@item @code{OSF1 V5.1} @tab @code{/usr/ccs/bin/cc} @tab @code{--disable-shared}
|
||||
@item @code{SunOS 5.10} @tab @code{/opt/csw/gcc3/bin/gcc} @tab @code{}
|
||||
@item @code{SunOS 5.10} @tab @code{/opt/csw/gcc3/bin/gcc} @tab @code{--disable-shared}
|
||||
@item @code{SunOS 5.10} @tab @code{/opt/csw/gcc4/bin/gcc} @tab @code{}
|
||||
@item @code{SunOS 5.10} @tab @code{/opt/csw/gcc4/bin/gcc} @tab @code{--disable-shared}
|
||||
@item @code{SunOS 5.10} @tab @code{/opt/SUNWspro/bin/c89} @tab @code{}
|
||||
@item @code{SunOS 5.10} @tab @code{/opt/SUNWspro/bin/c89} @tab @code{--disable-shared}
|
||||
@item @code{SunOS 5.10} @tab @code{/opt/SUNWspro/bin/cc} @tab @code{}
|
||||
@item @code{SunOS 5.10} @tab @code{/opt/SUNWspro/bin/cc} @tab @code{--disable-shared}
|
||||
@item @code{SunOS 5.9} @tab @code{/opt/csw/gcc3/bin/gcc} @tab @code{}
|
||||
@item @code{SunOS 5.9} @tab @code{/opt/csw/gcc3/bin/gcc} @tab @code{--disable-shared}
|
||||
@item @code{SunOS 5.9} @tab @code{/opt/csw/gcc4/bin/gcc} @tab @code{}
|
||||
@item @code{SunOS 5.9} @tab @code{/opt/csw/gcc4/bin/gcc} @tab @code{--disable-shared}
|
||||
@item @code{SunOS 5.9} @tab @code{/opt/SUNWspro/bin/c89} @tab @code{}
|
||||
@item @code{SunOS 5.9} @tab @code{/opt/SUNWspro/bin/c89} @tab @code{--disable-shared}
|
||||
@item @code{SunOS 5.9} @tab @code{/opt/SUNWspro/bin/cc} @tab @code{}
|
||||
@item @code{SunOS 5.9} @tab @code{/opt/SUNWspro/bin/cc} @tab @code{--disable-shared}
|
||||
@end multitable
|
||||
|
||||
@ -1,76 +0,0 @@
|
||||
buddy:SunOS 5.10:/usr/ccs/bin/make:/opt/SUNWspro/bin/c89::1
|
||||
buddy:SunOS 5.10:/usr/ccs/bin/make:/opt/SUNWspro/bin/c89:--disable-shared:1
|
||||
buddy:SunOS 5.10:/usr/ccs/bin/make:/opt/SUNWspro/bin/c99::0
|
||||
buddy:SunOS 5.10:/usr/ccs/bin/make:/opt/SUNWspro/bin/c99:--disable-shared:0
|
||||
buddy:SunOS 5.10:/usr/xpg4/bin/make:/opt/SUNWspro/bin/cc::1
|
||||
buddy:SunOS 5.10:/usr/xpg4/bin/make:/opt/SUNWspro/bin/cc:--disable-shared:1
|
||||
buddy:SunOS 5.10:/opt/csw/bin/gmake:/opt/csw/gcc3/bin/gcc::1
|
||||
buddy:SunOS 5.10:/opt/csw/bin/gmake:/opt/csw/gcc3/bin/gcc:--disable-shared:1
|
||||
buddy:SunOS 5.10:/opt/csw/bin/gmake:/opt/csw/gcc4/bin/gcc::1
|
||||
buddy:SunOS 5.10:/opt/csw/bin/gmake:/opt/csw/gcc4/bin/gcc:--disable-shared:1
|
||||
dana:OSF1 V5.1:/usr/bin/posix/make:/bin/c89::1
|
||||
dana:OSF1 V5.1:/usr/bin/posix/make:/bin/c89:--disable-shared:1
|
||||
dana:OSF1 V5.1:/bin/make:/bin/cc::1
|
||||
dana:OSF1 V5.1:/bin/make:/bin/cc:--disable-shared:1
|
||||
dana:OSF1 V5.1:/usr/ccs/bin/make:/usr/ccs/bin/c89::1
|
||||
dana:OSF1 V5.1:/usr/ccs/bin/make:/usr/ccs/bin/c89:--disable-shared:1
|
||||
dana:OSF1 V5.1:/usr/ccs/bin/make:/usr/ccs/bin/cc::1
|
||||
dana:OSF1 V5.1:/usr/ccs/bin/make:/usr/ccs/bin/cc:--disable-shared:1
|
||||
dana:OSF1 V5.1:/opt/gnu/bin/gmake:/opt/gnu/bin/gcc::1
|
||||
dana:OSF1 V5.1:/opt/gnu/bin/gmake:/opt/gnu/bin/gcc:--disable-shared:1
|
||||
flip:IRIX64 6.5:/bin/make:/bin/cc::1
|
||||
flip:IRIX64 6.5:/bin/make:/bin/cc:--disable-shared:1
|
||||
flip:IRIX64 6.5:/bin/make:/bin/c89::1
|
||||
flip:IRIX64 6.5:/bin/make:/bin/c89:--disable-shared:1
|
||||
flip:IRIX64 6.5:/opt/gnu/bin/make:/opt/gnu/bin/gcc::1
|
||||
flip:IRIX64 6.5:/opt/gnu/bin/make:/opt/gnu/bin/gcc:--disable-shared:1
|
||||
gilda:Linux 2.6.27.41-170.2.117.fc10.x86_64:/usr/bin/make:/usr/bin/c89::1
|
||||
gilda:Linux 2.6.27.41-170.2.117.fc10.x86_64:/usr/bin/make:/usr/bin/c89:--disable-shared:1
|
||||
gilda:Linux 2.6.27.41-170.2.117.fc10.x86_64:/usr/bin/make:/usr/bin/cc::1
|
||||
gilda:Linux 2.6.27.41-170.2.117.fc10.x86_64:/usr/bin/make:/usr/bin/cc:--disable-shared:1
|
||||
gilda:Linux 2.6.27.41-170.2.117.fc10.x86_64:/usr/bin/gmake:/usr/bin/gcc::1
|
||||
gilda:Linux 2.6.27.41-170.2.117.fc10.x86_64:/usr/bin/gmake:/usr/bin/gcc:--disable-shared:1
|
||||
imogene:Linux 2.6.32.11-99.fc12.x86_64:/usr/bin/make:/usr/bin/c89::1
|
||||
imogene:Linux 2.6.32.11-99.fc12.x86_64:/usr/bin/make:/usr/bin/c89:--disable-shared:1
|
||||
imogene:Linux 2.6.32.11-99.fc12.x86_64:/usr/bin/make:/usr/bin/cc::1
|
||||
imogene:Linux 2.6.32.11-99.fc12.x86_64:/usr/bin/make:/usr/bin/cc:--disable-shared:1
|
||||
imogene:Linux 2.6.32.11-99.fc12.x86_64:/usr/bin/gmake:/usr/bin/gcc::1
|
||||
imogene:Linux 2.6.32.11-99.fc12.x86_64:/usr/bin/gmake:/usr/bin/gcc:--disable-shared:1
|
||||
mort:Darwin 10.3.0:/usr/bin/make:/usr/bin/c89::0
|
||||
mort:Darwin 10.3.0:/usr/bin/make:/usr/bin/c89:--disable-shared:1
|
||||
mort:Darwin 10.3.0:/usr/bin/make:/usr/bin/cc::1
|
||||
mort:Darwin 10.3.0:/usr/bin/make:/usr/bin/cc:--disable-shared:1
|
||||
mort:Darwin 10.3.0:/usr/bin/gnumake:/usr/bin/gcc::1
|
||||
mort:Darwin 10.3.0:/usr/bin/gnumake:/usr/bin/gcc:--disable-shared:1
|
||||
sid:Darwin 8.11.0:/usr/bin/make:/usr/bin/c89::0
|
||||
sid:Darwin 8.11.0:/usr/bin/make:/usr/bin/c89:--disable-shared:1
|
||||
sid:Darwin 8.11.0:/usr/bin/make:/usr/bin/cc::1
|
||||
sid:Darwin 8.11.0:/usr/bin/make:/usr/bin/cc:--disable-shared:1
|
||||
sid:Darwin 8.11.0:/usr/bin/gnumake:/usr/bin/gcc::1
|
||||
sid:Darwin 8.11.0:/usr/bin/gnumake:/usr/bin/gcc:--disable-shared:1
|
||||
tweety:HP-UX B.11.00:/bin/make:/bin/cc::0
|
||||
tweety:HP-UX B.11.00:/bin/make:/bin/cc:--disable-shared:1
|
||||
tweety:HP-UX B.11.00:/bin/make:/bin/c89::0
|
||||
tweety:HP-UX B.11.00:/bin/make:/bin/c89:--disable-shared:1
|
||||
tweety:HP-UX B.11.00:/usr/ccs/bin/make:/usr/ccs/bin/cc::0
|
||||
tweety:HP-UX B.11.00:/usr/ccs/bin/make:/usr/ccs/bin/cc:--disable-shared:0
|
||||
tweety:HP-UX B.11.00:/opt/gnu/bin/make:/opt/gnu/bin/gcc::1
|
||||
tweety:HP-UX B.11.00:/opt/gnu/bin/make:/opt/gnu/bin/gcc:--disable-shared:1
|
||||
zasu:AIX 1 5:/bin/make:/usr/vac/bin/cc::1
|
||||
zasu:AIX 1 5:/bin/make:/usr/vac/bin/cc:--disable-shared:1
|
||||
zasu:AIX 1 5:/usr/ccs/bin/make:/usr/vac/bin/c89::1
|
||||
zasu:AIX 1 5:/usr/ccs/bin/make:/usr/vac/bin/c89:--disable-shared:1
|
||||
zasu:AIX 1 5:/usr/ccs/bin/make:/usr/vac/bin/xlc::1
|
||||
zasu:AIX 1 5:/usr/ccs/bin/make:/usr/vac/bin/xlc:--disable-shared:1
|
||||
zasu:AIX 1 5:/opt/gnu/bin/make:/opt/gnu/bin/gcc::1
|
||||
zasu:AIX 1 5:/opt/gnu/bin/make:/opt/gnu/bin/gcc:--disable-shared:1
|
||||
zero:SunOS 5.9:/usr/ccs/bin/make:/opt/SUNWspro/bin/c89::1
|
||||
zero:SunOS 5.9:/usr/ccs/bin/make:/opt/SUNWspro/bin/c89:--disable-shared:1
|
||||
zero:SunOS 5.9:/usr/ccs/bin/make:/opt/SUNWspro/bin/c99::0
|
||||
zero:SunOS 5.9:/usr/ccs/bin/make:/opt/SUNWspro/bin/c99:--disable-shared:0
|
||||
zero:SunOS 5.9:/usr/xpg4/bin/make:/opt/SUNWspro/bin/cc::1
|
||||
zero:SunOS 5.9:/usr/xpg4/bin/make:/opt/SUNWspro/bin/cc:--disable-shared:1
|
||||
zero:SunOS 5.9:/opt/gnu/bin/gmake:/opt/csw/gcc3/bin/gcc::1
|
||||
zero:SunOS 5.9:/opt/gnu/bin/gmake:/opt/csw/gcc3/bin/gcc:--disable-shared:1
|
||||
zero:SunOS 5.9:/opt/gnu/bin/gmake:/opt/csw/gcc4/bin/gcc::1
|
||||
zero:SunOS 5.9:/opt/gnu/bin/gmake:/opt/csw/gcc4/bin/gcc:--disable-shared:1
|
||||
@ -1,9 +1,9 @@
|
||||
% texinfo.tex -- TeX macros to handle Texinfo files.
|
||||
%
|
||||
%
|
||||
% Load plain if necessary, i.e., if running under initex.
|
||||
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
|
||||
%
|
||||
\def\texinfoversion{2009-05-16.16}
|
||||
\def\texinfoversion{2009-08-14.15}
|
||||
%
|
||||
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
|
||||
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
|
||||
@ -1332,13 +1332,16 @@ output) for that.)}
|
||||
|
||||
\ifpdf
|
||||
%
|
||||
% Color manipulation macros based on pdfcolor.tex.
|
||||
\def\cmykDarkRed{0.28 1 1 0.35}
|
||||
\def\cmykBlack{0 0 0 1}
|
||||
% Color manipulation macros based on pdfcolor.tex,
|
||||
% except using rgb instead of cmyk; the latter is said to render as a
|
||||
% very dark gray on-screen and a very dark halftone in print, instead
|
||||
% of actual black.
|
||||
\def\rgbDarkRed{0.50 0.09 0.12}
|
||||
\def\rgbBlack{0 0 0}
|
||||
%
|
||||
% k sets the color for filling (usual text, etc.);
|
||||
% K sets the color for stroking (thin rules, e.g., normal _'s).
|
||||
\def\pdfsetcolor#1{\pdfliteral{#1 k #1 K}}
|
||||
\def\pdfsetcolor#1{\pdfliteral{#1 rg #1 RG}}
|
||||
%
|
||||
% Set color, and create a mark which defines \thiscolor accordingly,
|
||||
% so that \makeheadline knows which color to restore.
|
||||
@ -1348,7 +1351,7 @@ output) for that.)}
|
||||
\pdfsetcolor{#1}%
|
||||
}
|
||||
%
|
||||
\def\maincolor{\cmykBlack}
|
||||
\def\maincolor{\rgbBlack}
|
||||
\pdfsetcolor{\maincolor}
|
||||
\edef\thiscolor{\maincolor}
|
||||
\def\lastcolordefs{}
|
||||
@ -1443,8 +1446,8 @@ output) for that.)}
|
||||
%
|
||||
% by default, use a color that is dark enough to print on paper as
|
||||
% nearly black, but still distinguishable for online viewing.
|
||||
\def\urlcolor{\cmykDarkRed}
|
||||
\def\linkcolor{\cmykDarkRed}
|
||||
\def\urlcolor{\rgbDarkRed}
|
||||
\def\linkcolor{\rgbDarkRed}
|
||||
\def\endlink{\setcolor{\maincolor}\pdfendlink}
|
||||
%
|
||||
% Adding outlines to PDF; macros for calculating structure of outlines
|
||||
@ -4322,6 +4325,7 @@ end
|
||||
\definedummyword\code
|
||||
\definedummyword\command
|
||||
\definedummyword\dfn
|
||||
\definedummyword\email
|
||||
\definedummyword\emph
|
||||
\definedummyword\env
|
||||
\definedummyword\file
|
||||
@ -9272,12 +9276,8 @@ directory should work if nowhere else does.}
|
||||
@markupsetuplqdefault
|
||||
@markupsetuprqdefault
|
||||
|
||||
@c Gnulib now utterly and painfully insists on no trailing whitespace.
|
||||
@c So we have to nuke it.
|
||||
|
||||
@c Local variables:
|
||||
@c eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
@c eval: (add-hook 'write-file-hooks 'nuke-trailing-whitespace)
|
||||
@c page-delimiter: "^\\\\message"
|
||||
@c time-stamp-start: "def\\\\texinfoversion{"
|
||||
@c time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user