/*
* Copyright 2000, International Business Machines Corporation and others.
* All Rights Reserved.
- *
+ *
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
#include <afsconfig.h>
#include <afs/param.h>
-RCSID
- ("$Header$");
#include <stdio.h>
#include <stdlib.h>
#include <afs/procmgmt.h> /* signal(), kill(), wait(), etc. */
#include <sys/stat.h>
#include <fcntl.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
#ifdef AFS_NT40_ENV
#include <io.h>
#include <windows.h>
#include <afs/acl.h>
#include <afs/prs_fs.h>
#include <rx/rx.h>
+#include <rx/rxstat.h>
#include <afs/keys.h>
#include <afs/afs_args.h>
#include <afs/vlserver.h>
#include <afs/ptuser.h>
#include <afs/audit.h>
#include <afs/partition.h>
+#include <afs/dir.h>
#ifndef AFS_NT40_ENV
#include <afs/netutils.h>
#endif
#include "viced.h"
#include "host.h"
#ifdef AFS_PTHREAD_ENV
-#include "softsig.h"
+#include <afs/softsig.h>
#endif
#if defined(AFS_SGI_ENV)
#include "sys/schedctl.h"
#define afs_fopen fopen
#endif /* !O_LARGEFILE */
-extern int BreakVolumeCallBacks(), InitCallBack();
-extern int BreakVolumeCallBacks(), InitCallBack(), BreakLaterCallBacks();
-extern int BreakVolumeCallBacksLater();
-extern int LogLevel, etext;
-extern afs_int32 BlocksSpare, PctSpare;
-
-int ShutDown(void);
-static void ClearXStatValues(), NewParms(), PrintCounters();
-static void ResetCheckDescriptors(void), ResetCheckSignal(void);
-static int CheckSignal(void);
-extern int GetKeysFromToken();
-extern int RXAFS_ExecuteRequest();
-extern int RXSTATS_ExecuteRequest();
-afs_int32 Do_VLRegisterRPC();
+extern int etext;
+
+void *ShutDown(void *);
+static void ClearXStatValues(void);
+static void NewParms(int);
+static void PrintCounters(void);
+static void ResetCheckDescriptors(void);
+static void ResetCheckSignal(void);
+static void *CheckSignal(void *);
+
+static afs_int32 Do_VLRegisterRPC(void);
int eventlog = 0, rxlog = 0;
FILE *debugFile;
-FILE *console = NULL;
#ifdef AFS_PTHREAD_ENV
pthread_mutex_t fsync_glock_mutex;
#endif /* AFS_PTHREAD_ENV */
#ifdef AFS_NT40_ENV
-#define AFS_QUIETFS_ENV 1
-#define NT_OPEN_MAX 1024 /* This is an arbitrary no. we came up with for
+#define NT_OPEN_MAX 1024 /* This is an arbitrary no. we came up with for
* now. We hope this will be replaced by a more
* intelligent estimate later. */
#endif
int SawPctSpare;
int debuglevel = 0;
int printBanner = 0;
-int rxJumbograms = 1; /* default is to send and receive jumbograms. */
+int rxJumbograms = 0; /* default is to not send and receive jumbograms. */
int rxBind = 0; /* don't bind */
+int rxkadDisableDotCheck = 0; /* disable check for dot in principal name */
int rxMaxMTU = -1;
-afs_int32 implicitAdminRights = PRSFS_LOOKUP; /* The ADMINISTER right is
+afs_int32 implicitAdminRights = PRSFS_LOOKUP; /* The ADMINISTER right is
* already implied */
afs_int32 readonlyServer = 0;
#endif
time_t StartTime;
+/**
+ * seconds to wait until forcing a panic during ShutDownAndCore(PANIC)
+ * in case we get stuck.
+ */
+#ifdef AFS_DEMAND_ATTACH_FS
+static int panic_timeout = 2 * 60;
+#else
+static int panic_timeout = 30 * 60;
+#endif
+
int rxpackets = 150; /* 100 */
int nSmallVns = 400; /* 200 */
int large = 400; /* 200 */
int udpBufSize = 0; /* UDP buffer size for receive */
int sendBufSize = 16384; /* send buffer size */
int saneacls = 0; /* Sane ACLs Flag */
+static int unsafe_attach = 0; /* avoid inUse check on vol attach? */
struct timeval tp;
/* All addresses in FS_HostAddrs are in NBO */
afsUUID FS_HostUUID;
-static void FlagMsg();
+static void FlagMsg(void);
#ifdef AFS_DEMAND_ATTACH_FS
/*
#define PTHREAD_RWLOCK_INITIALIZER {0x2DA8B3B4, {0}}
#endif
-struct fs_state fs_state =
- { FS_MODE_NORMAL,
- 0,
- 0,
- 0,
+#ifndef AFS_NT40_ENV
+struct fs_state fs_state =
+ { FS_MODE_NORMAL,
+ 0,
+ 0,
+ 0,
0,
{ 1,1,1,1 },
PTHREAD_COND_INITIALIZER,
PTHREAD_RWLOCK_INITIALIZER
};
+#else /* AFS_NT40_ENV */
+struct fs_state fs_state;
+
+static int fs_stateInit(void)
+{
+ fs_state.mode = FS_MODE_NORMAL;
+ fs_state.FiveMinuteLWP_tranquil = 0;
+ fs_state.HostCheckLWP_tranquil = 0;
+ fs_state.FsyncCheckLWP_tranquil = 0;
+ fs_state.salvsync_fatal_error = 0;
+
+ fs_state.options.fs_state_save = 1;
+ fs_state.options.fs_state_restore = 1;
+ fs_state.options.fs_state_verify_before_save = 1;
+ fs_state.options.fs_state_verify_after_restore = 1;
+
+ assert(pthread_cond_init(&fs_state.worker_done_cv, NULL) == 0);
+ assert(pthread_rwlock_init(&fs_state.state_lock, NULL) == 0);
+}
+#endif /* AFS_NT40_ENV */
#endif /* AFS_DEMAND_ATTACH_FS */
/*
*/
/* DEBUG HACK */
-static int
-CheckDescriptors()
+static void *
+CheckDescriptors(void *unused)
{
#ifndef AFS_NT40_ENV
struct afs_stat status;
- register int tsize = getdtablesize();
- register int i;
+ int tsize = getdtablesize();
+ int i;
for (i = 0; i < tsize; i++) {
if (afs_fstat(i, &status) != -1) {
printf("%d: dev %x, inode %u, length %u, type/mode %x\n", i,
- status.st_dev, status.st_ino, status.st_size,
+ (unsigned int) status.st_dev,
+ (unsigned int) status.st_ino,
+ (unsigned int) status.st_size,
status.st_mode);
}
}
fflush(stdout);
ResetCheckDescriptors();
- return 0;
#endif
+ return 0;
} /*CheckDescriptors */
#ifdef AFS_PTHREAD_ENV
void
-CheckSignal_Signal(x)
+CheckSignal_Signal(int x)
{
- CheckSignal();
+ CheckSignal(NULL);
}
void
-ShutDown_Signal(x)
+ShutDown_Signal(int x)
{
- ShutDown();
+ ShutDown(NULL);
}
void
-CheckDescriptors_Signal(x)
+CheckDescriptors_Signal(int x)
{
- CheckDescriptors();
+ CheckDescriptors(NULL);
}
#else /* AFS_PTHREAD_ENV */
void
-CheckSignal_Signal(x)
+CheckSignal_Signal(int x)
{
IOMGR_SoftSig(CheckSignal, 0);
}
void
-ShutDown_Signal(x)
+ShutDown_Signal(int x)
{
IOMGR_SoftSig(ShutDown, 0);
}
void
-CheckDescriptors_Signal(x)
+CheckDescriptors_Signal(int x)
{
IOMGR_SoftSig(CheckDescriptors, 0);
}
}
#if defined(AFS_PTHREAD_ENV)
-char *
+int
threadNum(void)
{
- return pthread_getspecific(rx_thread_id_key);
+ return (intptr_t)pthread_getspecific(rx_thread_id_key);
}
#endif
-/* proc called by rxkad module to get a key */
-static int
-get_key(char *arock, register afs_int32 akvno, char *akey)
-{
- /* find the key */
- static struct afsconf_key tkey;
- register afs_int32 code;
-
- if (!confDir) {
- ViceLog(0, ("conf dir not open\n"));
- return 1;
- }
- code = afsconf_GetKey(confDir, akvno, tkey.key);
- if (code) {
- ViceLog(0, ("afsconf_GetKey failure: kvno %d code %d\n", akvno, code));
- return code;
- }
- memcpy(akey, tkey.key, sizeof(tkey.key));
- return 0;
-
-} /*get_key */
-
#ifndef AFS_NT40_ENV
int
viced_syscall(afs_uint32 a3, afs_uint32 a4, void *a5)
{
afs_uint32 rcode;
- void (*old) ();
-
#ifndef AFS_LINUX20_ENV
- old = (void (*)())signal(SIGSYS, SIG_IGN);
+ void (*old) (int);
+
+ old = (void (*)(int))signal(SIGSYS, SIG_IGN);
#endif
rcode = syscall(AFS_SYSCALL, 28 /* AFSCALL_CALL */ , a3, a4, a5);
#ifndef AFS_LINUX20_ENV
char adminName[MAXADMINNAME];
static void
-CheckAdminName()
+CheckAdminName(void)
{
int fd = 0;
struct afs_stat status;
{
#if defined(AFS_PTHREAD_ENV) && !defined(AFS_NT40_ENV)
/* set our 'thread-id' so that the host hold table works */
- MUTEX_ENTER(&rx_stats_mutex); /* protects rxi_pthread_hinum */
- ++rxi_pthread_hinum;
- pthread_setspecific(rx_thread_id_key, (void *)rxi_pthread_hinum);
- MUTEX_EXIT(&rx_stats_mutex);
+ pthread_setspecific(rx_thread_id_key,
+ (void *)(intptr_t)rx_NewThreadId());
ViceLog(0,
- ("Set thread id %d for '%s'\n",
+ ("Set thread id %p for '%s'\n",
pthread_getspecific(rx_thread_id_key), s));
#endif
}
/* This LWP does things roughly every 5 minutes */
-static void
-FiveMinuteCheckLWP()
+static void *
+FiveMinuteCheckLWP(void *unused)
{
static int msg = 0;
char tbuffer[32];
#endif
if (printBanner && (++msg & 1)) { /* Every 10 minutes */
time_t now = FT_ApproxTime();
- if (console != NULL) {
-#ifndef AFS_QUIETFS_ENV
- fprintf(console, "File server is running at %s\r",
- afs_ctime(&now, tbuffer, sizeof(tbuffer)));
-#endif /* AFS_QUIETFS_ENV */
- ViceLog(2,
- ("File server is running at %s\n",
- afs_ctime(&now, tbuffer, sizeof(tbuffer))));
- }
+ ViceLog(2,
+ ("File server is running at %s\n",
+ afs_ctime(&now, tbuffer, sizeof(tbuffer))));
}
#ifdef AFS_DEMAND_ATTACH_FS
FS_STATE_WRLOCK;
FS_UNLOCK;
FS_STATE_UNLOCK;
#endif
+ return NULL;
} /*FiveMinuteCheckLWP */
* it probes the workstations
*/
-static void
-HostCheckLWP()
+static void *
+HostCheckLWP(void *unused)
{
ViceLog(1, ("Starting Host check process\n"));
setThreadId("HostCheckLWP");
FS_UNLOCK;
FS_STATE_UNLOCK;
#endif
+ return NULL;
} /*HostCheckLWP */
/* This LWP does fsync checks every 5 minutes: it should not be used for
* other 5 minute activities because it may be delayed by timeouts when
* it probes the workstations
*/
-static void
-FsyncCheckLWP()
+static void *
+FsyncCheckLWP(void *unused)
{
afs_int32 code;
#ifdef AFS_PTHREAD_ENV
setThreadId("FsyncCheckLWP");
-#ifdef AFS_PTHREAD_ENV
- assert(pthread_cond_init(&fsync_cond, NULL) == 0);
- assert(pthread_mutex_init(&fsync_glock_mutex, NULL) == 0);
-#endif
-
#ifdef AFS_DEMAND_ATTACH_FS
FS_STATE_WRLOCK;
while (fs_state.mode == FS_MODE_NORMAL) {
FS_UNLOCK;
FS_STATE_UNLOCK;
#endif /* AFS_DEMAND_ATTACH_FS */
+ return NULL;
}
/*------------------------------------------------------------------------
*------------------------------------------------------------------------*/
static void
-ClearXStatValues()
+ClearXStatValues(void)
{ /*ClearXStatValues */
struct fs_stats_opTimingData *opTimeP; /*Ptr to timing struct */
/*
* Zero all xstat-related structures.
*/
- memset((char *)(&afs_perfstats), 0, sizeof(struct afs_PerfStats));
+ memset((&afs_perfstats), 0, sizeof(struct afs_PerfStats));
#if FS_STATS_DETAILED
- memset((char *)(&afs_FullPerfStats), 0,
+ memset((&afs_FullPerfStats), 0,
sizeof(struct fs_stats_FullPerfStats));
/*
} /*ClearXStatValues */
+int CopyOnWrite_calls = 0, CopyOnWrite_off0 = 0, CopyOnWrite_size0 = 0;
+afs_fsize_t CopyOnWrite_maxsize = 0;
static void
-PrintCounters()
+PrintCounters(void)
{
int dirbuff, dircall, dirio;
struct timeval tpl;
int workstations, activeworkstations, delworkstations;
int processSize = 0;
char tbuffer[32];
+#ifdef AFS_DEMAND_ATTACH_FS
+ int stats_flags = 0;
+#endif
- TM_GetTimeOfDay(&tpl, 0);
+ FT_GetTimeOfDay(&tpl, 0);
Statistics = 1;
ViceLog(0,
("Vice was last started at %s\n",
afs_ctime(&StartTime, tbuffer, sizeof(tbuffer))));
#ifdef AFS_DEMAND_ATTACH_FS
- /* XXX perhaps set extended stats verbosity flags
- * based upon LogLevel ?? */
- VPrintExtendedCacheStats(VOL_STATS_PER_CHAIN2);
+ if (LogLevel >= 125) {
+ stats_flags = VOL_STATS_PER_CHAIN2;
+ } else if (LogLevel >= 25) {
+ stats_flags = VOL_STATS_PER_CHAIN;
+ }
+ VPrintExtendedCacheStats(stats_flags);
#endif
VPrintCacheStats();
VPrintDiskStats();
("With %d directory buffers; %d reads resulted in %d read I/Os\n",
dirbuff, dircall, dirio));
rx_PrintStats(stderr);
+ audit_PrintStats(stderr);
h_PrintStats();
PrintCallBackStats();
#ifdef AFS_NT40_ENV
ViceLog(0,
("There are %d workstations, %d are active (req in < 15 mins), %d marked \"down\"\n",
workstations, activeworkstations, delworkstations));
+ ViceLog(0, ("CopyOnWrite: calls %d off0 %d size0 %d maxsize 0x%llx\n",
+ CopyOnWrite_calls, CopyOnWrite_off0, CopyOnWrite_size0, CopyOnWrite_maxsize));
+
Statistics = 0;
} /*PrintCounters */
-static int
-CheckSignal()
+static void *
+CheckSignal(void *unused)
{
if (FS_registered > 0) {
/*
return 0;
} /*CheckSignal */
+static void *
+ShutdownWatchdogLWP(void *unused)
+{
+ sleep(panic_timeout);
+ ViceLog(0, ("ShutdownWatchdogLWP: Failed to shutdown and panic "
+ "within %d seconds; forcing panic\n", panic_timeout));
+ assert(0);
+ return NULL;
+}
+
void
ShutDownAndCore(int dopanic)
{
time_t now = time(0);
char tbuffer[32];
+ if (dopanic) {
+#ifdef AFS_PTHREAD_ENV
+ pthread_t watchdogPid;
+ pthread_attr_t tattr;
+ assert(pthread_attr_init(&tattr) == 0);
+ assert(pthread_create(&watchdogPid, &tattr, ShutdownWatchdogLWP, NULL) == 0);
+#else
+ PROCESS watchdogPid;
+ assert(LWP_CreateProcess
+ (ShutdownWatchdogLWP, stack * 1024, LWP_MAX_PRIORITY - 2,
+ NULL, "ShutdownWatchdog", &watchdogPid) == LWP_SUCCESS);
+#endif
+ }
+
/* do not allows new reqests to be served from now on, all new requests
* are returned with an error code of RX_RESTARTING ( transient failure ) */
rx_SetRxTranquil(); /* dhruba */
+ VSetTranquil();
+
#ifdef AFS_DEMAND_ATTACH_FS
FS_STATE_WRLOCK;
+ if (fs_state.mode == FS_MODE_SHUTDOWN) {
+ /* it is possible for at least fs_stateSave() (called below) to call
+ * ShutDownAndCore if there's host list corruption; prevent
+ * deinitializing some stuff twice */
+ ViceLog(0, ("ShutDownAndCore called during shutdown? Skipping volume "
+ "and host package shutdown\n"));
+ FS_STATE_UNLOCK;
+ goto done_vol_host;
+ }
fs_state.mode = FS_MODE_SHUTDOWN;
FS_STATE_UNLOCK;
#endif
afs_ctime(&now, tbuffer, sizeof(tbuffer))));
if (dopanic)
ViceLog(0, ("ABNORMAL SHUTDOWN, see core file.\n"));
-#ifndef AFS_QUIETFS_ENV
- if (console != NULL) {
- fprintf(console, "File server restart/shutdown received at %s\r",
- afs_ctime(&now, tbuffer, sizeof(tbuffer)));
- }
-#endif
DFlush();
if (!dopanic)
PrintCounters();
#ifdef AFS_DEMAND_ATTACH_FS
if (fs_state.options.fs_state_save) {
- /*
+ /*
* demand attach fs
* save fileserver state to disk */
- /* make sure background threads have finished all of their asynchronous
- * work on host and callback structures */
- FS_STATE_RDLOCK;
- while (!fs_state.FiveMinuteLWP_tranquil ||
- !fs_state.HostCheckLWP_tranquil ||
- !fs_state.FsyncCheckLWP_tranquil) {
- FS_LOCK;
- FS_STATE_UNLOCK;
- ViceLog(0, ("waiting for background host/callback threads to quiesce before saving fileserver state...\n"));
- assert(pthread_cond_wait(&fs_state.worker_done_cv, &fileproc_glock_mutex) == 0);
- FS_UNLOCK;
+ if (dopanic) {
+ ViceLog(0, ("Not saving fileserver state; abnormal shutdown\n"));
+
+ } else {
+ /* make sure background threads have finished all of their asynchronous
+ * work on host and callback structures */
FS_STATE_RDLOCK;
- }
+ while (!fs_state.FiveMinuteLWP_tranquil ||
+ !fs_state.HostCheckLWP_tranquil ||
+ !fs_state.FsyncCheckLWP_tranquil) {
+ FS_LOCK;
+ FS_STATE_UNLOCK;
+ ViceLog(0, ("waiting for background host/callback threads to quiesce before saving fileserver state...\n"));
+ assert(pthread_cond_wait(&fs_state.worker_done_cv, &fileproc_glock_mutex) == 0);
+ FS_UNLOCK;
+ FS_STATE_RDLOCK;
+ }
+ FS_STATE_UNLOCK;
- /* ok. it should now be fairly safe. let's do the state dump */
- fs_stateSave();
+ /* ok. it should now be fairly safe. let's do the state dump */
+ fs_stateSave();
+ }
}
+ done_vol_host:
+
#endif /* AFS_DEMAND_ATTACH_FS */
if (debugFile) {
rx_PrintStats(debugFile);
fflush(debugFile);
}
- if (console != NULL) {
- now = time(0);
- if (dopanic) {
-#ifndef AFS_QUIETFS_ENV
- fprintf(console, "File server has terminated abnormally at %s\r",
- afs_ctime(&now, tbuffer, sizeof(tbuffer)));
-#endif
- ViceLog(0,
- ("File server has terminated abnormally at %s\n",
- afs_ctime(&now, tbuffer, sizeof(tbuffer))));
- } else {
-#ifndef AFS_QUIETFS_ENV
- fprintf(console, "File server has terminated normally at %s\r",
- afs_ctime(&now, tbuffer, sizeof(tbuffer)));
-#endif
- ViceLog(0,
- ("File server has terminated normally at %s\n",
- afs_ctime(&now, tbuffer, sizeof(tbuffer))));
- }
+ now = time(0);
+ if (dopanic) {
+ ViceLog(0,
+ ("File server has terminated abnormally at %s\n",
+ afs_ctime(&now, tbuffer, sizeof(tbuffer))));
+ } else {
+ ViceLog(0,
+ ("File server has terminated normally at %s\n",
+ afs_ctime(&now, tbuffer, sizeof(tbuffer))));
}
+ if (dopanic)
+ assert(0);
+
exit(0);
}
-int
-ShutDown(void)
+void *
+ShutDown(void *unused)
{ /* backward compatibility */
ShutDownAndCore(DONTPANIC);
return 0;
static void
-FlagMsg()
+FlagMsg(void)
{
/* default supports help flag */
fputs("Usage: fileserver ", stdout);
fputs("[-auditlog <log path>] ", stdout);
+ fputs("[-audit-interface <file|sysvmq> (default is file)] ", stdout);
fputs("[-d <debug level>] ", stdout);
fputs("[-p <number of processes>] ", stdout);
fputs("[-spare <number of spare blocks>] ", stdout);
fputs("[-rxdbge (enable rxevent debugging)] ", stdout);
fputs("[-rxmaxmtu <bytes>] ", stdout);
fputs("[-rxbind (bind the Rx socket to one address)] ", stdout);
+ fputs("[-allow-dotted-principals (disable the rxkad principal name dot check)] ", stdout);
+ fputs("[-vhandle-setaside (fds reserved for non-cache io [default 128])] ", stdout);
+ fputs("[-vhandle-max-cachesize (max open files [default 128])] ", stdout);
+ fputs("[-vhandle-initial-cachesize (fds reserved for cache io [default 128])] ", stdout);
#ifdef AFS_DEMAND_ATTACH_FS
fputs("[-fs-state-dont-save (disable state save during shutdown)] ", stdout);
fputs("[-fs-state-dont-restore (disable state restore during startup)] ", stdout);
fputs("[-vlruthresh <minutes before unused volumes become eligible for soft detach> (default is 2 hours)] ", stdout);
fputs("[-vlruinterval <seconds between VLRU scans> (default is 2 minutes)] ", stdout);
fputs("[-vlrumax <max volumes to soft detach in one VLRU scan> (default is 8)] ", stdout);
+ fputs("[-unsafe-nosalvage (bypass volume inUse safety check on attach, bypassing salvage)] ", stdout);
#elif AFS_PTHREAD_ENV
fputs("[-vattachpar <number of volume attach threads> (default is 1)] ", stdout);
#endif
fputs("[-udpsize <size of socket buffer in bytes>] ", stdout);
fputs("[-sendsize <size of send buffer in bytes>] ", stdout);
fputs("[-abortthreshold <abort threshold>] ", stdout);
+ fputs("[-nojumbo (disable jumbogram network packets - deprecated)] ", stdout);
+ fputs("[-jumbo (enable jumbogram network packets)] ", stdout);
/* fputs("[-enable_peer_stats] ", stdout); */
/* fputs("[-enable_process_stats] ", stdout); */
fputs("[-help]\n", stdout);
return MAX_FILESERVER_THREAD;
}
+/* from ihandle.c */
+extern ih_init_params vol_io_params;
+
static int
ParseArgs(int argc, char *argv[])
{
int Sawbusy = 0;
int i;
int bufSize = 0; /* temp variable to read in udp socket buf size */
+ char *auditFileName = NULL;
for (i = 1; i < argc; i++) {
if (!strcmp(argv[i], "-d")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -d\n");
- return -1;
+ fprintf(stderr, "missing argument for -d\n");
+ return -1;
}
debuglevel = atoi(argv[++i]);
LogLevel = debuglevel;
printBanner = 1;
} else if (!strcmp(argv[i], "-implicit")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -implicit\n");
- return -1;
+ fprintf(stderr, "missing argument for -implicit\n");
+ return -1;
}
implicitAdminRights = ParseRights(argv[++i]);
if (implicitAdminRights < 0)
max_fileserver_thread() - FILESERVER_HELPER_THREADS;
Sawlwps = 1;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -p\n");
- return -1;
+ fprintf(stderr, "missing argument for -p\n");
+ return -1;
}
lwps = atoi(argv[++i]);
if (lwps > lwps_max)
} else if (!strcmp(argv[i], "-b")) {
Sawbufs = 1;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -b\n");
- return -1;
+ fprintf(stderr, "missing argument for -b\n");
+ return -1;
}
buffs = atoi(argv[++i]);
} else if (!strcmp(argv[i], "-l")) {
Sawlarge = 1;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -l\n");
- return -1;
+ fprintf(stderr, "missing argument for -l\n");
+ return -1;
}
large = atoi(argv[++i]);
} else if (!strcmp(argv[i], "-vc")) {
SawVC = 1;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -vc\n");
- return -1;
+ fprintf(stderr, "missing argument for -vc\n");
+ return -1;
}
volcache = atoi(argv[++i]);
} else if (!strcmp(argv[i], "-novbc")) {
} else if (!strcmp(argv[i], "-rxpck")) {
Sawrxpck = 1;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -rxpck\n");
- return -1;
+ fprintf(stderr, "missing argument for -rxpck\n");
+ return -1;
}
rxpackets = atoi(argv[++i]);
#ifdef AFS_PTHREAD_ENV
} else if (!strcmp(argv[i], "-vattachpar")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for %s\n", argv[i]);
- return -1;
+ fprintf(stderr, "missing argument for %s\n", argv[i]);
+ return -1;
}
vol_attach_threads = atoi(argv[++i]);
#endif /* AFS_PTHREAD_ENV */
+ } else if (!strcmp(argv[i], "-vhandle-setaside")) {
+ if ((i + 1) >= argc) {
+ fprintf(stderr, "missing argument for %s\n", argv[i]);
+ return -1;
+ }
+ vol_io_params.fd_handle_setaside = atoi(argv[++i]);
+ } else if (!strcmp(argv[i], "-vhandle-max-cachesize")) {
+ if ((i + 1) >= argc) {
+ fprintf(stderr, "missing argument for %s\n", argv[i]);
+ return -1;
+ }
+ vol_io_params.fd_max_cachesize = atoi(argv[++i]);
+ } else if (!strcmp(argv[i], "-vhandle-initial-cachesize")) {
+ if ((i + 1) >= argc) {
+ fprintf(stderr, "missing argument for %s\n", argv[i]);
+ return -1;
+ }
+ vol_io_params.fd_initial_cachesize = atoi(argv[++i]);
#ifdef AFS_DEMAND_ATTACH_FS
} else if (!strcmp(argv[i], "-fs-state-dont-save")) {
fs_state.options.fs_state_save = 0;
fs_state.options.fs_state_restore = 0;
} else if (!strcmp(argv[i], "-fs-state-verify")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for %s\n", argv[i]);
- return -1;
+ fprintf(stderr, "missing argument for %s\n", argv[i]);
+ return -1;
}
i++;
if (!strcmp(argv[i], "none")) {
return -1;
}
} else if (!strcmp(argv[i], "-vhashsize")) {
+ int hashsize;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for %s\n", argv[i]);
- return -1;
+ fprintf(stderr, "missing argument for %s\n", argv[i]);
+ return -1;
+ }
+ hashsize = atoi(argv[++i]);
+ if (VSetVolHashSize(hashsize)) {
+ fprintf(stderr, "specified -vhashsize (%s) is invalid or out "
+ "of range\n", argv[i]);
+ return -1;
}
- VSetVolHashSize(atoi(argv[++i]));
} else if (!strcmp(argv[i], "-vlrudisable")) {
VLRU_SetOptions(VLRU_SET_ENABLED, 0);
} else if (!strcmp(argv[i], "-vlruthresh")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for %s\n", argv[i]);
- return -1;
+ fprintf(stderr, "missing argument for %s\n", argv[i]);
+ return -1;
}
VLRU_SetOptions(VLRU_SET_THRESH, 60*atoi(argv[++i]));
} else if (!strcmp(argv[i], "-vlruinterval")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for %s\n", argv[i]);
- return -1;
+ fprintf(stderr, "missing argument for %s\n", argv[i]);
+ return -1;
}
VLRU_SetOptions(VLRU_SET_INTERVAL, atoi(argv[++i]));
} else if (!strcmp(argv[i], "-vlrumax")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for %s\n", argv[i]);
- return -1;
+ fprintf(stderr, "missing argument for %s\n", argv[i]);
+ return -1;
}
VLRU_SetOptions(VLRU_SET_MAX, atoi(argv[++i]));
+ } else if (!strcmp(argv[i], "-unsafe-nosalvage")) {
+ unsafe_attach = 1;
#endif /* AFS_DEMAND_ATTACH_FS */
} else if (!strcmp(argv[i], "-s")) {
Sawsmall = 1;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -s\n");
- return -1;
+ fprintf(stderr, "missing argument for -s\n");
+ return -1;
}
nSmallVns = atoi(argv[++i]);
} else if (!strcmp(argv[i], "-abortthreshold")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -abortthreshold\n");
- return -1;
+ fprintf(stderr, "missing argument for -abortthreshold\n");
+ return -1;
}
abort_threshold = atoi(argv[++i]);
} else if (!strcmp(argv[i], "-k")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -k\n");
- return -1;
+ fprintf(stderr, "missing argument for -k\n");
+ return -1;
}
stack = atoi(argv[++i]);
}
#endif
else if (!strcmp(argv[i], "-spare")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -spare\n");
- return -1;
+ fprintf(stderr, "missing argument for -spare\n");
+ return -1;
}
BlocksSpare = atoi(argv[++i]);
SawSpare = 1;
} else if (!strcmp(argv[i], "-pctspare")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -pctspare\n");
- return -1;
+ fprintf(stderr, "missing argument for -pctspare\n");
+ return -1;
}
PctSpare = atoi(argv[++i]);
BlocksSpare = 0; /* has non-zero default */
SawPctSpare = 1;
} else if (!strcmp(argv[i], "-w")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -w\n");
- return -1;
+ fprintf(stderr, "missing argument for -w\n");
+ return -1;
}
fiveminutes = atoi(argv[++i]);
} else if (!strcmp(argv[i], "-hr")) {
int hr;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -hr\n");
- return -1;
+ fprintf(stderr, "missing argument for -hr\n");
+ return -1;
}
hr = atoi(argv[++i]);
if ((hr < 1) || (hr > 36)) {
else if (!strcmp(argv[i], "-cb")) {
Sawcbs = 1;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -cb\n");
- return -1;
+ fprintf(stderr, "missing argument for -cb\n");
+ return -1;
}
numberofcbs = atoi(argv[++i]);
if ((numberofcbs < 10000) || (numberofcbs > 2147483647)) {
} else if (!strcmp(argv[i], "-busyat")) {
Sawbusy = 1;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -busyat\n");
- return -1;
+ fprintf(stderr, "missing argument for -busyat\n");
+ return -1;
}
busy_threshold = atoi(argv[++i]);
if (busy_threshold < 10) {
else if (!strcmp(argv[i], "-m")) {
extern int aixlow_water;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -m\n");
- return -1;
+ fprintf(stderr, "missing argument for -m\n");
+ return -1;
}
aixlow_water = atoi(argv[++i]);
if ((aixlow_water < 0) || (aixlow_water > 30)) {
#endif
else if (!strcmp(argv[i], "-nojumbo")) {
rxJumbograms = 0;
+ } else if (!strcmp(argv[i], "-jumbo")) {
+ rxJumbograms = 1;
} else if (!strcmp(argv[i], "-rxbind")) {
rxBind = 1;
+ } else if (!strcmp(argv[i], "-allow-dotted-principals")) {
+ rxkadDisableDotCheck = 1;
} else if (!strcmp(argv[i], "-rxmaxmtu")) {
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -rxmaxmtu\n");
- return -1;
+ fprintf(stderr, "missing argument for -rxmaxmtu\n");
+ return -1;
}
rxMaxMTU = atoi(argv[++i]);
- if ((rxMaxMTU < RX_MIN_PACKET_SIZE) ||
+ if ((rxMaxMTU < RX_MIN_PACKET_SIZE) ||
(rxMaxMTU > RX_MAX_PACKET_DATA_SIZE)) {
- printf("rxMaxMTU %d%% invalid; must be between %d-%d\n",
- rxMaxMTU, RX_MIN_PACKET_SIZE,
+ printf("rxMaxMTU %d%% invalid; must be between %d-%" AFS_SIZET_FMT "\n",
+ rxMaxMTU, RX_MIN_PACKET_SIZE,
RX_MAX_PACKET_DATA_SIZE);
return -1;
- }
+ }
} else if (!strcmp(argv[i], "-realm")) {
extern char local_realms[AFS_NUM_LREALMS][AFS_REALM_SZ];
extern int num_lrealms;
if ((i + 1) >= argc) {
- fprintf(stderr, "missing argument for -realm\n");
- return -1;
+ fprintf(stderr, "missing argument for -realm\n");
+ return -1;
}
if (strlen(argv[++i]) >= AFS_REALM_SZ) {
printf
AFS_REALM_SZ);
return -1;
}
- if (num_lrealms == -1)
+ if (num_lrealms == -1)
num_lrealms = 0;
if (num_lrealms >= AFS_NUM_LREALMS) {
printf
rx_enableProcessRPCStats();
}
else if (strcmp(argv[i], "-auditlog") == 0) {
- int tempfd, flags;
- FILE *auditout;
- char oldName[MAXPATHLEN];
- char *fileName = argv[++i];
-
-#ifndef AFS_NT40_ENV
- struct stat statbuf;
-
- if ((lstat(fileName, &statbuf) == 0)
- && (S_ISFIFO(statbuf.st_mode))) {
- flags = O_WRONLY | O_NONBLOCK;
- } else
-#endif
- {
- strcpy(oldName, fileName);
- strcat(oldName, ".old");
- renamefile(fileName, oldName);
- flags = O_WRONLY | O_TRUNC | O_CREAT;
+ auditFileName = argv[++i];
+ }
+ else if (strcmp(argv[i], "-audit-interface") == 0) {
+ char *interface = argv[++i];
+
+ if (osi_audit_interface(interface)) {
+ printf("Invalid audit interface '%s'\n", interface);
+ return -1;
}
- tempfd = open(fileName, flags, 0666);
- if (tempfd > -1) {
- auditout = fdopen(tempfd, "a");
- if (auditout) {
- osi_audit_file(auditout);
- } else
- printf("Warning: auditlog %s not writable, ignored.\n", fileName);
- } else
- printf("Warning: auditlog %s not writable, ignored.\n", fileName);
}
#ifndef AFS_NT40_ENV
else if (strcmp(argv[i], "-syslog") == 0) {
else if (strcmp(argv[i], "-mrafslogs") == 0) {
/* set syslog logging flag */
mrafsStyleLogs = 1;
- }
+ }
else if (strcmp(argv[i], "-saneacls") == 0) {
saneacls = 1;
}
if (!Sawcbs)
numberofcbs = 64000;
if (!Sawlwps)
- lwps = 12;
+ lwps = 128;
if (!Sawbufs)
buffs = 120;
if (!SawVC)
}
if (!Sawbusy)
busy_threshold = 3 * rxpackets / 2;
+ if (auditFileName)
+ osi_audit_file(auditFileName);
return (0);
NewParms(int initializing)
{
static struct afs_stat sbuf;
- register int i, fd;
+ int i, fd;
char *parms;
char *argv[MAXPARMS];
- register int argc;
+ int argc;
if (!(afs_stat("/vice/file/parms", &sbuf))) {
parms = (char *)malloc(sbuf.st_size);
ViceLog(0, ("Read on parms failed with errno = %d\n", errno));
} else {
ViceLog(0,
- ("Read on parms failed; expected %d bytes but read %d\n",
- sbuf.st_size, i));
+ ("Read on parms failed; expected %ld bytes but read %d\n",
+ (long) sbuf.st_size, i));
}
free(parms);
return;
afs_int32
-InitPR()
+InitPR(void)
{
int code;
afs_int32
vl_Initialize(const char *confDir)
{
- afs_int32 code, scIndex = 0, i;
+ afs_int32 code, i;
+ afs_int32 scIndex = RX_SECIDX_NULL;
struct afsconf_dir *tdir;
struct rx_securityClass *sc;
struct afsconf_cell info;
#define SYSIDVERSION 1
afs_int32
-ReadSysIdFile()
+ReadSysIdFile(void)
{
afs_int32 fd, nentries, i;
struct versionStamp vsn;
}
afs_int32
-WriteSysIdFile()
+WriteSysIdFile(void)
{
afs_int32 fd, i;
struct versionStamp vsn;
}
/*
- * defect 10966
+ * defect 10966
* This routine sets up the buffers for the VL_RegisterAddrs RPC. All addresses
* in FS_HostAddrs[] are in NBO, while the RPC treats them as a "blob" of data
- * and so we need to convert each of them into HBO which is what the extra
+ * and so we need to convert each of them into HBO which is what the extra
* array called FS_HostAddrs_HBO is used here.
*/
-afs_int32
-Do_VLRegisterRPC()
+static afs_int32
+Do_VLRegisterRPC(void)
{
- register int code;
+ int code;
bulkaddrs addrs;
- extern int VL_RegisterAddrs();
afs_uint32 FS_HostAddrs_HBO[ADDRSPERSITE];
int i = 0;
ViceLog(0,
("VL_RegisterAddrs rpc failed; will retry periodically (code=%d, err=%d)\n",
code, errno));
+ FS_registered = 1; /* Retry in the gc daemon */
}
} else {
FS_registered = 2; /* So we don't have to retry in the gc daemon */
}
afs_int32
-SetupVL()
+SetupVL(void)
{
afs_int32 code;
- extern int rxi_numNetAddrs;
- extern afs_uint32 rxi_NetAddrs[];
-#ifndef AFS_NT40_ENV
if (AFSDIR_SERVER_NETRESTRICT_FILEPATH || AFSDIR_SERVER_NETINFO_FILEPATH) {
/*
- * Find addresses we are supposed to register as per the netrestrict
- * and netinfo files (/usr/afs/local/NetInfo and
+ * Find addresses we are supposed to register as per the netrestrict
+ * and netinfo files (/usr/afs/local/NetInfo and
* /usr/afs/local/NetRestict)
*/
char reason[1024];
}
FS_HostAddr_cnt = (afs_uint32) code;
} else
-#endif
{
FS_HostAddr_cnt = rx_getAllAddr(FS_HostAddrs, ADDRSPERSITE);
}
if (FS_HostAddr_cnt == 1 && rxBind == 1)
code = FS_HostAddrs[0];
- else
+ else
code = htonl(INADDR_ANY);
return code;
}
afs_int32
-InitVL()
+InitVL(void)
{
afs_int32 code;
{
afs_int32 code;
char tbuffer[32];
- struct rx_securityClass *sc[4];
+ struct rx_securityClass **securityClasses;
+ afs_int32 numClasses;
struct rx_service *tservice;
#ifdef AFS_PTHREAD_ENV
pthread_t serverPid;
int curLimit;
time_t t;
afs_uint32 rx_bindhost;
+ VolumePackageOptions opts;
#ifdef AFS_AIX32_ENV
struct sigaction nsa;
argv[0]);
exit(2);
}
-#ifndef AFS_QUIETFS_ENV
- console = afs_fopen("/dev/console", "w");
-#endif
+ /* set ihandle package defaults prior to parsing args */
+ ih_PkgDefaults();
if (ParseArgs(argc, argv)) {
FlagMsg();
ViceLog(0, ("Both -spare and -pctspare specified, exiting.\n"));
exit(-1);
}
-#ifdef AFS_SGI_XFS_IOPS_ENV
- ViceLog(0, ("XFS/EFS File server starting\n"));
-#else
- ViceLog(0, ("File server starting\n"));
-#endif
+ LogCommandLine(argc, argv, "starting", "", "File server", FSLog);
#if defined(AFS_PTHREAD_ENV) && !defined(AFS_NT40_ENV)
/* initialize the pthread soft signal handler thread */
#endif
#endif
assert(DInit(buffs) == 0);
+#ifdef AFS_DEMAND_ATTACH_FS
+ FS_STATE_INIT;
+#endif
#ifdef AFS_NT40_ENV
if (afs_winsockInit() < 0) {
#endif
CheckAdminName();
- /* if we support more than 16 threads, then we better have the ability
- ** to keep open a large number of files simultaneously
+ /* if we support more than 16 threads, then we better have the ability
+ ** to keep open a large number of files simultaneously
*/
#if defined(AFS_AIX_ENV) && !defined(AFS_AIX42_ENV)
curLimit = OPEN_MAX; /* for pre AIX 4.2 systems */
lwps = curLimit;
else if (lwps > 16)
lwps = 16; /* default to a maximum of 16 threads */
+
+ /* tune the ihandle fd cache accordingly */
+ if (vol_io_params.fd_max_cachesize < curLimit)
+ vol_io_params.fd_max_cachesize = curLimit + 1;
+
ViceLog(0,
- ("The system supports a max of %d open files and we are starting %d threads\n",
- curLimit, lwps));
+ ("The system supports a max of %d open files and we are starting %d threads (ihandle fd cache is %d)\n",
+ curLimit, lwps, vol_io_params.fd_max_cachesize));
}
#ifndef AFS_PTHREAD_ENV
assert(LWP_InitializeProcessSupport(LWP_MAX_PRIORITY - 2, &parentPid) ==
rx_SetBusyThreshold(busy_threshold, VBUSY);
rx_SetCallAbortThreshold(abort_threshold);
rx_SetConnAbortThreshold(abort_threshold);
+#ifdef AFS_XBSD_ENV
+ stackSize = 128 * 1024;
+#else
stackSize = lwps * 4000;
if (stackSize < 32000)
stackSize = 32000;
else if (stackSize > 44000)
stackSize = 44000;
-#if defined(AFS_HPUX_ENV) || defined(AFS_SUN_ENV) || defined(AFS_SGI51_ENV)
+#endif
+#if defined(AFS_HPUX_ENV) || defined(AFS_SUN_ENV) || defined(AFS_SGI51_ENV) || defined(AFS_XBSD_ENV)
rx_SetStackSize(1, stackSize);
#endif
if (udpBufSize)
}
rx_GetIFInfo();
rx_SetRxDeadTime(30);
- sc[0] = rxnull_NewServerSecurityObject();
- sc[1] = 0; /* rxvab_NewServerSecurityObject(key1, 0) */
- sc[2] = rxkad_NewServerSecurityObject(rxkad_clear, NULL, get_key, NULL);
- sc[3] = rxkad_NewServerSecurityObject(rxkad_crypt, NULL, get_key, NULL);
- tservice = rx_NewServiceHost(rx_bindhost, /* port */ 0, /* service id */
+ afsconf_BuildServerSecurityObjects(confDir, AFSCONF_SEC_OBJS_RXKAD_CRYPT,
+ &securityClasses, &numClasses);
+
+ tservice = rx_NewServiceHost(rx_bindhost, /* port */ 0, /* service id */
1, /*service name */
"AFS",
- /* security classes */ sc,
- /* numb sec classes */
- 4, RXAFS_ExecuteRequest);
+ securityClasses, numClasses,
+ RXAFS_ExecuteRequest);
if (!tservice) {
ViceLog(0,
("Failed to initialize RX, probably two servers running.\n"));
exit(-1);
}
+ if (rxkadDisableDotCheck) {
+ rx_SetSecurityConfiguration(tservice, RXS_CONFIG_FLAGS,
+ (void *)RXS_CONFIG_FLAGS_DISABLE_DOTCHECK);
+ }
rx_SetMinProcs(tservice, 3);
rx_SetMaxProcs(tservice, lwps);
rx_SetCheckReach(tservice, 1);
+ rx_SetServerIdleDeadErr(tservice, VNOSERVICE);
tservice =
- rx_NewService(0, RX_STATS_SERVICE_ID, "rpcstats", sc, 4,
- RXSTATS_ExecuteRequest);
+ rx_NewService(0, RX_STATS_SERVICE_ID, "rpcstats", securityClasses,
+ numClasses, RXSTATS_ExecuteRequest);
if (!tservice) {
ViceLog(0, ("Failed to initialize rpc stat service.\n"));
exit(-1);
ClearXStatValues();
code = InitVL();
- if (code) {
+ if (code && code != VL_MULTIPADDR) {
ViceLog(0, ("Fatal error in library initialization, exiting!!\n"));
exit(1);
}
code = InitPR();
- if (code) {
+ if (code && code != -1) {
ViceLog(0, ("Fatal error in protection initialization, exiting!!\n"));
exit(1);
}
/* allow super users to manage RX statistics */
rx_SetRxStatUserOk(fs_rxstat_userok);
+#ifdef AFS_PTHREAD_ENV
+ assert(pthread_cond_init(&fsync_cond, NULL) == 0);
+ assert(pthread_mutex_init(&fsync_glock_mutex, NULL) == 0);
+#endif
+
#if !defined(AFS_DEMAND_ATTACH_FS)
- /*
+ /*
* For DAFS, we do not start the Rx server threads until after
* the volume package is initialized, and fileserver state is
* restored. This is necessary in order to keep host and callback
#endif
/* we ensure that there is enough space in the vnode buffer to satisfy
- ** requests from all concurrent threads.
+ ** requests from all concurrent threads.
** the maximum number of vnodes used by a single thread at any one time
** is three ( "link" uses three vnodes simultaneously, one vLarge and
** two vSmall for linking files and two vLarge and one vSmall for linking
- ** files ) : dhruba
+ ** files ) : dhruba
*/
minVnodesRequired = 2 * lwps + 1;
if (minVnodesRequired > nSmallVns) {
/* We now do this after getting the listener up and running, so that client
* connections don't timeout (maybe) if a file server is restarted, since it
- * will be available "real soon now". Worry about whether we can satisfy the
+ * will be available "real soon now". Worry about whether we can satisfy the
* calls in the volume package itself.
*/
- if (VInitVolumePackage(fileServer, large, nSmallVns, 0, volcache)) {
+ VOptDefaults(fileServer, &opts);
+ opts.nLargeVnodes = large;
+ opts.nSmallVnodes = nSmallVns;
+ opts.volcache = volcache;
+ opts.unsafe_attach = unsafe_attach;
+
+ if (VInitVolumePackage2(fileServer, &opts)) {
+ ViceLog(0,
+ ("Shutting down: errors encountered initializing volume package\n"));
+ VShutdown();
+ exit(1);
+ }
+
+ /* Install handler to catch the shutdown signal;
+ * bosserver assumes SIGQUIT shutdown
+ */
+#if defined(AFS_PTHREAD_ENV) && !defined(AFS_NT40_ENV)
+ softsig_signal(SIGQUIT, ShutDown_Signal);
+#else
+ (void)signal(SIGQUIT, ShutDown_Signal);
+#endif
+
+ if (VInitAttachVolumes(fileServer)) {
ViceLog(0,
("Shutting down: errors encountered initializing volume package\n"));
VShutdown();
#ifdef AFS_PTHREAD_ENV
ViceLog(5, ("Starting pthreads\n"));
-#ifdef AFS_DEMAND_ATTACH_FS
- FS_STATE_INIT;
-#endif
assert(pthread_attr_init(&tattr) == 0);
assert(pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED) == 0);
assert(pthread_create
- (&serverPid, &tattr, (void *)FiveMinuteCheckLWP,
+ (&serverPid, &tattr, FiveMinuteCheckLWP,
&fiveminutes) == 0);
assert(pthread_create
- (&serverPid, &tattr, (void *)HostCheckLWP, &fiveminutes) == 0);
+ (&serverPid, &tattr, HostCheckLWP, &fiveminutes) == 0);
assert(pthread_create
- (&serverPid, &tattr, (void *)FsyncCheckLWP, &fiveminutes) == 0);
+ (&serverPid, &tattr, FsyncCheckLWP, &fiveminutes) == 0);
#else /* AFS_PTHREAD_ENV */
ViceLog(5, ("Starting LWP\n"));
assert(LWP_CreateProcess
(void *)&fiveminutes, "FsyncCheck", &serverPid) == LWP_SUCCESS);
#endif /* AFS_PTHREAD_ENV */
- TM_GetTimeOfDay(&tp, 0);
+ FT_GetTimeOfDay(&tp, 0);
-#ifndef AFS_QUIETFS_ENV
- if (console != NULL) {
- time_t t = tp.tv_sec;
- fprintf(console, "File server has started at %s\r",
- afs_ctime(&t, tbuffer, sizeof(tbuffer)));
- }
-#endif
+ ViceLog(0, ("File server has started at %s",
+ afs_ctime((time_t *)&(tp.tv_sec), tbuffer, sizeof(tbuffer))));
/*
* Figure out the FileServer's name and primary address.
FS_HostName, hoststr, FS_HostAddr_NBO, FS_HostAddr_HBO));
}
- /* Install handler to catch the shutdown signal;
- * bosserver assumes SIGQUIT shutdown
- */
-#if defined(AFS_PTHREAD_ENV) && !defined(AFS_NT40_ENV)
- softsig_signal(SIGQUIT, ShutDown_Signal);
-#else
- (void)signal(SIGQUIT, ShutDown_Signal);
-#endif
-
t = tp.tv_sec;
ViceLog(0,
("File Server started %s",
#else /* AFS_PTHREAD_ENV */
assert(LWP_WaitProcess(&parentPid) == LWP_SUCCESS);
#endif /* AFS_PTHREAD_ENV */
+ return 0;
}
git://git.openafs.org / openafs.git / blobdiff