#include <afsconfig.h>
#include <afs/param.h>
+#include <afs/stds.h>
+#include <afs/procmgmt.h>
+#include <roken.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/types.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 <WINNT/afsevent.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <unistd.h> /* sysconf() */
-
-#ifndef ITIMER_REAL
-#include <sys/time.h>
-#endif /* ITIMER_REAL */
-#include <sys/resource.h>
-#endif /* AFS_NT40_ENV */
-#include <afs/stds.h>
+# include <windows.h>
+# include <WINNT/afsevent.h>
+#endif
+
+#ifdef HAVE_SYS_FILE_H
+# include <sys/file.h>
+#endif
+
+#ifdef HAVE_SYS_RESOURCE_H
+# include <sys/resource.h>
+#endif
+
#undef SHARED
+
#include <rx/xdr.h>
#include <afs/nfs.h>
-#ifdef AFS_PTHREAD_ENV
-#include <assert.h>
-#else /* AFS_PTHREAD_ENV */
-#include <afs/assert.h>
-#endif /* AFS_PTHREAD_ENV */
+#include <afs/afs_assert.h>
#include <lwp.h>
#include <lock.h>
#include <afs/ptclient.h>
#include <afs/partition.h>
#include <afs/dir.h>
#ifndef AFS_NT40_ENV
-#include <afs/netutils.h>
+# include <afs/netutils.h>
#endif
#include "viced_prototypes.h"
#include "viced.h"
#include "host.h"
#ifdef AFS_PTHREAD_ENV
-#include <afs/softsig.h>
+# include <afs/softsig.h>
+# ifdef HAVE_PTHREAD_NP_H
+# include <pthread_np.h>
+# endif /* HAVE_PTHREAD_NP_H */
#endif
#if defined(AFS_SGI_ENV)
-#include "sys/schedctl.h"
-#include "sys/lock.h"
+# include "sys/schedctl.h"
+# include "sys/lock.h"
#endif
#include <rx/rx_globals.h>
-#ifdef O_LARGEFILE
-#define afs_stat stat64
-#define afs_fstat fstat64
-#define afs_open open64
-#define afs_fopen fopen64
-#else /* !O_LARGEFILE */
-#define afs_stat stat
-#define afs_fstat fstat
-#define afs_open open
-#define afs_fopen fopen
-#endif /* !O_LARGEFILE */
-
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);
#endif /* AFS_PTHREAD_ENV */
#ifdef AFS_NT40_ENV
-#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 sendBufSize = 16384; /* send buffer size */
int saneacls = 0; /* Sane ACLs Flag */
static int unsafe_attach = 0; /* avoid inUse check on vol attach? */
+static int offline_timeout = -1; /* -offline-timeout option */
+static int offline_shutdown_timeout = -1; /* -offline-shutdown-timeout option */
struct timeval tp;
* disk
*/
-#if !defined(PTHREAD_RWLOCK_INITIALIZER) && defined(AFS_DARWIN80_ENV)
-#define PTHREAD_RWLOCK_INITIALIZER {0x2DA8B3B4, {0}}
-#endif
+# if !defined(PTHREAD_RWLOCK_INITIALIZER) && defined(AFS_DARWIN80_ENV)
+# define PTHREAD_RWLOCK_INITIALIZER {0x2DA8B3B4, {0}}
+# endif
-#ifndef AFS_NT40_ENV
+# ifndef AFS_NT40_ENV
struct fs_state fs_state =
{ FS_MODE_NORMAL,
0,
PTHREAD_COND_INITIALIZER,
PTHREAD_RWLOCK_INITIALIZER
};
-#else /* AFS_NT40_ENV */
+# else /* AFS_NT40_ENV */
struct fs_state fs_state;
static int fs_stateInit(void)
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);
+ CV_INIT(&fs_state.worker_done_cv, "worker done", CV_DEFAULT, 0);
+ osi_Assert(pthread_rwlock_init(&fs_state.state_lock, NULL) == 0);
}
-#endif /* AFS_NT40_ENV */
+# endif /* AFS_NT40_ENV */
#endif /* AFS_DEMAND_ATTACH_FS */
/*
#if defined(AFS_HPUX_ENV)
signo = SIGPOLL;
-#else
-#if defined(AFS_NT40_ENV)
+#elif defined(AFS_NT40_ENV)
signo = SIGUSR2;
#else
signo = SIGXCPU;
#endif
-#endif
#if defined(AFS_PTHREAD_ENV) && !defined(AFS_NT40_ENV)
softsig_signal(signo, CheckSignal_Signal);
ResetCheckDescriptors(void)
{
#ifndef AFS_NT40_ENV
-#if defined(AFS_PTHREAD_ENV)
+# if defined(AFS_PTHREAD_ENV)
softsig_signal(SIGTERM, CheckDescriptors_Signal);
-#else
+# else
(void)signal(SIGTERM, CheckDescriptors_Signal);
-#endif
+# endif
#endif
}
viced_syscall(afs_uint32 a3, afs_uint32 a4, void *a5)
{
afs_uint32 rcode;
-#ifndef AFS_LINUX20_ENV
+# ifndef AFS_LINUX20_ENV
void (*old) (int);
old = (void (*)(int))signal(SIGSYS, SIG_IGN);
-#endif
+# endif
rcode = syscall(AFS_SYSCALL, 28 /* AFSCALL_CALL */ , a3, a4, a5);
-#ifndef AFS_LINUX20_ENV
+# ifndef AFS_LINUX20_ENV
signal(SIGSYS, old);
-#endif
+# endif
return rcode;
}
#endif
#if !defined(AFS_NT40_ENV)
-#include "AFS_component_version_number.c"
+# include "AFS_component_version_number.c"
#endif /* !AFS_NT40_ENV */
#define MAXADMINNAME 64
/* set our 'thread-id' so that the host hold table works */
pthread_setspecific(rx_thread_id_key,
(void *)(intptr_t)rx_NewThreadId());
+# if defined(HAVE_PTHREAD_SET_NAME_NP)
+ /* The "NP" stands for "non-portable" so it's only just that
+ * implementations disagree about the name of the function.
+ */
+ pthread_set_name_np(pthread_self(), s);
+# elif defined(HAVE_PTHREAD_SETNAME_NP)
+ pthread_setname_np(pthread_self(), s);
+# endif
ViceLog(0,
("Set thread id %p for '%s'\n",
pthread_getspecific(rx_thread_id_key), s));
#endif
if (printBanner && (++msg & 1)) { /* Every 10 minutes */
time_t now = FT_ApproxTime();
+ struct tm tm;
+ strftime(tbuffer, sizeof(tbuffer), "%a %b %d %T %Y",
+ localtime_r(&now, &tm));
ViceLog(2,
- ("File server is running at %s\n",
- afs_ctime(&now, tbuffer, sizeof(tbuffer))));
+ ("File server is running at %s\n", tbuffer));
}
#ifdef AFS_DEMAND_ATTACH_FS
FS_STATE_WRLOCK;
#ifdef AFS_DEMAND_ATTACH_FS
fs_state.FiveMinuteLWP_tranquil = 1;
FS_LOCK;
- assert(pthread_cond_broadcast(&fs_state.worker_done_cv)==0);
+ CV_BROADCAST(&fs_state.worker_done_cv);
FS_UNLOCK;
FS_STATE_UNLOCK;
#endif
#ifdef AFS_DEMAND_ATTACH_FS
fs_state.HostCheckLWP_tranquil = 1;
FS_LOCK;
- assert(pthread_cond_broadcast(&fs_state.worker_done_cv)==0);
+ CV_BROADCAST(&fs_state.worker_done_cv);
FS_UNLOCK;
FS_STATE_UNLOCK;
#endif
fsync_next.tv_nsec = 0;
fsync_next.tv_sec = time(0) + fiveminutes;
- code =
- pthread_cond_timedwait(&fsync_cond, &fsync_glock_mutex,
- &fsync_next);
+ code = CV_TIMEDWAIT(&fsync_cond, &fsync_glock_mutex,
+ &fsync_next);
if (code != 0 && code != ETIMEDOUT)
ViceLog(0, ("pthread_cond_timedwait returned %d\n", code));
#else /* AFS_PTHREAD_ENV */
#ifdef AFS_DEMAND_ATTACH_FS
fs_state.FsyncCheckLWP_tranquil = 1;
FS_LOCK;
- assert(pthread_cond_broadcast(&fs_state.worker_done_cv)==0);
+ CV_BROADCAST(&fs_state.worker_done_cv);
FS_UNLOCK;
FS_STATE_UNLOCK;
#endif /* AFS_DEMAND_ATTACH_FS */
* declared in param.h. If such a thing is not defined, we bitch
* and declare ourselves to be an unknown system type.
*/
-#ifdef SYS_NAME_ID
+# ifdef SYS_NAME_ID
afs_perfstats.sysname_ID = SYS_NAME_ID;
-#else
-#ifndef AFS_NT40_ENV
+# else
+# ifndef AFS_NT40_ENV
ViceLog(0, ("Sys name ID constant not defined in param.h!!\n"));
ViceLog(0, ("[Choosing ``undefined'' sys name ID.\n"));
-#endif
+# endif
afs_perfstats.sysname_ID = SYS_NAME_ID_UNDEFINED;
-#endif /* SYS_NAME_ID */
+# endif /* SYS_NAME_ID */
#endif
} /*ClearXStatValues */
int workstations, activeworkstations, delworkstations;
int processSize = 0;
char tbuffer[32];
+ struct tm tm;
#ifdef AFS_DEMAND_ATTACH_FS
int stats_flags = 0;
#endif
FT_GetTimeOfDay(&tpl, 0);
Statistics = 1;
- ViceLog(0,
- ("Vice was last started at %s\n",
- afs_ctime(&StartTime, tbuffer, sizeof(tbuffer))));
+ strftime(tbuffer, sizeof(tbuffer), "%a %b %d %T %Y",
+ localtime_r(&StartTime, &tm));
+ ViceLog(0, ("Vice was last started at %s\n", tbuffer));
#ifdef AFS_DEMAND_ATTACH_FS
if (LogLevel >= 125) {
ShutdownWatchdogLWP(void *unused)
{
sleep(panic_timeout);
- ViceLog(0, ("ShutdownWatchdogLWP: Failed to shutdown and panic "
- "within %d seconds; forcing panic\n", panic_timeout));
- assert(0);
+ ViceLogThenPanic(0, ("ShutdownWatchdogLWP: Failed to shutdown and panic "
+ "within %d seconds; forcing panic\n",
+ panic_timeout));
return NULL;
}
void
ShutDownAndCore(int dopanic)
{
- time_t now = time(0);
+ time_t now = time(NULL);
+ struct tm tm;
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);
+ osi_Assert(pthread_attr_init(&tattr) == 0);
+ osi_Assert(pthread_create(&watchdogPid, &tattr, ShutdownWatchdogLWP, NULL) == 0);
#else
PROCESS watchdogPid;
- assert(LWP_CreateProcess
+ osi_Assert(LWP_CreateProcess
(ShutdownWatchdogLWP, stack * 1024, LWP_MAX_PRIORITY - 2,
NULL, "ShutdownWatchdog", &watchdogPid) == LWP_SUCCESS);
#endif
FS_STATE_UNLOCK;
#endif
- ViceLog(0,
- ("Shutting down file server at %s",
- afs_ctime(&now, tbuffer, sizeof(tbuffer))));
+ strftime(tbuffer, sizeof(tbuffer), "%a %b %d %T %Y",
+ localtime_r(&now, &tm));
+ ViceLog(0, ("Shutting down file server at %s\n", tbuffer));
if (dopanic)
ViceLog(0, ("ABNORMAL SHUTDOWN, see core file.\n"));
DFlush();
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);
+ CV_WAIT(&fs_state.worker_done_cv, &fileproc_glock_mutex);
FS_UNLOCK;
FS_STATE_RDLOCK;
}
fflush(debugFile);
}
now = time(0);
+ strftime(tbuffer, sizeof(tbuffer), "%a %b %d %T %Y",
+ localtime_r(&now, &tm));
if (dopanic) {
- ViceLog(0,
- ("File server has terminated abnormally at %s\n",
- afs_ctime(&now, tbuffer, sizeof(tbuffer))));
+ ViceLog(0, ("File server has terminated abnormally at %s\n", tbuffer));
} else {
- ViceLog(0,
- ("File server has terminated normally at %s\n",
- afs_ctime(&now, tbuffer, sizeof(tbuffer))));
+ ViceLog(0, ("File server has terminated normally at %s\n", tbuffer));
}
- if (dopanic)
- assert(0);
+ if (dopanic) /* XXX pass in file and line? */
+ osi_Panic("Panic requested\n");
exit(0);
}
fputs("[-abortthreshold <abort threshold>] ", stdout);
fputs("[-nojumbo (disable jumbogram network packets - deprecated)] ", stdout);
fputs("[-jumbo (enable jumbogram network packets)] ", stdout);
+ fputs("[-offline-timeout <client RX timeout for offlining volumes>]", stdout);
+ fputs("[-offline-shutdown-timeout <RX timeout for offlining volumes during shutdown>]", stdout);
/* fputs("[-enable_peer_stats] ", stdout); */
/* fputs("[-enable_process_stats] ", stdout); */
fputs("[-help]\n", stdout);
static int
max_fileserver_thread(void)
{
-#if defined(AFS_PTHREAD_ENV)
-#if defined(AFS_AIX_ENV) || defined(AFS_HPUX_ENV)
+#if defined(AFS_PTHREAD_ENV) && (defined(AFS_AIX_ENV) || defined(AFS_HPUX_ENV))
long ans;
ans = sysconf(_SC_THREAD_THREADS_MAX);
if (0 < ans && ans < MAX_FILESERVER_THREAD)
return (int)ans;
-#endif
#endif /* defined(AFS_PTHREAD_ENV) */
return MAX_FILESERVER_THREAD;
}
int Sawbusy = 0;
int i;
int bufSize = 0; /* temp variable to read in udp socket buf size */
+ int lwps_max;
char *auditFileName = NULL;
for (i = 1; i < argc; i++) {
} else if (!strcmp(argv[i], "-S")) {
SawS = 1;
} else if (!strcmp(argv[i], "-p")) {
- int lwps_max =
- max_fileserver_thread() - FILESERVER_HELPER_THREADS;
Sawlwps = 1;
if ((i + 1) >= argc) {
fprintf(stderr, "missing argument for -p\n");
return -1;
}
lwps = atoi(argv[++i]);
- if (lwps > lwps_max)
- lwps = lwps_max;
- else if (lwps < 6)
- lwps = 6;
} else if (!strcmp(argv[i], "-b")) {
Sawbufs = 1;
if ((i + 1) >= argc) {
else if (strcmp(argv[i], "-saneacls") == 0) {
saneacls = 1;
}
+ else if (strcmp(argv[i], "-offline-timeout") == 0) {
+ if (i + 1 >= argc) {
+ printf("You have to specify -offline-timeout <integer>\n");
+ return -1;
+ }
+ offline_timeout = atoi(argv[++i]);
+#ifndef AFS_PTHREAD_ENV
+ if (offline_timeout != -1) {
+ printf("The only valid -offline-timeout value for the LWP "
+ "fileserver is -1\n");
+ return -1;
+ }
+#endif /* AFS_PTHREAD_ENV */
+ if (offline_timeout < -1) {
+ printf("Invalid -offline-timeout value %s; the only valid "
+ "negative value is -1\n", argv[i]);
+ return -1;
+ }
+ }
+ else if (strcmp(argv[i], "-offline-shutdown-timeout") == 0) {
+ if (i + 1 >= argc) {
+ printf("You have to specify -offline-shutdown-timeout "
+ "<integer>\n");
+ return -1;
+ }
+ offline_shutdown_timeout = atoi(argv[++i]);
+#ifndef AFS_PTHREAD_ENV
+ if (offline_shutdown_timeout != -1) {
+ printf("The only valid -offline-shutdown-timeout value for the "
+ "LWP fileserver is -1\n");
+ return -1;
+ }
+#endif /* AFS_PTHREAD_ENV */
+ if (offline_shutdown_timeout < -1) {
+ printf("Invalid -offline-timeout value %s; the only valid "
+ "negative value is -1\n", argv[i]);
+ return -1;
+ }
+ }
else {
return (-1);
}
if (auditFileName)
osi_audit_file(auditFileName);
+ lwps_max = max_fileserver_thread() - FILESERVER_HELPER_THREADS;
+ if (lwps > lwps_max)
+ lwps = lwps_max;
+ else if (lwps < 6)
+ lwps = 6;
+
return (0);
} /*ParseArgs */
-
-#define MAXPARMS 15
-
+/* Once upon a time, in a galaxy far far away, IBM AFS supported the use of
+ * a file /vice/file/parms, the contents of which would override any command
+ * line parameters. We no longer support the use of such a file, but we warn
+ * if we encounter its presence from an older release
+ */
static void
-NewParms(int initializing)
+CheckParms(void)
{
- static struct afs_stat sbuf;
- int i, fd;
- char *parms;
- char *argv[MAXPARMS];
- int argc;
-
- if (!(afs_stat("/vice/file/parms", &sbuf))) {
- parms = (char *)malloc(sbuf.st_size);
- if (!parms)
- return;
- fd = afs_open("parms", O_RDONLY, 0666);
- if (fd <= 0) {
- ViceLog(0, ("Open for parms failed with errno = %d\n", errno));
- return;
- }
-
- i = read(fd, parms, sbuf.st_size);
- close(fd);
- if (i != sbuf.st_size) {
- if (i < 0) {
- ViceLog(0, ("Read on parms failed with errno = %d\n", errno));
- } else {
- ViceLog(0,
- ("Read on parms failed; expected %ld bytes but read %d\n",
- (long) sbuf.st_size, i));
- }
- free(parms);
- return;
- }
-
- for (i = 0; i < MAXPARMS; argv[i++] = 0);
-
- for (argc = i = 0; i < sbuf.st_size; i++) {
- if ((*(parms + i) != ' ') && (*(parms + i) != '\n')) {
- if (argv[argc] == 0)
- argv[argc] = (parms + i);
- } else {
- *(parms + i) = '\0';
- if (argv[argc] != 0) {
- if (++argc == MAXPARMS)
- break;
- }
- while ((*(parms + i + 1) == ' ')
- || (*(parms + i + 1) == '\n'))
- i++;
- }
- }
- if (ParseArgs(argc, argv) == 0) {
- ViceLog(0, ("Change parameters to:"));
- } else {
- ViceLog(0, ("Invalid parameter in:"));
- }
- for (i = 0; i < argc; i++) {
- ViceLog(0, (" %s", argv[i]));
- }
- ViceLog(0, ("\n"));
- free(parms);
- } else if (!initializing)
- ViceLog(0,
- ("Received request to change parms but no parms file exists\n"));
-
-} /*NewParms */
+ struct afs_stat sbuf;
+ if (afs_stat("/vice/file/parms", &sbuf) == 0) {
+ ViceLog(0, ("Using /vice/file/parms to override command line "
+ "options is no longer supported"));
+ }
+}
/* Miscellaneous routines */
void
Die(char *msg)
{
- ViceLog(0, ("%s\n", msg));
- assert(0);
+ ViceLogThenPanic(0, ("%s\n", msg));
} /*Die */
}
#ifdef AFS_PTHREAD_ENV
- assert(pthread_key_create(&viced_uclient_key, NULL) == 0);
+ osi_Assert(pthread_key_create(&viced_uclient_key, NULL) == 0);
#endif
SystemId = SYSADMINID;
#endif
int curLimit;
time_t t;
+ struct tm tm;
afs_uint32 rx_bindhost;
VolumePackageOptions opts;
/* set ihandle package defaults prior to parsing args */
ih_PkgDefaults();
+ /* check for the parameter file */
+ CheckParms();
+
if (ParseArgs(argc, argv)) {
FlagMsg();
exit(-1);
}
#ifdef AFS_PTHREAD_ENV
- assert(pthread_mutex_init(&fileproc_glock_mutex, NULL) == 0);
+ MUTEX_INIT(&fileproc_glock_mutex, "fileproc", MUTEX_DEFAULT, 0);
#endif /* AFS_PTHREAD_ENV */
#ifdef AFS_SGI_VNODE_GLUE
exit(-1);
}
- NewParms(1);
-
/* Open FileLog on stdout, stderr, fd 1 and fd2 (for perror), sigh. */
#ifndef AFS_NT40_ENV
serverLogSyslogTag = "fileserver";
schedctl(NDPRI, 0, NDPNORMMAX);
if (SawLock)
plock(PROCLOCK);
-#else
-#ifndef AFS_NT40_ENV
+#elif !defined(AFS_NT40_ENV)
nice(-5); /* TODO: */
#endif
-#endif
- assert(DInit(buffs) == 0);
+ DInit(buffs);
#ifdef AFS_DEMAND_ATTACH_FS
FS_STATE_INIT;
#endif
curLimit, lwps, vol_io_params.fd_max_cachesize));
}
#ifndef AFS_PTHREAD_ENV
- assert(LWP_InitializeProcessSupport(LWP_MAX_PRIORITY - 2, &parentPid) ==
+ osi_Assert(LWP_InitializeProcessSupport(LWP_MAX_PRIORITY - 2, &parentPid) ==
LWP_SUCCESS);
#endif /* !AFS_PTHREAD_ENV */
}
rx_GetIFInfo();
rx_SetRxDeadTime(30);
- afsconf_BuildServerSecurityObjects(confDir, AFSCONF_SEC_OBJS_RXKAD_CRYPT,
- &securityClasses, &numClasses);
+ afsconf_SetSecurityFlags(confDir, AFSCONF_SECOPTS_ALWAYSENCRYPT);
+ afsconf_BuildServerSecurityObjects(confDir, &securityClasses, &numClasses);
tservice = rx_NewServiceHost(rx_bindhost, /* port */ 0, /* service id */
1, /*service name */
/* 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
+ CV_INIT(&fsync_cond, "fsync", CV_DEFAULT, 0);
+ MUTEX_INIT(&fsync_glock_mutex, "fsync", MUTEX_DEFAULT, 0);
#if !defined(AFS_DEMAND_ATTACH_FS)
/*
opts.nSmallVnodes = nSmallVns;
opts.volcache = volcache;
opts.unsafe_attach = unsafe_attach;
+ if (offline_timeout != -1) {
+ opts.interrupt_rxcall = rx_InterruptCall;
+ opts.offline_timeout = offline_timeout;
+ }
+ if (offline_shutdown_timeout == -1) {
+ /* default to -offline-timeout, if shutdown-specific timeout is not
+ * specified */
+ opts.offline_shutdown_timeout = offline_timeout;
+ } else {
+ opts.interrupt_rxcall = rx_InterruptCall;
+ opts.offline_shutdown_timeout = offline_shutdown_timeout;
+ }
if (VInitVolumePackage2(fileServer, &opts)) {
ViceLog(0,
#ifdef AFS_PTHREAD_ENV
ViceLog(5, ("Starting pthreads\n"));
- assert(pthread_attr_init(&tattr) == 0);
- assert(pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED) == 0);
+ osi_Assert(pthread_attr_init(&tattr) == 0);
+ osi_Assert(pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED) == 0);
- assert(pthread_create
+ osi_Assert(pthread_create
(&serverPid, &tattr, FiveMinuteCheckLWP,
&fiveminutes) == 0);
- assert(pthread_create
+ osi_Assert(pthread_create
(&serverPid, &tattr, HostCheckLWP, &fiveminutes) == 0);
- assert(pthread_create
+ osi_Assert(pthread_create
(&serverPid, &tattr, FsyncCheckLWP, &fiveminutes) == 0);
#else /* AFS_PTHREAD_ENV */
ViceLog(5, ("Starting LWP\n"));
- assert(LWP_CreateProcess
+ osi_Assert(LWP_CreateProcess
(FiveMinuteCheckLWP, stack * 1024, LWP_MAX_PRIORITY - 2,
(void *)&fiveminutes, "FiveMinuteChecks",
&serverPid) == LWP_SUCCESS);
- assert(LWP_CreateProcess
+ osi_Assert(LWP_CreateProcess
(HostCheckLWP, stack * 1024, LWP_MAX_PRIORITY - 2,
(void *)&fiveminutes, "HostCheck", &serverPid) == LWP_SUCCESS);
- assert(LWP_CreateProcess
+ osi_Assert(LWP_CreateProcess
(FsyncCheckLWP, stack * 1024, LWP_MAX_PRIORITY - 2,
(void *)&fiveminutes, "FsyncCheck", &serverPid) == LWP_SUCCESS);
#endif /* AFS_PTHREAD_ENV */
FT_GetTimeOfDay(&tp, 0);
- 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.
*/
}
t = tp.tv_sec;
- ViceLog(0,
- ("File Server started %s",
- afs_ctime(&t, tbuffer, sizeof(tbuffer))));
+ strftime(tbuffer, sizeof(tbuffer), "%a %b %d %T %Y",
+ localtime_r(&t, &tm));
+ ViceLog(0, ("File Server started %s\n", tbuffer));
#if FS_STATS_DETAILED
afs_FullPerfStats.det.epoch.tv_sec = StartTime = tp.tv_sec;
#endif
sleep(1000); /* long time */
}
#else /* AFS_PTHREAD_ENV */
- assert(LWP_WaitProcess(&parentPid) == LWP_SUCCESS);
+ osi_Assert(LWP_WaitProcess(&parentPid) == LWP_SUCCESS);
#endif /* AFS_PTHREAD_ENV */
return 0;
}
git://git.openafs.org / openafs.git / blobdiff