@@ -2305,7 +2305,6 @@ extern void closelog(NHFILE *);
|
||||
|
||||
/* ### sfstruct.c ### */
|
||||
|
||||
#ifndef TRACEBUFFERING
|
||||
extern void newread(NHFILE *, int, int, genericptr_t, unsigned);
|
||||
extern void bufon(int);
|
||||
extern void bufoff(int);
|
||||
@@ -2314,24 +2313,6 @@ extern void bwrite(int, const genericptr_t, unsigned);
|
||||
extern void mread(int, genericptr_t, unsigned);
|
||||
extern void minit(void);
|
||||
extern void bclose(int);
|
||||
#else
|
||||
#define bufon(x) Bufon(x,__FUNCTION__, __LINE__)
|
||||
#define bufoff(x) Bufoff(x,__FUNCTION__, __LINE__)
|
||||
#define bflush(x) Bflush(x,__FUNCTION__, __LINE__)
|
||||
#define bwrite(x,y,z) Bwrite(x,y,z,__FUNCTION__, __LINE__)
|
||||
#define bclose(x) Bclose(x,__FUNCTION__, __LINE__)
|
||||
#define mread(x,y,z) Mread(x,y,z,__FUNCTION__, __LINE__)
|
||||
#define minit() Minit(__FUNCTION__, __LINE__)
|
||||
#endif
|
||||
extern void Bufon(int, const char *, int);
|
||||
extern void Bufoff(int, const char *, int);
|
||||
extern void Bflush(int, const char *, int);
|
||||
extern void Bwrite(int, const genericptr_t, unsigned, const char *, int);
|
||||
extern void Bread(int, genericptr_t, unsigned, const char *, int);
|
||||
extern void Binit(const char *, int);
|
||||
extern void Bclose(int, const char *, int);
|
||||
extern void Mread(int, genericptr_t, unsigned, const char *, int);
|
||||
extern void Minit(const char *, int);
|
||||
#if defined(ZEROCOMP)
|
||||
extern void zerocomp_bclose(int);
|
||||
#endif
|
||||
|
||||
@@ -12,10 +12,6 @@
|
||||
#include <fcntl.h>
|
||||
#endif
|
||||
|
||||
#if defined(UNIX) || defined(WIN32)
|
||||
#define USE_BUFFERING
|
||||
#endif
|
||||
|
||||
#ifdef MICRO
|
||||
int dotcnt, dotrow; /* also used in restore */
|
||||
#endif
|
||||
|
||||
103
src/sfstruct.c
103
src/sfstruct.c
@@ -10,37 +10,6 @@
|
||||
* These were moved here from save.c and restore.c between 3.6.3 and 3.7.0.
|
||||
*/
|
||||
|
||||
#ifdef TRACE_BUFFERING
|
||||
#ifdef bufon
|
||||
#undef bufon
|
||||
#endif
|
||||
#ifdef bufoff
|
||||
#undef bufoff
|
||||
#endif
|
||||
#ifdef bflush
|
||||
#undef bflush
|
||||
#endif
|
||||
#ifdef bwrite
|
||||
#undef bwrite
|
||||
#endif
|
||||
#ifdef bclose
|
||||
#undef bclose
|
||||
#endif
|
||||
#ifdef mread
|
||||
#undef mread
|
||||
#endif
|
||||
#ifdef minit
|
||||
#undef minit
|
||||
#endif
|
||||
void newread(NHFILE *, int, int, genericptr_t, unsigned);
|
||||
void bufon(int);
|
||||
void bufoff(int);
|
||||
void bflush(int);
|
||||
void bwrite(int, const genericptr_t, unsigned);
|
||||
void mread(int, genericptr_t, unsigned);
|
||||
void minit(void);
|
||||
void bclose(int);
|
||||
#endif /* TRACE_BUFFERING */
|
||||
static int getidx(int, int);
|
||||
|
||||
#if defined(UNIX) || defined(WIN32)
|
||||
@@ -263,76 +232,4 @@ mread(int fd, genericptr_t buf, unsigned len)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef TRACE_BUFFERING
|
||||
|
||||
static FILE *tracefile;
|
||||
#define TFILE "trace-buffering.log"
|
||||
|
||||
#define TRACE(xx) \
|
||||
do { \
|
||||
tracefile = fopen(TFILE, "a"); \
|
||||
(void) fprintf(tracefile, "%s from %s:%d (%d)\n", \
|
||||
__FUNCTION__, fncname, linenum, xx); \
|
||||
fclose(tracefile); \
|
||||
} while (0)
|
||||
|
||||
void
|
||||
Bufon(int fd, const char *fncname, int linenum)
|
||||
{
|
||||
TRACE(fd);
|
||||
bufon(fd);
|
||||
}
|
||||
|
||||
void
|
||||
Bufoff(int fd, const char *fncname, int linenum)
|
||||
{
|
||||
TRACE(fd);
|
||||
bufoff(fd);
|
||||
}
|
||||
|
||||
void
|
||||
Bflush(int fd, const char* fncname, int linenum)
|
||||
{
|
||||
TRACE(fd);
|
||||
bflush(fd);
|
||||
}
|
||||
|
||||
void
|
||||
Bwrite(
|
||||
int fd,
|
||||
const genericptr_t loc,
|
||||
unsigned num,
|
||||
const char *fncname,
|
||||
int linenum)
|
||||
{
|
||||
TRACE(fd);
|
||||
bwrite(fd, loc, num);
|
||||
}
|
||||
|
||||
void
|
||||
Bclose(int fd, const char *fncname, int linenum)
|
||||
{
|
||||
TRACE(fd);
|
||||
bclose(fd);
|
||||
}
|
||||
|
||||
void
|
||||
Minit(const char*fncname, int linenum)
|
||||
{
|
||||
TRACE(-1);
|
||||
minit();
|
||||
}
|
||||
|
||||
void
|
||||
Mread(
|
||||
int fd,
|
||||
genericptr_t buf,
|
||||
unsigned len,
|
||||
const char *fncname,
|
||||
int linenum)
|
||||
{
|
||||
TRACE(fd);
|
||||
mread(fd, buf, len);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user