#undef SHARED
-#include <rx/xdr.h>
+#include <afs/opr.h>
#include <afs/nfs.h>
+#include <rx/rx_queue.h>
#include <lwp.h>
-#include <lock.h>
+#include <opr/lock.h>
#include <afs/cmd.h>
#include <afs/ptclient.h>
#include <afs/afsint.h>
#include <afs/partition.h>
#include <afs/dir.h>
#ifndef AFS_NT40_ENV
-# include <afs/netutils.h>
+# include <afs/softsig.h>
#endif
#include "viced_prototypes.h"
#include "viced.h"
#include "host.h"
-#ifdef AFS_PTHREAD_ENV
-# include <afs/softsig.h>
-#endif
#if defined(AFS_SGI_ENV)
# include "sys/schedctl.h"
# include "sys/lock.h"
int eventlog = 0, rxlog = 0;
FILE *debugFile;
+char *logFile = NULL;
-#ifdef AFS_PTHREAD_ENV
pthread_mutex_t fsync_glock_mutex;
pthread_cond_t fsync_cond;
-#else
-char fsync_wait[1];
-#endif /* AFS_PTHREAD_ENV */
#ifdef AFS_NT40_ENV
# define NT_OPEN_MAX 1024 /* This is an arbitrary no. we came up with for
struct timeval tp;
-#ifdef AFS_PTHREAD_ENV
pthread_key_t viced_uclient_key;
-#endif
/*
* FileServer's name and IP address, both network byte order and
#define ADDRSPERSITE 16 /* Same global is in rx/rx_user.c */
char FS_HostName[128] = "localhost";
+char *FS_configPath = NULL;
afs_uint32 FS_HostAddr_NBO;
afs_uint32 FS_HostAddr_HBO;
afs_uint32 FS_HostAddrs[ADDRSPERSITE], FS_HostAddr_cnt = 0, FS_registered = 0;
fs_state.options.fs_state_verify_before_save = 1;
fs_state.options.fs_state_verify_after_restore = 1;
- CV_INIT(&fs_state.worker_done_cv, "worker done", CV_DEFAULT, 0);
- osi_Assert(pthread_rwlock_init(&fs_state.state_lock, NULL) == 0);
+ opr_cv_init(&fs_state.worker_done_cv, "worker done");
+ opr_Verify(pthread_rwlock_init(&fs_state.state_lock, NULL) == 0);
}
# endif /* AFS_NT40_ENV */
#endif /* AFS_DEMAND_ATTACH_FS */
} /*CheckDescriptors */
-#ifdef AFS_PTHREAD_ENV
void
CheckSignal_Signal(int x)
{
{
CheckDescriptors(NULL);
}
-#else /* AFS_PTHREAD_ENV */
-void
-CheckSignal_Signal(int x)
-{
- IOMGR_SoftSig(CheckSignal, 0);
-}
-void
-ShutDown_Signal(int x)
-{
- IOMGR_SoftSig(ShutDown, 0);
-}
-
-void
-CheckDescriptors_Signal(int x)
+/* check whether caller is authorized to perform admin operations */
+int
+viced_SuperUser(struct rx_call *call)
{
- IOMGR_SoftSig(CheckDescriptors, 0);
+ return afsconf_SuperUser(confDir, call, NULL);
}
-#endif /* AFS_PTHREAD_ENV */
-/* check whether caller is authorized to manage RX statistics */
+/**
+ * Return true if this name is a member of the local realm.
+ */
int
-fs_rxstat_userok(struct rx_call *call)
+fs_IsLocalRealmMatch(void *rock, char *name, char *inst, char *cell)
{
- return afsconf_SuperUser(confDir, call, NULL);
+ struct afsconf_dir *dir = (struct afsconf_dir *)rock;
+ afs_int32 islocal = 0; /* default to no */
+ int code;
+
+ code = afsconf_IsLocalRealmMatch(dir, &islocal, name, inst, cell);
+ if (code) {
+ ViceLog(0,
+ ("Failed local realm check; code=%d, name=%s, inst=%s, cell=%s\n",
+ code, name, inst, cell));
+ }
+ return islocal;
}
static void
signo = SIGXCPU;
#endif
-#if defined(AFS_PTHREAD_ENV) && !defined(AFS_NT40_ENV)
+#if !defined(AFS_NT40_ENV)
softsig_signal(signo, CheckSignal_Signal);
#else
signal(signo, CheckSignal_Signal);
ResetCheckDescriptors(void)
{
#ifndef AFS_NT40_ENV
-# if defined(AFS_PTHREAD_ENV)
softsig_signal(SIGTERM, CheckDescriptors_Signal);
-# else
- (void)signal(SIGTERM, CheckDescriptors_Signal);
-# endif
#endif
}
static void
setThreadId(char *s)
{
-#if defined(AFS_PTHREAD_ENV) && !defined(AFS_NT40_ENV)
+#if !defined(AFS_NT40_ENV)
int threadId;
/* set our 'thread-id' so that the host hold table works */
while (1) {
#endif
-#ifdef AFS_PTHREAD_ENV
sleep(fiveminutes);
-#else /* AFS_PTHREAD_ENV */
- IOMGR_Sleep(fiveminutes);
-#endif /* AFS_PTHREAD_ENV */
#ifdef AFS_DEMAND_ATTACH_FS
FS_STATE_WRLOCK;
if (FS_registered == 1)
Do_VLRegisterRPC();
/* Force wakeup in case we missed something; pthreads does timedwait */
-#ifndef AFS_PTHREAD_ENV
- LWP_NoYieldSignal(fsync_wait);
-#endif
if (printBanner && (++msg & 1)) { /* Every 10 minutes */
- time_t now = FT_ApproxTime();
+ time_t now = time(NULL);
struct tm tm;
strftime(tbuffer, sizeof(tbuffer), "%a %b %d %H:%M:%S %Y",
localtime_r(&now, &tm));
#ifdef AFS_DEMAND_ATTACH_FS
fs_state.FiveMinuteLWP_tranquil = 1;
FS_LOCK;
- CV_BROADCAST(&fs_state.worker_done_cv);
+ opr_cv_broadcast(&fs_state.worker_done_cv);
FS_UNLOCK;
FS_STATE_UNLOCK;
#endif
while(1) {
#endif
-#ifdef AFS_PTHREAD_ENV
sleep(fiveminutes);
-#else /* AFS_PTHREAD_ENV */
- IOMGR_Sleep(fiveminutes);
-#endif /* AFS_PTHREAD_ENV */
#ifdef AFS_DEMAND_ATTACH_FS
FS_STATE_WRLOCK;
#ifdef AFS_DEMAND_ATTACH_FS
fs_state.HostCheckLWP_tranquil = 1;
FS_LOCK;
- CV_BROADCAST(&fs_state.worker_done_cv);
+ opr_cv_broadcast(&fs_state.worker_done_cv);
FS_UNLOCK;
FS_STATE_UNLOCK;
#endif
FsyncCheckLWP(void *unused)
{
afs_int32 code;
-#ifdef AFS_PTHREAD_ENV
struct timespec fsync_next;
-#endif
ViceLog(1, ("Starting fsync check process\n"));
setThreadId("FsyncCheckLWP");
while(1) {
#endif
FSYNC_LOCK;
-#ifdef AFS_PTHREAD_ENV
/* rounding is fine */
fsync_next.tv_nsec = 0;
fsync_next.tv_sec = time(0) + fiveminutes;
- code = CV_TIMEDWAIT(&fsync_cond, &fsync_glock_mutex,
+ code = opr_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 */
- if ((code = LWP_WaitProcess(fsync_wait)) != LWP_SUCCESS)
- ViceLog(0, ("LWP_WaitProcess returned %d\n", code));
-#endif /* AFS_PTHREAD_ENV */
FSYNC_UNLOCK;
#ifdef AFS_DEMAND_ATTACH_FS
#ifdef AFS_DEMAND_ATTACH_FS
fs_state.FsyncCheckLWP_tranquil = 1;
FS_LOCK;
- CV_BROADCAST(&fs_state.worker_done_cv);
+ opr_cv_broadcast(&fs_state.worker_done_cv);
FS_UNLOCK;
FS_STATE_UNLOCK;
#endif /* AFS_DEMAND_ATTACH_FS */
* Zero all xstat-related structures.
*/
memset((&afs_perfstats), 0, sizeof(struct afs_PerfStats));
-#if FS_STATS_DETAILED
memset((&afs_FullPerfStats), 0,
sizeof(struct fs_stats_FullPerfStats));
# endif
afs_perfstats.sysname_ID = SYS_NAME_ID_UNDEFINED;
# endif /* SYS_NAME_ID */
-#endif
} /*ClearXStatValues */
int stats_flags = 0;
#endif
- FT_GetTimeOfDay(&tpl, 0);
+ gettimeofday(&tpl, 0);
Statistics = 1;
strftime(tbuffer, sizeof(tbuffer), "%a %b %d %H:%M:%S %Y",
localtime_r(&StartTime, &tm));
char tbuffer[32];
if (dopanic) {
-#ifdef AFS_PTHREAD_ENV
pthread_t watchdogPid;
pthread_attr_t tattr;
- osi_Assert(pthread_attr_init(&tattr) == 0);
- osi_Assert(pthread_create(&watchdogPid, &tattr, ShutdownWatchdogLWP, NULL) == 0);
-#else
- PROCESS watchdogPid;
- osi_Assert(LWP_CreateProcess
- (ShutdownWatchdogLWP, stack * 1024, LWP_MAX_PRIORITY - 2,
- NULL, "ShutdownWatchdog", &watchdogPid) == LWP_SUCCESS);
-#endif
+ opr_Verify(pthread_attr_init(&tattr) == 0);
+ opr_Verify(pthread_create(&watchdogPid, &tattr,
+ ShutdownWatchdogLWP, NULL) == 0);
}
/* do not allows new reqests to be served from now on, all new requests
FS_LOCK;
FS_STATE_UNLOCK;
ViceLog(0, ("waiting for background host/callback threads to quiesce before saving fileserver state...\n"));
- CV_WAIT(&fs_state.worker_done_cv, &fileproc_glock_mutex);
+ opr_cv_wait(&fs_state.worker_done_cv, &fileproc_glock_mutex);
FS_UNLOCK;
FS_STATE_RDLOCK;
}
static int
max_fileserver_thread(void)
{
-#if defined(AFS_PTHREAD_ENV) && (defined(AFS_AIX_ENV) || defined(AFS_HPUX_ENV))
+#if 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 /* defined(AFS_PTHREAD_ENV) */
+#endif
return MAX_FILESERVER_THREAD;
}
OPT_rxmaxmtu,
OPT_udpsize,
OPT_dotted,
- OPT_realm
+ OPT_realm,
+ OPT_sync
};
static int
{
int code;
int optval;
- char *optstring;
+ char *optstring = NULL;
struct cmd_item *optlist;
struct cmd_syndesc *opts;
int lwps_max;
char *auditFileName = NULL;
+ char *sync_behavior = NULL;
#if defined(AFS_AIX32_ENV)
extern int aixlow_water;
cmd_AddParmAtOffset(opts, OPT_hostcpsrefresh, "-hr", CMD_SINGLE,
CMD_OPTIONAL, "hours between host CPS refreshes");
-#if defined(AFS_PTHREAD_ENV)
cmd_AddParmAtOffset(opts, OPT_vattachthreads, "-vattachpar", CMD_SINGLE,
CMD_OPTIONAL, "# of volume attachment threads");
-#endif
cmd_AddParmAtOffset(opts, OPT_abortthreshold, "-abortthreshold",
CMD_SINGLE, CMD_OPTIONAL,
"permit Kerberos 5 principals with dots");
cmd_AddParmAtOffset(opts, OPT_realm, "-realm",
CMD_LIST, CMD_OPTIONAL, "local realm");
+ cmd_AddParmAtOffset(opts, OPT_sync, "-sync",
+ CMD_SINGLE, CMD_OPTIONAL, "always | onclose | never");
+
+ /* testing options */
+ cmd_AddParmAtOffset(opts, OPT_logfile, "-logfile", CMD_SINGLE,
+ CMD_OPTIONAL, "location of log file");
+ cmd_AddParmAtOffset(opts, OPT_config, "-config", CMD_SINGLE,
+ CMD_OPTIONAL, "configuration location");
code = cmd_Parse(argc, argv, &opts);
if (code)
return -1;
+ cmd_OpenConfigFile(AFSDIR_SERVER_CONFIG_FILE_FILEPATH);
+ cmd_SetCommandName("fileserver");
+
if (cmd_OptionPresent(opts, OPT_large)
&& cmd_OptionPresent(opts, OPT_small)) {
printf("Only one of -L or -S must be specified\n");
cmd_OptionAsInt(opts, OPT_buffers, &buffs);
if (cmd_OptionAsInt(opts, OPT_callbacks, &numberofcbs) == 0) {
- printf("number of cbs %d invalid; "
- "must be between 10000 and 2147483647\n", numberofcbs);
- return -1;
+ if ((numberofcbs < 10000) || (numberofcbs > 2147483647)) {
+ printf("number of cbs %d invalid; "
+ "must be between 10000 and 2147483647\n", numberofcbs);
+ return -1;
+ }
}
cmd_OptionAsInt(opts, OPT_vcsize, &volcache);
hostaclRefresh = optval * 60 * 60;
}
-#ifdef AFS_PTHREAD_ENV
cmd_OptionAsInt(opts, OPT_vattachthreads, &vol_attach_threads);
-#endif /* AFS_PTHREAD_ENV */
cmd_OptionAsInt(opts, OPT_abortthreshold, &abort_threshold);
busyonrst = 0;
if (cmd_OptionAsInt(opts, OPT_offline_timeout, &offline_timeout) == 0) {
-#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 %d; the only valid "
"negative value is -1\n", offline_timeout);
if (cmd_OptionAsInt(opts, OPT_offline_shutdown_timeout,
&offline_shutdown_timeout) == 0) {
-#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 %d; the only valid "
"negative value is -1\n", offline_shutdown_timeout);
&vol_io_params.fd_max_cachesize);
cmd_OptionAsUint(opts, OPT_vhandle_initial_cachesize,
&vol_io_params.fd_initial_cachesize);
+ if (cmd_OptionAsString(opts, OPT_sync, &sync_behavior) == 0) {
+ if (ih_SetSyncBehavior(sync_behavior)) {
+ printf("Invalid -sync value %s\n", sync_behavior);
+ return -1;
+ }
+ }
#ifdef AFS_DEMAND_ATTACH_FS
if (cmd_OptionPresent(opts, OPT_fs_state_dont_save))
optstring = NULL;
}
- /* XXX - cmd_OptionAsString(opts, OPT_config, &configDir); */
cmd_OptionAsInt(opts, OPT_debug, &LogLevel);
- /* XXX - cmd_OptionAsString(opts, OPT_logfile, &logFile); */
cmd_OptionAsFlag(opts, OPT_mrafslogs, &mrafsStyleLogs);
if (cmd_OptionAsInt(opts, OPT_threads, &lwps) == 0) {
/* rxkad options */
cmd_OptionAsFlag(opts, OPT_dotted, &rxkadDisableDotCheck);
if (cmd_OptionAsList(opts, OPT_realm, &optlist) == 0) {
- extern char local_realms[AFS_NUM_LREALMS][AFS_REALM_SZ];
- extern int num_lrealms;
for (; optlist != NULL; optlist=optlist->next) {
if (strlen(optlist->data) >= AFS_REALM_SZ) {
"characters.\n", AFS_REALM_SZ);
return -1;
}
-
- if (num_lrealms == -1)
- num_lrealms = 0;
- if (num_lrealms >= AFS_NUM_LREALMS) {
- printf("a maximum of %d -realm arguments can be "
- "specified.\n", AFS_NUM_LREALMS);
- return -1;
- }
-
- strncpy(local_realms[num_lrealms++], optlist->data, AFS_REALM_SZ);
- optlist = optlist->next;
+ afsconf_SetLocalRealm(optlist->data); /* overrides krb.conf file, if one */
}
}
busy_threshold = 3 * rxpackets / 2;
}
+ cmd_OptionAsString(opts, OPT_logfile, &logFile);
+ cmd_OptionAsString(opts, OPT_config, &FS_configPath);
+
+
if (auditFileName)
osi_audit_file(auditFileName);
return code;
}
-#ifdef AFS_PTHREAD_ENV
- osi_Assert(pthread_key_create(&viced_uclient_key, NULL) == 0);
-#endif
+ opr_Verify(pthread_key_create(&viced_uclient_key, NULL) == 0);
SystemId = SYSADMINID;
SystemAnyUser = ANYUSERID;
AnonymousID = ANONYMOUSID;
return 0;
sleep:
-#ifdef AFS_PTHREAD_ENV
sleep(30);
-#else /* AFS_PTHREAD_ENV */
- IOMGR_Sleep(30);
-#endif /* AFS_PTHREAD_ENV */
}
} /*InitPR */
-struct rx_connection *serverconns[MAXSERVERS];
-struct ubik_client *cstruct;
+static struct ubik_client *cstruct;
-afs_int32
-vl_Initialize(const char *confDir)
+static afs_int32
+vl_Initialize(struct afsconf_dir *dir)
{
afs_int32 code, i;
afs_int32 scIndex = RX_SECIDX_NULL;
- struct afsconf_dir *tdir;
- struct rx_securityClass *sc;
struct afsconf_cell info;
+ struct rx_securityClass *sc;
+ struct rx_connection *serverconns[MAXSERVERS];
- tdir = afsconf_Open(confDir);
- if (!tdir) {
- ViceLog(0,
- ("Could not open configuration directory (%s).\n", confDir));
+ memset(serverconns, 0, sizeof(serverconns));
+ code = afsconf_ClientAuth(dir, &sc, &scIndex);
+ if (code) {
+ ViceLog(0, ("Could not get security object for localAuth\n"));
exit(1);
}
- code = afsconf_ClientAuth(tdir, &sc, &scIndex);
+ code = afsconf_GetCellInfo(dir, NULL, AFSCONF_VLDBSERVICE, &info);
if (code) {
- ViceLog(0, ("Could not get security object for localAuth\n"));
+ ViceLog(0,
+ ("vl_Initialize: Failed to get cell information\n"));
exit(1);
}
- code = afsconf_GetCellInfo(tdir, NULL, AFSCONF_VLDBSERVICE, &info);
if (info.numServers > MAXSERVERS) {
ViceLog(0,
("vl_Initialize: info.numServers=%d (> MAXSERVERS=%d)\n",
info.hostAddr[i].sin_port, USER_SERVICE_ID, sc,
scIndex);
code = ubik_ClientInit(serverconns, &cstruct);
- afsconf_Close(tdir);
if (code) {
ViceLog(0, ("vl_Initialize: ubik client init failed.\n"));
return code;
/*
* File exists; keep the old one around
*/
- renamefile(AFSDIR_SERVER_SYSID_FILEPATH,
- AFSDIR_SERVER_OLDSYSID_FILEPATH);
+ rk_rename(AFSDIR_SERVER_SYSID_FILEPATH,
+ AFSDIR_SERVER_OLDSYSID_FILEPATH);
}
fd = afs_open(AFSDIR_SERVER_SYSID_FILEPATH, O_WRONLY | O_TRUNC | O_CREAT,
0666);
* /usr/afs/local/NetRestict)
*/
char reason[1024];
- afs_int32 code = parseNetFiles(FS_HostAddrs, NULL, NULL,
- ADDRSPERSITE, reason,
- AFSDIR_SERVER_NETINFO_FILEPATH,
- AFSDIR_SERVER_NETRESTRICT_FILEPATH);
+ afs_int32 code;
+
+ code = afsconf_ParseNetFiles(FS_HostAddrs, NULL, NULL,
+ ADDRSPERSITE, reason,
+ AFSDIR_SERVER_NETINFO_FILEPATH,
+ AFSDIR_SERVER_NETRESTRICT_FILEPATH);
if (code < 0) {
ViceLog(0, ("Can't register any valid addresses: %s\n", reason));
exit(1);
}
afs_int32
-InitVL(void)
+InitVL(struct afsconf_dir *dir)
{
afs_int32 code;
* If this fails, it's because something major is wrong, and is not
* likely to be time dependent.
*/
- code = vl_Initialize(AFSDIR_SERVER_ETC_DIRPATH);
+ code = vl_Initialize(dir);
if (code != 0) {
ViceLog(0,
("Couldn't initialize volume location library; code=%d.\n", code));
struct rx_securityClass **securityClasses;
afs_int32 numClasses;
struct rx_service *tservice;
-#ifdef AFS_PTHREAD_ENV
pthread_t serverPid;
pthread_attr_t tattr;
-#else /* AFS_PTHREAD_ENV */
- PROCESS parentPid, serverPid;
-#endif /* AFS_PTHREAD_ENV */
struct hostent *he;
int minVnodesRequired; /* min size of vnode cache */
#ifndef AFS_NT40_ENV
/* check for the parameter file */
CheckParms();
+ FS_configPath = strdup(AFSDIR_SERVER_ETC_DIRPATH);
+ logFile = strdup(AFSDIR_SERVER_FILELOG_FILEPATH);
+
if (ParseArgs(argc, argv)) {
exit(-1);
}
-#ifdef AFS_PTHREAD_ENV
- MUTEX_INIT(&fileproc_glock_mutex, "fileproc", MUTEX_DEFAULT, 0);
-#endif /* AFS_PTHREAD_ENV */
+ opr_mutex_init(&fileproc_glock_mutex);
#ifdef AFS_SGI_VNODE_GLUE
if (afs_init_kernel_config(-1) < 0) {
exit(1);
}
#endif
- confDir = afsconf_Open(AFSDIR_SERVER_ETC_DIRPATH);
+
+ confDir = afsconf_Open(FS_configPath);
if (!confDir) {
fprintf(stderr, "Unable to open config directory %s\n",
- AFSDIR_SERVER_ETC_DIRPATH);
+ FS_configPath);
exit(-1);
}
+ /* initialize audit user check */
+ osi_audit_set_user_check(confDir, fs_IsLocalRealmMatch);
+
/* Open FileLog on stdout, stderr, fd 1 and fd2 (for perror), sigh. */
#ifndef AFS_NT40_ENV
serverLogSyslogTag = "fileserver";
#endif
- OpenLog(AFSDIR_SERVER_FILELOG_FILEPATH);
+ OpenLog(logFile);
SetupLogSignals();
LogCommandLine(argc, argv, "starting", "", "File server", FSLog);
+ if (afsconf_GetLatestKey(confDir, NULL, NULL) == 0) {
+ LogDesWarning();
+ }
-#if defined(AFS_PTHREAD_ENV) && !defined(AFS_NT40_ENV)
+#if !defined(AFS_NT40_ENV)
/* initialize the pthread soft signal handler thread */
softsig_init();
#endif
("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
- osi_Assert(LWP_InitializeProcessSupport(LWP_MAX_PRIORITY - 2, &parentPid) ==
- LWP_SUCCESS);
-#endif /* !AFS_PTHREAD_ENV */
/* Initialize volume support */
if (!novbc) {
V_BreakVolumeCallbacks = BreakVolumeCallBacksLater;
}
-#ifdef AFS_PTHREAD_ENV
SetLogThreadNumProgram( rx_GetThreadNum );
-#endif
/* initialize libacl routines */
acl_Initialize(ACL_VERSION);
InitCallBack(numberofcbs);
ClearXStatValues();
- code = InitVL();
+ code = InitVL(confDir);
if (code && code != VL_MULTIPADDR) {
ViceLog(0, ("Fatal error in library initialization, exiting!!\n"));
exit(1);
}
/* allow super users to manage RX statistics */
- rx_SetRxStatUserOk(fs_rxstat_userok);
+ rx_SetRxStatUserOk(viced_SuperUser);
- CV_INIT(&fsync_cond, "fsync", CV_DEFAULT, 0);
- MUTEX_INIT(&fsync_glock_mutex, "fsync", MUTEX_DEFAULT, 0);
+ opr_cv_init(&fsync_cond);
+ opr_mutex_init(&fsync_glock_mutex);
#if !defined(AFS_DEMAND_ATTACH_FS)
/*
/* Install handler to catch the shutdown signal;
* bosserver assumes SIGQUIT shutdown
*/
-#if defined(AFS_PTHREAD_ENV) && !defined(AFS_NT40_ENV)
+#if !defined(AFS_NT40_ENV)
softsig_signal(SIGQUIT, ShutDown_Signal);
#else
(void)signal(SIGQUIT, ShutDown_Signal);
*/
ih_UseLargeCache();
-#ifdef AFS_PTHREAD_ENV
ViceLog(5, ("Starting pthreads\n"));
- osi_Assert(pthread_attr_init(&tattr) == 0);
- osi_Assert(pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED) == 0);
-
- osi_Assert(pthread_create
- (&serverPid, &tattr, FiveMinuteCheckLWP,
- &fiveminutes) == 0);
- osi_Assert(pthread_create
- (&serverPid, &tattr, HostCheckLWP, &fiveminutes) == 0);
- osi_Assert(pthread_create
- (&serverPid, &tattr, FsyncCheckLWP, &fiveminutes) == 0);
-#else /* AFS_PTHREAD_ENV */
- ViceLog(5, ("Starting LWP\n"));
- osi_Assert(LWP_CreateProcess
- (FiveMinuteCheckLWP, stack * 1024, LWP_MAX_PRIORITY - 2,
- (void *)&fiveminutes, "FiveMinuteChecks",
- &serverPid) == LWP_SUCCESS);
-
- osi_Assert(LWP_CreateProcess
- (HostCheckLWP, stack * 1024, LWP_MAX_PRIORITY - 2,
- (void *)&fiveminutes, "HostCheck", &serverPid) == LWP_SUCCESS);
- 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);
+ opr_Verify(pthread_attr_init(&tattr) == 0);
+ opr_Verify(pthread_attr_setdetachstate(&tattr,
+ PTHREAD_CREATE_DETACHED) == 0);
+
+ opr_Verify(pthread_create(&serverPid, &tattr, FiveMinuteCheckLWP,
+ &fiveminutes) == 0);
+ opr_Verify(pthread_create(&serverPid, &tattr, HostCheckLWP,
+ &fiveminutes) == 0);
+ opr_Verify(pthread_create(&serverPid, &tattr, FsyncCheckLWP,
+ &fiveminutes) == 0);
+
+ gettimeofday(&tp, 0);
/*
* Figure out the FileServer's name and primary address.
strftime(tbuffer, sizeof(tbuffer), "%a %b %d %H:%M:%S %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
-#ifdef AFS_PTHREAD_ENV
while (1) {
sleep(1000); /* long time */
}
-#else /* AFS_PTHREAD_ENV */
- osi_Assert(LWP_WaitProcess(&parentPid) == LWP_SUCCESS);
-#endif /* AFS_PTHREAD_ENV */
return 0;
}
git://git.openafs.org / openafs.git / blobdiff