mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-02-02 08:40:39 +01:00
Code cleanup of obsolete DELTA port
This commit is contained in:
seanleyne
parent
e038e62beb
commit
f536f116e1
@ -1,6 +1,7 @@
|
||||
/*
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" and "MAC_CP" defines
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" define
|
||||
*/
|
||||
|
||||
#ifndef AUTOCONFIG_H
|
||||
@ -76,7 +77,6 @@
|
||||
#undef sgi
|
||||
#undef mpexl
|
||||
#undef _CRAY
|
||||
#undef DELTA
|
||||
#undef M88K
|
||||
#undef UNIXWARE
|
||||
#undef NCR3000
|
||||
|
||||
@ -15,6 +15,9 @@
|
||||
*
|
||||
* All Rights Reserved.
|
||||
* Contributor(s): ______________________________________.
|
||||
*
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" define
|
||||
*
|
||||
*/
|
||||
#ifndef _INTL_LANGDRV_H_
|
||||
#define _INTL_LANGDRV_H_
|
||||
@ -59,11 +62,8 @@
|
||||
#define NON_DLINK_OS
|
||||
#endif
|
||||
#endif
|
||||
#ifdef DELTA
|
||||
#define NON_DLINK_OS
|
||||
#endif
|
||||
#ifdef DG
|
||||
#define NON_DLINK_OS
|
||||
#endif
|
||||
|
||||
#endif /* _INTL_LANGDRV_H_ */
|
||||
#endif /* _INTL_LANGDRV_H_ */
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* PROGRAM: JRD Journal Server
|
||||
* MODULE: oldr.c
|
||||
* DESCRIPTION:
|
||||
* DESCRIPTION:
|
||||
*
|
||||
* The contents of this file are subject to the Interbase Public
|
||||
* License Version 1.0 (the "License"); you may not use this file
|
||||
@ -30,9 +30,6 @@
|
||||
#else
|
||||
#include <fcntl.h>
|
||||
#endif
|
||||
#ifdef DELTA
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#include "../jrd/old.h"
|
||||
#include "../jrd/llio.h"
|
||||
#include "../journal/misc_proto.h"
|
||||
@ -52,7 +49,7 @@ int OLDR_close( OLD * OLD_handle)
|
||||
{
|
||||
/**************************************
|
||||
*
|
||||
* O L D R _ c l o s e
|
||||
* O L D R _ c l o s e
|
||||
*
|
||||
**************************************
|
||||
*
|
||||
@ -91,7 +88,7 @@ int OLDR_get( OLD OLD_handle, SCHAR * logrec, SSHORT * len)
|
||||
*
|
||||
* Functional description
|
||||
* Get a record from the OLD file.
|
||||
* return
|
||||
* return
|
||||
* 0 OK
|
||||
* OLD_EOD Done
|
||||
* OLD_EOF EOF
|
||||
|
||||
@ -113,10 +113,6 @@ typedef SLONG fd_mask;
|
||||
#define TEXT SCHAR
|
||||
#endif
|
||||
|
||||
#ifdef DELTA
|
||||
#define waitpid(x,y,z) wait (y)
|
||||
#endif
|
||||
|
||||
#ifndef WIN_NT
|
||||
#ifndef HANDLE
|
||||
#define HANDLE SSHORT
|
||||
|
||||
@ -29,10 +29,11 @@
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" and "MAC_CP" defines
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "XENIX" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
*
|
||||
*/
|
||||
/*
|
||||
$Id: common.h,v 1.9 2002-02-16 02:49:56 seanleyne Exp $
|
||||
$Id: common.h,v 1.10 2002-02-16 03:05:17 seanleyne Exp $
|
||||
*/
|
||||
|
||||
#ifndef JRD_COMMON_H
|
||||
@ -860,40 +861,6 @@ typedef unsigned long DWORD;
|
||||
#endif /* NETWARE_386 */
|
||||
|
||||
|
||||
|
||||
#ifdef DELTA
|
||||
#define NO_PYXIS
|
||||
#define INTL
|
||||
#define INTL_BACKEND
|
||||
#define SETPGRP setpgrp()
|
||||
#define NOINITGROUPS
|
||||
#define KILLER_SIGNALS
|
||||
#define SYSV_SIGNALS
|
||||
#define SYSV_SHMEM
|
||||
#define SMALL_FILE_NAMES
|
||||
#define vfork fork
|
||||
#define UNIX 1
|
||||
#define CURSES_KEYPAD 1
|
||||
#define FB_ALIGN(n,b) ((n+1) & ~1)
|
||||
#define ALIGNMENT 4
|
||||
#define DOUBLE_ALIGN 4
|
||||
#define IMPLEMENTATION 45
|
||||
#define IEEE
|
||||
#define SHMEM_PICKY
|
||||
|
||||
#ifndef MAXPATHLEN
|
||||
#define MAXPATHLEN 1024
|
||||
#endif
|
||||
|
||||
#undef LINKS_EXIST
|
||||
#define INTL
|
||||
#define setreuid(ruid,euid) setuid(euid)
|
||||
#define setregid(rgid,egid) setgid(egid)
|
||||
|
||||
#endif /* DELTA */
|
||||
|
||||
|
||||
|
||||
#ifdef M88K
|
||||
#define INTL
|
||||
#define SETPGRP setpgrp()
|
||||
|
||||
@ -19,6 +19,9 @@
|
||||
*
|
||||
* All Rights Reserved.
|
||||
* Contributor(s): ______________________________________.
|
||||
*
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
*
|
||||
*/
|
||||
|
||||
#include "firebird.h"
|
||||
@ -68,10 +71,6 @@
|
||||
#define DBL_MAX_10_EXP 308
|
||||
#endif
|
||||
|
||||
#ifdef DELTA
|
||||
#define DBL_MAX_10_EXP 308
|
||||
#endif
|
||||
|
||||
#ifdef IMP
|
||||
#define DBL_MAX_10_EXP 308
|
||||
#endif
|
||||
|
||||
@ -27,11 +27,7 @@
|
||||
#include "../jrd/everything.h"
|
||||
#include "../jrd/dbg.h"
|
||||
|
||||
#ifdef DELTA
|
||||
#define FLD(struct, string, field) 0
|
||||
#else
|
||||
#define FLD(struct, string, field) string, (SCHAR*) OFFSET (struct, field), (SCHAR*) sizeof (((struct) 0)->field)
|
||||
#endif
|
||||
|
||||
extern "C" {
|
||||
|
||||
@ -81,7 +77,7 @@ static TEXT_PTR dbb_stuff[] = {
|
||||
0
|
||||
},
|
||||
vec[] = {
|
||||
"VECTOR",
|
||||
"VECTOR",
|
||||
// TMN: FIXFIX! John?
|
||||
// FLD(VEC, "Count %d", vec_count),
|
||||
"Count %d", (SCHAR*)4, (SCHAR*)4,
|
||||
|
||||
@ -20,11 +20,11 @@
|
||||
* All Rights Reserved.
|
||||
* Contributor(s): ______________________________________.
|
||||
* Added TCP_NO_DELAY option for superserver on Linux
|
||||
* FSG 16.03.2001
|
||||
* FSG 16.03.2001
|
||||
* Solaris x86 changes - Konstantin Kuznetsov, Neil McCalden
|
||||
*/
|
||||
/*
|
||||
$Id: isc.cpp,v 1.6 2002-01-04 11:34:15 skywalker Exp $
|
||||
$Id: isc.cpp,v 1.7 2002-02-16 03:05:17 seanleyne Exp $
|
||||
*/
|
||||
#ifdef DARWIN
|
||||
#define _STLP_CCTYPE
|
||||
@ -153,11 +153,6 @@ static LKSB wake_lock;
|
||||
#include <fcntl.h>
|
||||
#endif
|
||||
|
||||
#ifdef DELTA
|
||||
#include <sys/sysmacros.h>
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
#ifdef IMP
|
||||
typedef unsigned int mode_t;
|
||||
typedef int pid_t;
|
||||
|
||||
@ -20,7 +20,8 @@
|
||||
* All Rights Reserved.
|
||||
* Contributor(s): ______________________________________.
|
||||
*
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
*
|
||||
*/
|
||||
|
||||
@ -125,15 +126,6 @@ typedef struct itm {
|
||||
#include <sys/mount.h>
|
||||
#endif
|
||||
|
||||
#ifdef DELTA
|
||||
#define NON_MNTENT
|
||||
#define MTAB "/etc/mnttab"
|
||||
#define MTAB_OPEN(path,type) open (path, type)
|
||||
#define MTAB_CLOSE(stream) close (stream)
|
||||
#define GETWD(buf) getcwd (buf, MAXPATHLEN)
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef ultrix
|
||||
#define NON_MNTENT
|
||||
#include <sys/mount.h>
|
||||
@ -186,11 +178,6 @@ typedef struct mnt {
|
||||
#include <sys/file.h>
|
||||
#include <errno.h>
|
||||
|
||||
#ifdef DELTA
|
||||
#include <sys/sysmacros.h>
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
#ifdef DARWIN
|
||||
#include </usr/include/pwd.h>
|
||||
#else
|
||||
@ -256,16 +243,12 @@ static void share_name_from_unc(TEXT *, TEXT *, LPREMOTE_NAME_INFO);
|
||||
#if (defined AIX || defined AIX_PPC || defined DECOSF)
|
||||
static BOOLEAN get_mounts(MNT *, TEXT *, TEXT **, int *);
|
||||
#else
|
||||
#ifdef DELTA
|
||||
static BOOLEAN get_mounts(MNT *, TEXT *, int);
|
||||
#else
|
||||
#ifdef ultrix
|
||||
static BOOLEAN get_mounts(MNT *, TEXT *, int *);
|
||||
#else
|
||||
static BOOLEAN get_mounts(MNT *, TEXT *, IB_FILE *);
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
static BOOLEAN get_server(TEXT *, TEXT *);
|
||||
#if (defined SPX) || ((defined PC_PLATFORM) && !(defined NETWARE_386))
|
||||
static void string_parse(TEXT *, TEXT **, TEXT **, TEXT **, TEXT *);
|
||||
@ -345,7 +328,7 @@ int ISC_analyze_nfs(TEXT * expanded_filename, TEXT * node_name)
|
||||
*
|
||||
* Functional description
|
||||
* Check a file name for an NFS mount point. If so,
|
||||
* decompose into node name and remote file name.
|
||||
* decompose into node name and remote file name.
|
||||
*
|
||||
**************************************/
|
||||
#ifdef STACK_EFFICIENT
|
||||
@ -359,11 +342,7 @@ int ISC_analyze_nfs(TEXT * expanded_filename, TEXT * node_name)
|
||||
TEXT *p, *q, *temp;
|
||||
USHORT flag;
|
||||
|
||||
#ifdef DELTA
|
||||
int mtab;
|
||||
#else
|
||||
IB_FILE *mtab;
|
||||
#endif
|
||||
int context, len;
|
||||
|
||||
#ifdef STACK_EFFICIENT
|
||||
@ -552,7 +531,7 @@ int DLL_EXPORT ISC_analyze_spx(TEXT * expanded_name, TEXT * node_name)
|
||||
{
|
||||
/**************************************
|
||||
*
|
||||
* I S C _ a n a l y z e _ s p x
|
||||
* I S C _ a n a l y z e _ s p x
|
||||
*
|
||||
**************************************
|
||||
*
|
||||
@ -566,7 +545,7 @@ int DLL_EXPORT ISC_analyze_spx(TEXT * expanded_name, TEXT * node_name)
|
||||
|
||||
p = expanded_name;
|
||||
|
||||
/* Scan looking for the SPX node separator character (node@path).
|
||||
/* Scan looking for the SPX node separator character (node@path).
|
||||
Also check for an INET separator before the SPX separator in case
|
||||
this is a network hop (e.g. tcp_node:spx_node@path). */
|
||||
|
||||
@ -624,7 +603,7 @@ int DLL_EXPORT ISC_analyze_tcp(TEXT * file_name, TEXT * node_name)
|
||||
#else
|
||||
#if (defined PC_PLATFORM)
|
||||
/* for DOS and OS/2, introduce a restriction against one-character
|
||||
machine names as a kludge to prevent the situation of
|
||||
machine names as a kludge to prevent the situation of
|
||||
trying to attach to C: as a remote machine -- there has
|
||||
got to be a better way to resolve this */
|
||||
|
||||
@ -807,10 +786,10 @@ int ISC_expand_filename(
|
||||
* If no host is specified, it checks for an ISC_DATABASE
|
||||
* environment variable and uses that.
|
||||
* If there is no slash after the node name, one is inserted.
|
||||
* If there is no trailing slash after an ISC_DATABASE path,
|
||||
* If there is no trailing slash after an ISC_DATABASE path,
|
||||
* one is inserted.
|
||||
*
|
||||
* The final result is an expanded path name.
|
||||
* The final result is an expanded path name.
|
||||
*
|
||||
**************************************/
|
||||
TEXT c, *p, *in, *out, *default_directory, *colon, *colon2, *atsign;
|
||||
@ -870,8 +849,8 @@ int ISC_expand_filename(
|
||||
}
|
||||
}
|
||||
else {
|
||||
/* assuming the filename is not already remote, look for
|
||||
an environment variable that will provide a default
|
||||
/* assuming the filename is not already remote, look for
|
||||
an environment variable that will provide a default
|
||||
remote path specification */
|
||||
|
||||
if (default_directory = getenv(ISC_DATABASE)) {
|
||||
@ -900,7 +879,7 @@ int ISC_expand_filename(
|
||||
*out = '\0';
|
||||
|
||||
/* If there is an explicit node name of the form \\DOPEY or //DOPEY
|
||||
assume named pipes and translate forward slashes to back slashes.
|
||||
assume named pipes and translate forward slashes to back slashes.
|
||||
Otherwise, translate back slashes to forward. The end result
|
||||
is a path with consistent separators. */
|
||||
|
||||
@ -969,7 +948,7 @@ int ISC_expand_filename(
|
||||
strncpy(path, file_name, file_length);
|
||||
path[file_length] = 0;
|
||||
|
||||
/* use the NetWare routine splitpath to break down the
|
||||
/* use the NetWare routine splitpath to break down the
|
||||
path into discrete parts */
|
||||
|
||||
_splitpath(path, volume, directory1, fname, ext);
|
||||
@ -979,7 +958,7 @@ int ISC_expand_filename(
|
||||
if (!volume[0])
|
||||
strcpy(volume, "SYS:");
|
||||
|
||||
/* if no backslash was used at the beginning,
|
||||
/* if no backslash was used at the beginning,
|
||||
add it for consistency */
|
||||
|
||||
if ((directory1[0] != '/') && (directory1[0] != '\\')) {
|
||||
@ -1166,26 +1145,26 @@ int ISC_expand_filename(
|
||||
if (!fully_qualified_path)
|
||||
length = JRD_getdir(expanded_name, MAXPATHLEN);
|
||||
if (length && length < MAXPATHLEN) {
|
||||
/**
|
||||
case where temp is of the form "c:foo.gdb" and
|
||||
expanded_name is "c:\x\y".
|
||||
/**
|
||||
case where temp is of the form "c:foo.gdb" and
|
||||
expanded_name is "c:\x\y".
|
||||
**/
|
||||
if (drive_letter_present && device[0] == expanded_name[0]) {
|
||||
strcat(expanded_name, "\\");
|
||||
strcat(expanded_name, temp + 2);
|
||||
}
|
||||
/**
|
||||
case where temp is of the form "foo.gdb" and
|
||||
expanded_name is "c:\x\y".
|
||||
/**
|
||||
case where temp is of the form "foo.gdb" and
|
||||
expanded_name is "c:\x\y".
|
||||
**/
|
||||
else if (!drive_letter_present) {
|
||||
strcat(expanded_name, "\\");
|
||||
strcat(expanded_name, temp);
|
||||
}
|
||||
else {
|
||||
/**
|
||||
case where temp is of the form "d:foo.gdb" and
|
||||
expanded_name is "c:\x\y".
|
||||
/**
|
||||
case where temp is of the form "d:foo.gdb" and
|
||||
expanded_name is "c:\x\y".
|
||||
Discard expanded_name and use temp as it is.
|
||||
**/
|
||||
/* in this case use the temp but we need to ensure that we expand to
|
||||
@ -1215,7 +1194,7 @@ int ISC_expand_filename(
|
||||
if (_fullpath(expanded_name, temp, MAXPATHLEN) != NULL) {
|
||||
TEXT expanded_name2[MAXPATHLEN];
|
||||
|
||||
/* convert then name to its shorter version ie. convert longfilename.gdb
|
||||
/* convert then name to its shorter version ie. convert longfilename.gdb
|
||||
* to longfi~1.gdb */
|
||||
file_length =
|
||||
(USHORT) GetShortPathName(expanded_name, expanded_name2,
|
||||
@ -1607,7 +1586,7 @@ static int expand_filename2(TEXT * from_buff, USHORT length, TEXT * to_buff)
|
||||
if (n < 0)
|
||||
continue;
|
||||
|
||||
/* We've got a link. If it contains a node name or it starts
|
||||
/* We've got a link. If it contains a node name or it starts
|
||||
with a slash, it replaces the initial segment so far */
|
||||
|
||||
temp[n] = 0;
|
||||
@ -1946,55 +1925,6 @@ static BOOLEAN get_mounts(
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef DELTA
|
||||
#define GET_MOUNTS
|
||||
static BOOLEAN get_mounts(MNT * mount, TEXT * buffer, int file)
|
||||
{
|
||||
/**************************************
|
||||
*
|
||||
* g e t _ m o u n t s ( D E L T A )
|
||||
*
|
||||
**************************************
|
||||
*
|
||||
* Functional description
|
||||
* Get ALL mount points.
|
||||
*
|
||||
**************************************/
|
||||
TEXT in_buffer[2134], *p, *q;
|
||||
int n;
|
||||
|
||||
/* Start by finding a mount point. */
|
||||
|
||||
p = buffer;
|
||||
|
||||
for (;;) {
|
||||
n = read(file, in_buffer, 2134);
|
||||
|
||||
if (n != 2134)
|
||||
break;
|
||||
|
||||
mount->mnt_node = p;
|
||||
q = &in_buffer[1024];
|
||||
while (*q && *q != ':')
|
||||
*p++ = *q++;
|
||||
*p++ = 0;
|
||||
if (*q != ':')
|
||||
mount->mnt_node = NULL;
|
||||
if (*q)
|
||||
q++;
|
||||
mount->mnt_path = p;
|
||||
while (*p++ = *q++);
|
||||
mount->mnt_mount = p;
|
||||
q = in_buffer;
|
||||
while (*p++ = *q++);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#if defined(SV_MNTENT) && !defined(SOLARIS)
|
||||
#define GET_MOUNTS
|
||||
static BOOLEAN get_mounts(MNT * mount, TEXT * buffer, IB_FILE * file)
|
||||
@ -2488,4 +2418,4 @@ static void convert_slashes(char oldslash, char newslash, char *string)
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* PC_PLATFORM */
|
||||
#endif /* PC_PLATFORM */
|
||||
@ -22,10 +22,11 @@
|
||||
* Solaris x86 changes - Konstantin Kuznetsov, Neil McCalden
|
||||
*
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
*
|
||||
*/
|
||||
|
||||
/* $Id: isc_ipc.cpp,v 1.7 2002-02-16 02:21:27 seanleyne Exp $ */
|
||||
/* $Id: isc_ipc.cpp,v 1.8 2002-02-16 03:05:17 seanleyne Exp $ */
|
||||
|
||||
#ifdef SHLIB_DEFS
|
||||
#define LOCAL_SHLIB_DEFS
|
||||
@ -165,11 +166,6 @@ static int process_id = 0;
|
||||
|
||||
#define LOCAL_SEMAPHORES 4
|
||||
|
||||
#ifdef DELTA
|
||||
#include <sys/sysmacros.h>
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
#ifdef IMP
|
||||
typedef int pid_t;
|
||||
|
||||
|
||||
@ -21,6 +21,7 @@
|
||||
* Contributor(s): ______________________________________.
|
||||
*
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "XENIX" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
*
|
||||
*/
|
||||
|
||||
@ -144,11 +145,6 @@ static UCHAR *next_shared_memory;
|
||||
#define PRIV 0666
|
||||
#define LOCAL_SEMAPHORES 4
|
||||
|
||||
#ifdef DELTA
|
||||
#include <sys/sysmacros.h>
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
#ifdef IMP
|
||||
typedef unsigned int mode_t;
|
||||
typedef int pid_t;
|
||||
@ -733,7 +729,7 @@ int ISC_event_init(EVENT event, int semid, int semnum)
|
||||
/* Prepare an Inter-Thread event block */
|
||||
event->event_semid = -1;
|
||||
|
||||
/* Default attribute objects initialize sync. primitives
|
||||
/* Default attribute objects initialize sync. primitives
|
||||
to be used to sync thread within one process only.
|
||||
*/
|
||||
#ifdef HP10
|
||||
@ -1206,7 +1202,7 @@ int ISC_event_wait(
|
||||
(void) semaphore_wait_isc_sync(count, semid, semnums);
|
||||
if (micro_seconds > 0) {
|
||||
/* semaphore_wait_isc_sync() routine may return SUCCESS if our timeout
|
||||
handler poked the semaphore. So make sure that the event
|
||||
handler poked the semaphore. So make sure that the event
|
||||
actually happened. If it didn't, indicate failure. */
|
||||
|
||||
if (ISC_event_blocked(count, events, values))
|
||||
@ -1847,12 +1843,12 @@ void ISC_exception_post(ULONG sig_num, TEXT * err_msg)
|
||||
{
|
||||
/**************************************
|
||||
*
|
||||
* I S C _ e x c e p t i o n _ p o s t ( U N I X )
|
||||
* I S C _ e x c e p t i o n _ p o s t ( U N I X )
|
||||
*
|
||||
**************************************
|
||||
*
|
||||
* Functional description
|
||||
* When we got a sync exception, fomulate the error code
|
||||
* When we got a sync exception, fomulate the error code
|
||||
* write it to the log file, and abort.
|
||||
*
|
||||
**************************************/
|
||||
@ -1916,17 +1912,17 @@ ULONG ISC_exception_post(ULONG except_code, TEXT * err_msg)
|
||||
{
|
||||
/**************************************
|
||||
*
|
||||
* I S C _ e x c e p t i o n _ p o s t ( W I N _ N T )
|
||||
* I S C _ e x c e p t i o n _ p o s t ( W I N _ N T )
|
||||
*
|
||||
**************************************
|
||||
*
|
||||
* Functional description
|
||||
* When we got a sync exception, fomulate the error code
|
||||
* When we got a sync exception, fomulate the error code
|
||||
* write it to the log file, and abort. Note: We can not
|
||||
* actually call "abort" since in windows this will cause
|
||||
* a dialog to appear stating the obvious! Since on NT we
|
||||
* would not get a core file, there is actually no difference
|
||||
* between abort() and exit(3).
|
||||
* between abort() and exit(3).
|
||||
*
|
||||
**************************************/
|
||||
TEXT *log_msg;
|
||||
@ -2272,9 +2268,9 @@ UCHAR *ISC_map_file(STATUS * status_vector,
|
||||
sprintf(expanded_filename, filename,
|
||||
ISC_get_host(hostname, sizeof(hostname)));
|
||||
|
||||
/* make the complete filename for the init file this file is to be used as a
|
||||
/* make the complete filename for the init file this file is to be used as a
|
||||
master lock to eliminate possible race conditions with just a single file
|
||||
locking. The race condition is caused as the conversion of a EXCLUSIVE
|
||||
locking. The race condition is caused as the conversion of a EXCLUSIVE
|
||||
lock to a SHARED lock is not atomic*/
|
||||
|
||||
gds__prefix_lock(tmp, INIT_FILE);
|
||||
@ -2677,7 +2673,7 @@ UCHAR *ISC_map_file(STATUS * status_vector,
|
||||
size of the segment associated with it is less
|
||||
than "length" and "length" is not equal to zero.
|
||||
|
||||
Let's find out what the problem is by getting the
|
||||
Let's find out what the problem is by getting the
|
||||
system-imposed limits.
|
||||
*/
|
||||
|
||||
@ -2702,7 +2698,7 @@ UCHAR *ISC_map_file(STATUS * status_vector,
|
||||
|
||||
/* If we are here then the shared memory segment already
|
||||
exists and the "length" we specified in shmget() is
|
||||
bigger than the size of the existing segment.
|
||||
bigger than the size of the existing segment.
|
||||
|
||||
Because the segment has to exist at this point the
|
||||
following shmget() does not have IPC_CREAT flag set.
|
||||
@ -2757,8 +2753,8 @@ UCHAR *ISC_map_file(STATUS * status_vector,
|
||||
bigger than length, we remove it and create new one with the
|
||||
size "length".
|
||||
Also, if "length" is zero (that means we have already mapped
|
||||
the existing segment with the zero size) remap the segment
|
||||
with the existing size
|
||||
the existing segment with the zero size) remap the segment
|
||||
with the existing size
|
||||
*/
|
||||
if (shmctl(shmid, IPC_STAT, &buf) == -1) {
|
||||
error(status_vector, "shmctl/IPC_STAT", errno);
|
||||
@ -2793,7 +2789,7 @@ UCHAR *ISC_map_file(STATUS * status_vector,
|
||||
#else /* !SUPERSERVER */
|
||||
|
||||
if (length == 0) {
|
||||
/* Use the existing length. This should not happen for the
|
||||
/* Use the existing length. This should not happen for the
|
||||
very first attachment to the shared memory. */
|
||||
|
||||
if (shmctl(shmid, IPC_STAT, &buf) == -1) {
|
||||
@ -3322,7 +3318,7 @@ UCHAR *ISC_map_object(STATUS * status_vector,
|
||||
{
|
||||
/**************************************
|
||||
*
|
||||
* I S C _ m a p _ o b j e c t
|
||||
* I S C _ m a p _ o b j e c t
|
||||
*
|
||||
**************************************
|
||||
*
|
||||
@ -3380,7 +3376,7 @@ BOOLEAN ISC_unmap_object(STATUS * status_vector,
|
||||
{
|
||||
/**************************************
|
||||
*
|
||||
* I S C _ u n m a p _ o b j e c t
|
||||
* I S C _ u n m a p _ o b j e c t
|
||||
*
|
||||
**************************************
|
||||
*
|
||||
@ -3594,7 +3590,7 @@ int ISC_mutex_unlock(MTX mutex)
|
||||
int state;
|
||||
|
||||
for (;;) {
|
||||
/* Note use of undocumented lwp_mutex_unlock call
|
||||
/* Note use of undocumented lwp_mutex_unlock call
|
||||
* due to Solaris 2.4 bug */
|
||||
state = _lwp_mutex_unlock(mutex->mtx_mutex);
|
||||
if (!state)
|
||||
@ -4224,12 +4220,12 @@ UCHAR *DLL_EXPORT ISC_remap_file(STATUS * status_vector,
|
||||
}
|
||||
|
||||
/* If the remap file exists, remap does not occur correctly.
|
||||
* The file number is local to the process and when it is
|
||||
* The file number is local to the process and when it is
|
||||
* incremented and a new filename is created, that file may
|
||||
* already exist. In that case, the file is not expanded.
|
||||
* This will happen when the file is expanded more than once
|
||||
* by concurrently running processes.
|
||||
*
|
||||
*
|
||||
* The problem will be fixed by making sure that a new file name
|
||||
* is generated with the mapped file is created.
|
||||
*/
|
||||
@ -4496,7 +4492,7 @@ void ISC_semaphore_close(ULONG semid)
|
||||
**************************************
|
||||
*
|
||||
* Functional description
|
||||
* Unregister and close the passed semaphore.
|
||||
* Unregister and close the passed semaphore.
|
||||
*
|
||||
**************************************/
|
||||
|
||||
@ -4516,7 +4512,7 @@ void ISC_semaphore_open(ULONG * semid, ULONG init_value)
|
||||
**************************************
|
||||
*
|
||||
* Functional description
|
||||
* Open and register a semaphore.
|
||||
* Open and register a semaphore.
|
||||
*
|
||||
**************************************/
|
||||
|
||||
@ -4720,7 +4716,7 @@ static void alarm_handler(void)
|
||||
**************************************
|
||||
*
|
||||
* Functional description
|
||||
* Handle an alarm clock interrupt.
|
||||
* Handle an alarm clock interrupt.
|
||||
*
|
||||
**************************************/
|
||||
}
|
||||
@ -4796,7 +4792,7 @@ static SLONG find_key(STATUS * status_vector, TEXT * filename)
|
||||
{
|
||||
/**************************************
|
||||
*
|
||||
* f i n d _ k e y
|
||||
* f i n d _ k e y
|
||||
*
|
||||
**************************************
|
||||
*
|
||||
@ -4874,7 +4870,7 @@ void longjmp_sig_handler(int sig_num)
|
||||
|
||||
/* Note: we can only do this since we know that we
|
||||
will only be going to JRD, specifically fun and blf.
|
||||
If we were to make this generic, we would need to
|
||||
If we were to make this generic, we would need to
|
||||
actally hang the sigsetjmp menber off of THDD, and
|
||||
make sure that it is set properly for all sub-systems. */
|
||||
|
||||
@ -4948,7 +4944,7 @@ static BOOLEAN semaphore_wait_isc_sync(int count, int semid, int *semnums)
|
||||
* Wait on the given semaphores. Return FAILURE if
|
||||
* interrupted (including timeout) before any
|
||||
* semaphore was poked else return SUCCESS.
|
||||
*
|
||||
*
|
||||
**************************************/
|
||||
int i, ret;
|
||||
struct sembuf semops[16], *semptr;
|
||||
@ -4970,4 +4966,4 @@ static BOOLEAN semaphore_wait_isc_sync(int count, int semid, int *semnums)
|
||||
#endif /* PIPE_IS_SHRLIB */
|
||||
|
||||
|
||||
} // extern "C"
|
||||
} // extern "C"
|
||||
@ -21,6 +21,7 @@
|
||||
* Contributor(s): ______________________________________.
|
||||
*
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
*
|
||||
*/
|
||||
|
||||
@ -54,10 +55,6 @@
|
||||
#include <sys/stat.h>
|
||||
#endif
|
||||
|
||||
#ifdef DELTA
|
||||
#include <fcntl.h>
|
||||
#endif
|
||||
|
||||
#ifdef M88K
|
||||
#include <fcntl.h>
|
||||
#endif
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
*
|
||||
* All Rights Reserved.
|
||||
* Contributor(s): ______________________________________.
|
||||
* $Id: license.h,v 1.6 2002-02-16 02:49:56 seanleyne Exp $
|
||||
* $Id: license.h,v 1.7 2002-02-16 03:05:17 seanleyne Exp $
|
||||
* Revision 1.5 2000/12/08 16:18:21 fsg
|
||||
* Preliminary changes to get IB_BUILD_NO automatically
|
||||
* increased on commits.
|
||||
@ -37,6 +37,7 @@
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" and "MAC_CP" defines
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "XENIX" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
*
|
||||
*/
|
||||
|
||||
@ -122,10 +123,6 @@
|
||||
#define FB_PLATFORM "IM"
|
||||
#endif
|
||||
|
||||
#ifdef DELTA
|
||||
#define FB_PLATFORM "DL"
|
||||
#endif
|
||||
|
||||
#ifdef sgi
|
||||
#define FB_PLATFORM "SG"
|
||||
#endif
|
||||
|
||||
@ -21,6 +21,7 @@
|
||||
* Contributor(s): ______________________________________.
|
||||
*
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
*
|
||||
*/
|
||||
|
||||
@ -58,10 +59,6 @@
|
||||
# ifndef VMS
|
||||
# include <fcntl.h>
|
||||
# ifndef IMP
|
||||
# ifdef DELTA
|
||||
# include <unistd.h>
|
||||
# include <sys/types.h>
|
||||
# endif
|
||||
# include <sys/file.h>
|
||||
# endif
|
||||
# else
|
||||
|
||||
@ -21,6 +21,7 @@
|
||||
* Contributor(s): ______________________________________.
|
||||
*
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
*
|
||||
*/
|
||||
|
||||
@ -180,10 +181,6 @@ static BOOLEAN find_type(SLONG, WIN *, PAG *, USHORT, USHORT, UCHAR **,
|
||||
#define CLASS 2
|
||||
#endif
|
||||
|
||||
#ifdef DELTA
|
||||
#define CLASS 2
|
||||
#endif
|
||||
|
||||
#ifdef DGUX
|
||||
#ifdef DG_X86
|
||||
#define CLASS 2
|
||||
|
||||
@ -19,6 +19,9 @@
|
||||
*
|
||||
* All Rights Reserved.
|
||||
* Contributor(s): ______________________________________.
|
||||
*
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
*
|
||||
*/
|
||||
|
||||
#include "firebird.h"
|
||||
@ -32,10 +35,6 @@
|
||||
#include "../jrd/perf_proto.h"
|
||||
#include "../jrd/gdsassert.h"
|
||||
|
||||
#ifdef DELTA
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
#ifdef NETWARE_386
|
||||
#define NO_TIMES
|
||||
#define TIMEZONE timezon
|
||||
|
||||
@ -20,7 +20,8 @@
|
||||
* All Rights Reserved.
|
||||
* Contributor(s): ______________________________________.
|
||||
*
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
*
|
||||
*/
|
||||
|
||||
@ -108,10 +109,6 @@
|
||||
#define SEMAPHORES 25
|
||||
#endif
|
||||
|
||||
#ifdef DELTA
|
||||
#define SEMAPHORES 25
|
||||
#endif
|
||||
|
||||
#ifdef ultrix
|
||||
#define SEMAPHORES 25
|
||||
#endif
|
||||
|
||||
@ -21,6 +21,7 @@
|
||||
* Contributor(s): ______________________________________.
|
||||
*
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "XENIX" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
*
|
||||
*/
|
||||
|
||||
@ -82,10 +83,6 @@ union semun {
|
||||
#define SEMAPHORES 25
|
||||
#endif
|
||||
|
||||
#ifdef DELTA
|
||||
#define SEMAPHORES 25
|
||||
#endif
|
||||
|
||||
#ifdef ultrix
|
||||
#define SEMAPHORES 25
|
||||
#endif
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
/*
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" and "MAC_CP" defines
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
*/
|
||||
|
||||
#ifndef AUTOCONFIG_H
|
||||
@ -67,7 +68,6 @@
|
||||
#undef sgi
|
||||
#undef mpexl
|
||||
#undef _CRAY
|
||||
#undef DELTA
|
||||
#undef M88K
|
||||
#undef UNIXWARE
|
||||
#undef NCR3000
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
/*
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" and "MAC_CP" defines
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" port (MAC/MAC_CP/MAC_AUX defines)
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
*/
|
||||
|
||||
#ifndef AUTOCONFIG_H
|
||||
@ -57,7 +58,6 @@
|
||||
#undef sgi
|
||||
#undef mpexl
|
||||
#undef _CRAY
|
||||
#undef DELTA
|
||||
#undef M88K
|
||||
#undef UNIXWARE
|
||||
#undef NCR3000
|
||||
|
||||
@ -21,6 +21,7 @@
|
||||
* Contributor(s): ______________________________________.
|
||||
*
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "XENIX" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
*
|
||||
*/
|
||||
|
||||
@ -77,13 +78,11 @@ static int file;
|
||||
#include <file.h>
|
||||
#else
|
||||
#include <sys/types.h>
|
||||
#ifndef DELTA
|
||||
#ifndef PC_PLATFORM
|
||||
#ifndef WIN_NT
|
||||
#include <sys/file.h>
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif /* VMS */
|
||||
|
||||
#ifndef O_RDWR
|
||||
|
||||
@ -22,6 +22,7 @@
|
||||
*
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "XENIX" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
*
|
||||
*/
|
||||
|
||||
@ -64,10 +65,6 @@
|
||||
#define ARCHITECTURE arch_imp
|
||||
#endif
|
||||
|
||||
#ifdef DELTA
|
||||
#define ARCHITECTURE arch_delta
|
||||
#endif
|
||||
|
||||
#ifdef M88K
|
||||
#define ARCHITECTURE arch_m88k
|
||||
#endif
|
||||
|
||||
@ -19,6 +19,9 @@
|
||||
*
|
||||
* All Rights Reserved.
|
||||
* Contributor(s): ______________________________________.
|
||||
*
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef REMOTE_XDR_H
|
||||
@ -61,10 +64,6 @@ typedef char * caddr_t;
|
||||
#define enum_t enum xdr_op
|
||||
#endif
|
||||
|
||||
#ifdef DELTA
|
||||
#define u_int uint
|
||||
#endif
|
||||
|
||||
#define xdr_getpostn(xdr) ((*(*xdr).x_ops->x_getpostn)(xdr))
|
||||
#define xdr_destroy(xdr) (*(*xdr).x_ops->x_destroy)()
|
||||
|
||||
@ -114,4 +113,3 @@ struct xdr_discrim
|
||||
|
||||
|
||||
#endif /* REMOTE_XDR_H */
|
||||
|
||||
|
||||
@ -19,6 +19,9 @@
|
||||
*
|
||||
* All Rights Reserved.
|
||||
* Contributor(s): ______________________________________.
|
||||
*
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _WAL_WAL_H_
|
||||
@ -31,15 +34,12 @@
|
||||
#define FCNTL_INCLUDED
|
||||
#endif
|
||||
#endif
|
||||
#ifdef DELTA
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
#ifdef IMP
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
#include "../jrd/common.h"
|
||||
#include "../jrd/misc.h"
|
||||
#include "../jrd/isc.h"
|
||||
#include "../jrd/misc.h"
|
||||
#include "../jrd/isc.h"
|
||||
|
||||
#ifdef WIN_NT
|
||||
#define SYS_ERR gds_arg_win32
|
||||
@ -90,7 +90,7 @@
|
||||
#define MIN_LOG_LENGTH 100
|
||||
|
||||
/* WAL record header */
|
||||
/* the walrec_offset field is useful for easy traversal at
|
||||
/* the walrec_offset field is useful for easy traversal at
|
||||
block level given a record offset. */
|
||||
|
||||
typedef struct walrec_header {
|
||||
@ -191,12 +191,12 @@ typedef struct wals {
|
||||
SLONG wals_cur_ckpt_intrvl; /* How many bytes written so far since the last checkpoint */
|
||||
SLONG wals_ckpted_log_seqno; /* Sequence no of the log file which has the last checkpoint record */
|
||||
SLONG wals_ckpt_log_p_offset; /* Where in the logname, this log file logically starts. */
|
||||
SLONG wals_ckpted_offset; /* Byte offset (in the log) of the last checkpoint */
|
||||
SLONG wals_saved_ckpted_offset;/* Saving place of byte offset (in the log) of the last checkpoint */
|
||||
SLONG wals_ckpted_offset; /* Byte offset (in the log) of the last checkpoint */
|
||||
SLONG wals_saved_ckpted_offset;/* Saving place of byte offset (in the log) of the last checkpoint */
|
||||
|
||||
SLONG wals_prev_ckpted_log_seqno;/* Sequence no of the log file which has the previous checkpoint record */
|
||||
SLONG wals_prev_ckpt_log_p_offset;/* Where in the logname, this log file logically starts. */
|
||||
SLONG wals_prev_ckpted_offset;/* Byte offset (in the log) of the previous checkpoint */
|
||||
SLONG wals_prev_ckpted_offset;/* Byte offset (in the log) of the previous checkpoint */
|
||||
int wals_buf_waiters; /* Number of processes currently waiting for an empty buffer or a flush */
|
||||
int wals_buf_waiting_count; /* Num of times any process had to wait for an empty buffer after the last expansion of buffer blocks. */
|
||||
SLONG wals_buf_offset; /* Offset in log file of the last byte put in log buffer */
|
||||
|
||||
@ -19,6 +19,9 @@
|
||||
*
|
||||
* All Rights Reserved.
|
||||
* Contributor(s): ______________________________________.
|
||||
*
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
*
|
||||
*/
|
||||
|
||||
#include "firebird.h"
|
||||
@ -72,9 +75,6 @@
|
||||
#ifdef IMP
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#ifdef DELTA
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#ifdef sparc
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
@ -192,7 +192,7 @@ int CLIB_ROUTINE walw_classic_main( int argc, char **argv)
|
||||
**************************************
|
||||
*
|
||||
* Functional description
|
||||
* WAL_writer is used only in the privileged WAL writer
|
||||
* WAL_writer is used only in the privileged WAL writer
|
||||
* process. One WAL writer process is started per database.
|
||||
*
|
||||
**************************************/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user