Mount point not auto unmounted after system date/time change
Subsystems (2)
Hi,
A auto mounted directory won't be automatically unmounted after a system date/time change, for example we can reproduce the issue with below steps in 100% failrate:
$ cat /etc/auto.master /mnt /etc/auto.misc
$ cat /etc/auto.misc removable -fstype=auto :/dev/sdb1
### now plugin a usb pendrive
$ cd /mnt/removable $ sudo date -s "+1 year" $ sleep 1 $ sudo date -s "-1 year" $ cd
Now /mnt/removable will not be automatically unmounted, the root cause is that autofs uses gettimeofday() to identify the timestamp and calculate the delta for timeouts, however as mentioned in the manpage:
```
NOTES
The time returned by gettimeofday() is affected by discontinuous jumps
in the system time (e.g., if the system administrator manually changes
the system time). If you need a monotonically increasing clock, see
clock_gettime(2).
```So in the above reproducer autofs will wait for a one-year-long timeout to unmount /mnt/removable.
BR
Ning
--
To unsubscribe from this list: send the line "unsubscribe autofs" in
Hi,
I have composed a patch for this issue, it works in my side, what it does is replacing gettimeofday() with clock_gettime(CLOCK_MONOTONIC).
Would anyone please help to review it? Thanks in advance.
From cdb2bcd563420cd39af199309e8c0c7fc45a7bd1 Mon Sep 17 00:00:00 2001
From: Yu Ning <[email protected]>
Date: Wed, 16 Sep 2015 15:56:21 +0800
Subject: [PATCH] Use clock_gettime() instead of gettimeofday().
This patch is to fix the issue that a mount point may not be automatically unmounted after a system date/time change.
Reproducer with 100% failrate:
$ cat /etc/auto.master
/mnt /etc/auto.misc $ cat /etc/auto.misc
removable -fstype=auto :/dev/sdb1### now plugin a usb pendrive
$ cd /mnt/removable
$ sudo date -s "+1 year"
$ sleep 1
$ sudo date -s "-1 year"
$ cd
/mnt/removable will not be automatically unmounted.
The root cause is that autofs uses gettimeofday() to identify the timestamp and calculate the timeouts, however as mentioned in the manpage:
NOTES
The time returned by gettimeofday() is affected by
discontinuous jumps
in the system time (e.g., if the system administrator
manually changes
the system time). If you need a monotonically increasing
clock, see
clock_gettime(2).
So we can fix the issue by replacing gettimeofday() with clock_gettime(CLOCK_MONOTONIC).
--- daemon/automount.c | 4 ++-- daemon/direct.c | 16 ++++++++-------- daemon/indirect.c | 16 ++++++++-------- daemon/lookup.c | 6 +++--- daemon/state.c | 2 +- include/automount.h | 9 +++++++++ include/rpc_subs.h | 1 + lib/alarm.c | 23 +++++++++++++++++------ lib/cache.c | 2 +- lib/master.c | 4 ++-- lib/rpc_subs.c | 17 ++++++++++++----- modules/dclist.c | 2 +- modules/lookup_file.c | 8 ++++---- modules/lookup_hesiod.c | 6 +++--- modules/lookup_hosts.c | 4 ++-- modules/lookup_ldap.c | 10 +++++----- modules/lookup_nisplus.c | 10 +++++----- modules/lookup_program.c | 10 +++++----- modules/lookup_sss.c | 6 +++--- modules/lookup_userhome.c | 2 +- modules/lookup_yp.c | 8 ++++---- modules/mount_autofs.c | 2 +- modules/parse_amd.c | 2 +- modules/replicated.c | 34 ++++++++++++++++------------------ 24 files changed, 115 insertions(+), 89 deletions(-)
daemon/automount.c +2 -2
@@ -1454,7 +1454,7 @@ static void *statemachine(void *arg)break ;case SIGHUP : -do_hup_signal (master_list,time (NULL )); +do_hup_signal (master_list,monotonic_time (NULL ));break ;default :
@@ -2004,7 +2004,7 @@ int main(int argc, char *argv[])unsigned ghost, logging, daemon_check;unsigned dumpmaps, foreground, have_global_options;time_t timeout; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );struct rlimit rlim;const char *options ="+hp:t:vmdD:fVrO:l:n:CF" ;static const struct option long_options[] = {
daemon/direct.c +1 -1
@@ -464,7 +464,7 @@ int mount_autofs_direct(struct autofs_point *ap)struct mapent_cache *nc, *mc;struct mapent *me, *ne, *nested;struct mnt_list *mnts; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );if (strcmp (ap->path,"/-" )) {error (ap->logopt,"expected direct map, exiting" );
@@ -1041,7 +1041,7 @@ int handle_packet_expire_direct(struct
autofs_point *ap, autofs_packet_expire_di
char buf[MAX_ERR_BUF];
pthread_t thid;
struct timespec wait;
- struct timeval now;
+ struct timespec now;
int status, state;
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &state);
@@ -1159,9 +1159,9 @@ int handle_packet_expire_direct(struct autofs_point *ap, autofs_packet_expire_di
mt->signaled = 0;
while (!mt->signaled) {
- gettimeofday(&now, NULL);
+ clock_gettime(CLOCK_MONOTONIC, &now);
wait.tv_sec = now.tv_sec + 2;
- wait.tv_nsec = now.tv_usec * 1000;
+ wait.tv_nsec = now.tv_nsec;
status = pthread_cond_timedwait(&mt->cond, &mt->mutex, &wait); if (status && status != ETIMEDOUT)
fatal(status);
@@ -1296,7 +1296,7 @@ int handle_packet_missing_direct(struct autofs_point *ap, autofs_packet_missing_
char buf[MAX_ERR_BUF];
int status = 0;
struct timespec wait;
- struct timeval now;
+ struct timespec now;
int ioctlfd, len, state;
unsigned int kver_major = get_kver_major();
unsigned int kver_minor = get_kver_minor();
@@ -1388,7 +1388,7 @@ int handle_packet_missing_direct(struct autofs_point *ap, autofs_packet_missing_
}
/* Check if we recorded a mount fail for this key */
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) { ops->send_fail(ap->logopt,
ioctlfd, pkt->wait_queue_token, -ENOENT);
ops->close(ap->logopt, ioctlfd);
@@ -1478,9 +1478,9 @@ int handle_packet_missing_direct(struct autofs_point *ap, autofs_packet_missing_
mt->signaled = 0;
while (!mt->signaled) {
- gettimeofday(&now, NULL);
+ clock_gettime(CLOCK_MONOTONIC, &now);
wait.tv_sec = now.tv_sec + 2;
- wait.tv_nsec = now.tv_usec * 1000;
+ wait.tv_nsec = now.tv_nsec;
status = pthread_cond_timedwait(&mt->cond, &mt->mutex, &wait); if (status && status != ETIMEDOUT)
fatal(status);
daemon/indirect.c +1 -1
@@ -197,7 +197,7 @@ out_err:int mount_autofs_indirect (struct autofs_point *ap,const char *root) { -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );int status;int map;
@@ -636,7 +636,7 @@ int handle_packet_expire_indirect(struct
autofs_point *ap, autofs_packet_expire_
char buf[MAX_ERR_BUF];
pthread_t thid;
struct timespec wait;
- struct timeval now;
+ struct timespec now;
int status, state;
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &state);
@@ -691,9 +691,9 @@ int handle_packet_expire_indirect(struct autofs_point *ap, autofs_packet_expire_
mt->signaled = 0;
while (!mt->signaled) {
- gettimeofday(&now, NULL);
+ clock_gettime(CLOCK_MONOTONIC, &now);
wait.tv_sec = now.tv_sec + 2;
- wait.tv_nsec = now.tv_usec * 1000;
+ wait.tv_nsec = now.tv_nsec;
status = pthread_cond_timedwait(&mt->cond, &mt->mutex, &wait); if (status && status != ETIMEDOUT)
fatal(status);
@@ -795,7 +795,7 @@ int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missin
char buf[MAX_ERR_BUF];
struct pending_args *mt;
struct timespec wait;
- struct timeval now;
+ struct timespec now;
struct mapent *me;
int status, state;
@@ -818,7 +818,7 @@ int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missin
/* Check if we recorded a mount fail for this key anywhere */ me = lookup_source_mapent(ap, pkt->name, LKP_DISTINCT); if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) { ops->send_fail(ap->logopt, ap->ioctlfd,
pkt->wait_queue_token, -ENOENT);
cache_unlock(me->mc);
@@ -884,9 +884,9 @@ int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missin
mt->signaled = 0;
while (!mt->signaled) {
- gettimeofday(&now, NULL);
+ clock_gettime(CLOCK_MONOTONIC, &now);
wait.tv_sec = now.tv_sec + 2;
- wait.tv_nsec = now.tv_usec * 1000;
+ wait.tv_nsec = now.tv_nsec;
status = pthread_cond_timedwait(&mt->cond, &mt->mutex, &wait); if (status && status != ETIMEDOUT)
fatal(status);
daemon/lookup.c +0 -0
@@ -875,7 +875,7 @@ static int lookup_name_file_source_instance(struct
autofs_point *ap, struct map_
struct map_source *instance;
char src_file[] = "file";
char src_prog[] = "program";
- time_t age = time(NULL);
+ time_t age = monotonic_time(NULL);
struct stat st;
char *type, *format;
@@ -915,7 +915,7 @@ static int lookup_name_source_instance(struct autofs_point *ap, struct map_sourc
{
struct map_source *instance;
const char *format;
- time_t age = time(NULL);
+ time_t age = monotonic_time(NULL);
if (*name == '/' && map->flags & MAP_FLAG_FORMAT_AMD) return lookup_amd_instance(ap, map, name, name_len);
@@ -1079,7 +1079,7 @@ static void update_negative_cache(struct autofs_point *ap, struct map_source *so
else
map = entry->maps;
if (map) {
- time_t now = time(NULL);
+ time_t now = monotonic_time(NULL);
int rv = CHE_FAIL;
cache_writelock(map->mc);
daemon/state.c +1 -1
@@ -553,7 +553,7 @@ static unsigned int st_readmap(struct autofs_point *ap)pthread_t thid;struct readmap_args *ra;int status; -int now =time (NULL ); +int now =monotonic_time (NULL );debug (ap->logopt,"state %d path %s" , ap->state, ap->path);
include/automount.h +9 -0
@@ -565,6 +565,15 @@ do { \fatal (_m_unlock); \ }while (0 ) +static inline time_t monotonic_time(time_t *t) +{ +struct timespec ts; +clock_gettime (CLOCK_MONOTONIC , &ts); +if (t) + *t = (time_t ) ts.tv_sec; +return (time_t ) ts.tv_sec; +} +/* Expire alarm handling routines */ int alarm_start_handler (void );int alarm_add (struct autofs_point *ap,time_t seconds);
include/rpc_subs.h +0 -0
@@ -71,6 +71,7 @@ int rpc_portmap_getport(struct conn_info *, struct
pmap *, unsigned short *);
int rpc_ping_proto(struct conn_info *);
int rpc_ping(const char *, long, long, unsigned int); double elapsed(struct timeval, struct timeval);
+double monotonic_elapsed(struct timespec, struct timespec);
int rpc_time(const char *, unsigned int, unsigned int, long, long,
unsigned int, double *);
const char *get_addr_string(struct sockaddr *, char *, socklen_t);
lib/alarm.c +17 -6
@@ -23,7 +23,7 @@ struct alarm { };static pthread_mutex_t mutex =PTHREAD_MUTEX_INITIALIZER ; -static pthread_cond_t cond =PTHREAD_COND_INITIALIZER ; +static pthread_cond_t cond;static LIST_HEAD (alarms);#define alarm_lock () \
@@ -46,7 +46,7 @@ int alarm_add(struct autofs_point *ap, time_t seconds)struct list_head *head;struct list_head *p;struct alarm *new; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t next_alarm =0 ;unsigned int empty =1 ;int status;
@@ -175,17 +175,17 @@ static void *alarm_handler(void *arg) first = list_entry(head->next, struct alarm, list); - now =time (NULL ); + now =monotonic_time (NULL );if (first->time > now) { -struct timeval usecs; +struct timespec nsecs;/* * Wait for alarm to trigger or a new alarm * to be added. */ -gettimeofday (&usecs,NULL ); +clock_gettime (CLOCK_MONOTONIC , &nsecs); expire.tv_sec = first->time; - expire.tv_nsec = usecs.tv_usec *1000 ; + expire.tv_nsec = nsecs.tv_nsec; status =pthread_cond_timedwait (&cond, &mutex, &expire);if (status && status !=ETIMEDOUT )
@@ -212,6 +212,7 @@ int alarm_start_handler(void)pthread_t thid;pthread_attr_t attrs;pthread_attr_t *pattrs = &attrs; +pthread_condattr_t condattrs;int status; status =pthread_attr_init (pattrs);
@@ -224,8 +225,18 @@ int alarm_start_handler(void)#endif } + status =pthread_condattr_init (&condattrs); +if (status) +fatal (status); + +pthread_condattr_setclock (&condattrs,CLOCK_MONOTONIC ); +pthread_cond_init (&cond, &condattrs); + status =pthread_create (&thid, pattrs, alarm_handler,NULL ); +pthread_condattr_destroy (&condattrs); +pthread_condattr_destroy (&cond); +if (pattrs)pthread_attr_destroy (pattrs);
lib/cache.c +1 -1
@@ -775,7 +775,7 @@ void cache_update_negative(struct mapent_cache *mc, struct map_source *ms, const char *key, time_t timeout) { - time_t now = time(NULL); + time_t now = monotonic_time(NULL);struct mapent *me;int rv =CHE_OK ;
lib/master.c +0 -0
@@ -1483,7 +1483,7 @@ int dump_map(struct master *master, const char
*type, const char *name)
struct map_source *source;
struct master_mapent *this;
struct autofs_point *ap;
- time_t now = time(NULL);
+ time_t now = monotonic_time(NULL);
this = list_entry(p, struct master_mapent, list);
p = p->next;
@@ -1601,7 +1601,7 @@ int master_show_mounts(struct master *master)
struct map_source *source;
struct master_mapent *this;
struct autofs_point *ap;
- time_t now = time(NULL);
+ time_t now = monotonic_time(NULL);
unsigned int count = 0;
this = list_entry(p, struct master_mapent, list);
lib/rpc_subs.c +12 -5
@@ -1086,25 +1086,32 @@ double elapsed(struct timeval start, struct timeval end)return t2-t1; } +double monotonic_elapsed (struct timespec start,struct timespec end) +{ +double t1, t2; + t1 = (double )start.tv_sec + (double )start.tv_nsec/(1000 *1000 *1000 ); + t2 = (double )end.tv_sec + (double )end.tv_nsec/(1000 *1000 *1000 ); +return t2-t1; +} +int rpc_time (const char *host,unsigned int ping_vers,unsigned int ping_proto,long seconds,long micros,unsigned int option,double *result) {int status;double taken; -struct timeval start, end; -struct timezone tz; +struct timespec start, end;int proto = (ping_proto &RPC_PING_UDP ) ?IPPROTO_UDP :IPPROTO_TCP ;unsigned long vers = ping_vers; -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =__rpc_ping (host, vers, proto, seconds, micros, option); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status ==RPC_PING_FAIL || status <0 )return status; - taken =elapsed (start, end); + taken =monotonic_elapsed (start, end);if (result !=NULL ) *result = taken;
modules/dclist.c +0 -0
@@ -568,7 +568,7 @@ struct dclist *get_dc_list(unsigned int logopt,
const char *uri)
if (!list)
goto out_error;
- dclist->expire = time(NULL) + min_ttl;
+ dclist->expire = monotonic_time(NULL) + min_ttl; dclist->uri = list;
return dclist;
modules/lookup_file.c +3 -3
@@ -743,7 +743,7 @@ static int match_key(struct autofs_point *ap, {char buf[MAX_ERR_BUF ];struct mapent_cache *mc; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char *lkp_key;char *prefix;size_t map_key_len;
@@ -808,7 +808,7 @@ static int lookup_one(struct autofs_point *ap,struct mapent_cache *mc = source->mc;char mkey[KEY_MAX_LEN +1 ];char mapent[MAPENT_MAX_LEN +1 ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );FILE *f;unsigned int k_len, m_len;int entry, ret;
@@ -914,7 +914,7 @@ static int lookup_wild(struct autofs_point *ap,struct mapent_cache *mc;char mkey[KEY_MAX_LEN +1 ];char mapent[MAPENT_MAX_LEN +1 ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );FILE *f;unsigned int k_len, m_len;int entry, ret;
@@ -1118,7 +1118,7 @@ int lookup_mount(struct autofs_point *ap, const
char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me = lookup_source_mapent(ap, key, LKP_DISTINCT); if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) { cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
modules/lookup_hesiod.c +2 -2
@@ -163,7 +163,7 @@ static int lookup_one(struct autofs_point *ap, }cache_writelock (mc); - ret =cache_update (mc, source, key, best_record,time (NULL )); + ret =cache_update (mc, source, key, best_record,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {hesiod_free_list (ctxt->hesiod_context, hes_result);
@@ -228,7 +228,7 @@ static int lookup_one_amd(struct autofs_point *ap, }cache_writelock (mc); - ret =cache_update (mc, source, lkp_key, *hes_result,time (NULL )); + ret =cache_update (mc, source, lkp_key, *hes_result,monotonic_time (NULL ));cache_unlock (mc);if (hes_result)
@@ -339,7 +339,7 @@ int lookup_mount(struct autofs_point *ap, const
char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me = lookup_source_mapent(ap, name, LKP_DISTINCT); if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) { cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
modules/lookup_hosts.c +0 -0
@@ -284,7 +284,7 @@ int lookup_mount(struct autofs_point *ap, const
char *name, int name_len, void *
struct mapent *me;
char *mapent = NULL;
int mapent_len;
- time_t now = time(NULL);
+ time_t now = monotonic_time(NULL);
int ret;
source = ap->entry->current;
@@ -296,7 +296,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me = lookup_source_mapent(ap, name, LKP_DISTINCT);
if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) { cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
modules/lookup_ldap.c +0 -0
@@ -944,7 +944,7 @@ static LDAP *do_reconnect(unsigned logopt, struct
lookup_context *ctxt)
uris_mutex_lock(ctxt);
if (ctxt->dclist) {
- if (!ldap || ctxt->dclist->expire < time(NULL)) {
+ if (!ldap || ctxt->dclist->expire < monotonic_time(NULL)) { free_dclist(ctxt->dclist);
ctxt->dclist = NULL;
}
@@ -2851,7 +2851,7 @@ static int lookup_one(struct autofs_point *ap, struct map_source *source,
struct mapent_cache *mc;
int rv, i, l, ql, count;
char buf[MAX_ERR_BUF];
- time_t age = time(NULL);
+ time_t age = monotonic_time(NULL);
char *query;
LDAPMessage *result = NULL, *e;
char *class, *info, *entry;
@@ -3214,7 +3214,7 @@ static int lookup_one_amd(struct autofs_point *ap,
struct berval **bvKey;
struct berval **bvValues;
char buf[MAX_ERR_BUF];
- time_t age = time(NULL);
+ time_t age = monotonic_time(NULL);
int rv, l, ql, count;
int ret = CHE_MISSING;
@@ -3417,7 +3417,7 @@ static int check_map_indirect(struct autofs_point *ap,
unsigned int is_amd_format = source->flags & MAP_FLAG_FORMAT_AMD; struct mapent_cache *mc;
struct mapent *me;
- time_t now = time(NULL);
+ time_t now = monotonic_time(NULL);
time_t t_last_read;
int ret, cur_state;
int status;
@@ -3555,7 +3555,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me = lookup_source_mapent(ap, key, LKP_DISTINCT);
if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) { cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
modules/lookup_nisplus.c +4 -4
@@ -288,7 +288,7 @@ static int lookup_one(struct autofs_point *ap,nis_result *result;nis_object *this;char *mapent; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret, cur_state;char buf[MAX_ERR_BUF ];
@@ -400,7 +400,7 @@ static int lookup_wild(struct autofs_point *ap,nis_result *result;nis_object *this;char *mapent; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret, cur_state;char buf[MAX_ERR_BUF ];
@@ -487,7 +487,7 @@ static int lookup_amd_defaults(struct autofs_point *ap, mapent =ENTRY_VAL (this,1 );cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , mapent,time (NULL )); + ret =cache_update (mc, source,"/defaults" , mapent,monotonic_time (NULL ));cache_unlock (mc);nis_freeresult (result);
@@ -505,7 +505,7 @@ static int check_map_indirect(struct autofs_point *ap,unsigned int is_amd_format = source->flags &MAP_FLAG_FORMAT_AMD ;struct mapent_cache *mc;struct mapent *me, *exists; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret =0 ;
@@ -650,7 +650,7 @@ int lookup_mount(struct autofs_point *ap, const
char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me = lookup_source_mapent(ap, key, LKP_DISTINCT); if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) { cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
modules/lookup_program.c +3 -3
@@ -369,7 +369,7 @@ static int lookup_amd_defaults(struct autofs_point *ap,while (isblank (*start)) start++;cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , start,time (NULL )); + ret =cache_update (mc, source,"/defaults" , start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (ment);
@@ -438,7 +438,7 @@ static int match_key(struct autofs_point *ap, start++; }cache_writelock (mc); - ret =cache_update (mc, source, lkp_key, start,time (NULL )); + ret =cache_update (mc, source, lkp_key, start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (ment);
@@ -491,7 +491,7 @@ static int match_key(struct autofs_point *ap,while (isblank (*start)) start++;cache_writelock (mc); - ret =cache_update (mc, source, match, start,time (NULL )); + ret =cache_update (mc, source, match, start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (match);
@@ -537,7 +537,7 @@ int lookup_mount(struct autofs_point *ap, const
char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me = lookup_source_mapent(ap, name, LKP_DISTINCT);
if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) { cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
@@ -586,7 +586,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
* proceed with the program map lookup.
*/
if (strchr(name, '/') ||
- me->age + ap->negative_timeout > time(NULL)) {
+ me->age + ap->negative_timeout > monotonic_time(NULL)) {
char *ent = NULL;
if (me->mapent) {
modules/lookup_sss.c +2 -2
@@ -374,7 +374,7 @@ static int lookup_one(struct autofs_point *ap,struct mapent_cache *mc;struct mapent *we;void *sss_ctxt =NULL ; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char buf[MAX_ERR_BUF ];char *value =NULL ;char *s_key;
@@ -491,7 +491,7 @@ static int check_map_indirect(struct autofs_point *ap,struct map_source *source;struct mapent_cache *mc;struct mapent *me; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret, cur_state;
@@ -585,7 +585,7 @@ int lookup_mount(struct autofs_point *ap, const
char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me = lookup_source_mapent(ap, key, LKP_DISTINCT); if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) { cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
modules/lookup_userhome.c +0 -0
@@ -77,7 +77,7 @@ int lookup_mount(struct autofs_point *ap, const char
*name, int name_len, void *
}
cache_writelock(mc);
- ret = cache_update(mc, source, name, NULL, time(NULL));
+ ret = cache_update(mc, source, name, NULL, monotonic_time(NULL)); cache_unlock(mc);
if (ret == CHE_FAIL) {
modules/lookup_yp.c +3 -3
@@ -405,7 +405,7 @@ static int lookup_one(struct autofs_point *ap,char *mapname;char *mapent;int mapent_len; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret; mc = source->mc;
@@ -517,7 +517,7 @@ static int lookup_wild(struct autofs_point *ap,char *mapname;char *mapent;int mapent_len; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret; mc = source->mc;
@@ -598,7 +598,7 @@ static int lookup_amd_defaults(struct autofs_point *ap,return CHE_FAIL ;cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , mapent,time (NULL )); + ret =cache_update (mc, source,"/defaults" , mapent,monotonic_time (NULL ));cache_unlock (mc);return ret;
@@ -753,7 +753,7 @@ int lookup_mount(struct autofs_point *ap, const
char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me = lookup_source_mapent(ap, key, LKP_DISTINCT); if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) { cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
modules/mount_autofs.c +0 -0
@@ -242,7 +242,7 @@ int mount_mount(struct autofs_point *ap, const
char *root, const char *name,
source = master_add_map_source(entry,
info->type, info->format,
- time(NULL), argc, argv);
+ monotonic_time(NULL), argc, argv);
if (!source) {
error(ap->logopt,
MODPREFIX "failed to add map source to entry");
modules/parse_amd.c +0 -0
@@ -1181,7 +1181,7 @@ static int do_host_mount(struct autofs_point
*ap, const char *name,
"hosts", "sun", argc, pargv);
if (!instance) {
instance = master_add_source_instance(source,
- "hosts", "sun", time(NULL), argc, pargv);
+ "hosts", "sun", monotonic_time(NULL), argc, pargv); if (!instance) {
error(ap->logopt, MODPREFIX
"failed to create source instance for hosts map");
modules/replicated.c +2 -2
@@ -69,14 +69,14 @@ void seed_random(void) fd =open_fd ("/dev/urandom" ,O_RDONLY );if (fd <0 ) { -srandom (time (NULL )); +srandom (monotonic_time (NULL ));return ; }if (read (fd, &seed,sizeof (seed)) !=-1 )srandom (seed);else -srandom (time (NULL )); +srandom (monotonic_time (NULL ));close (fd);
@@ -231,8 +231,7 @@ static unsigned int get_nfs_info(unsigned logopt,
struct host *host,
socklen_t len = INET6_ADDRSTRLEN;
char buf[len + 1];
struct pmap parms;
- struct timeval start, end;
- struct timezone tz;
+ struct timespec start, end;
unsigned int supported = 0;
double taken = 0;
int status, count = 0;
@@ -292,9 +291,9 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host,
supported = status;
goto done_ver;
} else if (!status) {
- gettimeofday(&start, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &start);
status = rpc_ping_proto(rpc_info);
- gettimeofday(&end, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &end);
if (status == -ETIMEDOUT) {
supported = status;
goto done_ver;
@@ -306,7 +305,7 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host,
debug(logopt,
"nfs v4 random selection time: %f", reply);
} else {
- reply = elapsed(start, end);
+ reply = monotonic_elapsed(start, end); debug(logopt, "nfs v4 rpc ping time: %f", reply); }
taken += reply;
@@ -351,9 +350,9 @@ v3_ver:
supported = status;
goto done_ver;
} else if (!status) {
- gettimeofday(&start, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &start); status = rpc_ping_proto(rpc_info);
- gettimeofday(&end, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &end);
if (status == -ETIMEDOUT) {
supported = status;
goto done_ver;
@@ -365,7 +364,7 @@ v3_ver:
debug(logopt,
"nfs v3 random selection time: %f", reply);
} else {
- reply = elapsed(start, end);
+ reply = monotonic_elapsed(start, end); debug(logopt, "nfs v3 rpc ping time: %f", reply); }
taken += reply;
@@ -407,9 +406,9 @@ v2_ver:
supported = status;
goto done_ver;
} else if (!status) {
- gettimeofday(&start, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &start); status = rpc_ping_proto(rpc_info);
- gettimeofday(&end, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &end);
if (status == -ETIMEDOUT)
supported = status;
else if (status > 0) {
@@ -420,7 +419,7 @@ v2_ver:
debug(logopt,
"nfs v2 random selection time: %f", reply);
} else {
- reply = elapsed(start, end);;
+ reply = monotonic_elapsed(start, end);;
debug(logopt, "nfs v2 rpc ping time: %f", reply);
}
taken += reply;
@@ -523,8 +522,7 @@ static int get_supported_ver_and_cost(unsigned logopt, struct host *host,
struct conn_info pm_info, rpc_info;
int proto;
unsigned int vers;
- struct timeval start, end;
- struct timezone tz;
+ struct timespec start, end;
double taken = 0;
time_t timeout = RPC_TIMEOUT;
int status = 0;
@@ -610,16 +608,16 @@ static int get_supported_ver_and_cost(unsigned logopt, struct host *host,
if (status == -EHOSTUNREACH)
goto done;
else if (!status) {
- gettimeofday(&start, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &start);
status = rpc_ping_proto(&rpc_info);
- gettimeofday(&end, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &end);
if (status > 0) {
if (random_selection) {
/* Random value between 0 and 1 */
taken = ((float) random())/((float) RAND_MAX+1); debug(logopt, "random selection time %f", taken);
} else {
- taken = elapsed(start, end);
+ taken = monotonic_elapsed(start, end);
debug(logopt, "rpc ping time %f", taken);
}
}
Signature · 1 line
1.9.1
Quoted 32 lines · Ning Yu
Hi,
A auto mounted directory won't be automatically unmounted after a system date/time change, for example we can reproduce the issue with below steps in 100% failrate:
$ cat /etc/auto.master /mnt /etc/auto.misc$ cat /etc/auto.misc removable -fstype=auto :/dev/sdb1### now plugin a usb pendrive
$ cd /mnt/removable $ sudo date -s "+1 year" $ sleep 1 $ sudo date -s "-1 year" $ cdNow
/mnt/removablewill not be automatically unmounted, the root cause is that autofs usesgettimeofday()to identify the timestamp and calculate the delta for timeouts, however as mentioned in the manpage:``` NOTES The time returned by gettimeofday() is affected by discontinuous jumps in the system time (e.g., if the system administrator manually changes the system time). If you need a monotonically increasing clock, see clock_gettime(2). ```
Quoted 5 lines
So in the above reproducer autofs will wait for a one-year-long timeout to unmount
/mnt/removable.BR
Ning
--
To unsubscribe from this list: send the line "unsubscribe autofs" in
Ian Kent
maintainerQuoted 6 lines · Ning Yu
Hi,
I have composed a patch for this issue, it works in my side, what it does is replacing
gettimeofday()withclock_gettime(CLOCK_MONOTONIC).Would anyone please help to review it? Thanks in advance.
Are you joking!
How is this meant to apply to the current source, it won't.
If you can manage to post a sane patch you will need to break it up into a few separate standalone patches with sane explanations of what each one is meant to achieve.
Quoted 10 lines
From
cdb2bcd563420cd39af199309e8c0c7fc45a7bd1Mon Sep 17 00:00:00 2001
From: Yu Ning <[email protected]>
Date: Wed, 16 Sep 2015 15:56:21 +0800
Subject: [PATCH] Useclock_gettime()instead ofgettimeofday().This patch is to fix the issue that a mount point may not be automatically unmounted after a system date/time change.
Reproducer with 100% failrate:
Since of you to hammer the result of the problem you've identified rather than just explain the problem and what needs to be done to resolve it in a polite and sensible manner.
Quoted 956 lines
$ cat /etc/auto.master /mnt /etc/auto.misc$ cat /etc/auto.misc removable -fstype=auto :/dev/sdb1### now plugin a usb pendrive
$ cd
/mnt/removable
$ sudo date -s "+1 year"
$ sleep 1
$ sudo date -s "-1 year"
$ cd
/mnt/removablewill not be automatically unmounted.The root cause is that autofs uses
gettimeofday()to identify the timestamp and calculate the timeouts, however as mentioned in the manpage:NOTES
The time returned bygettimeofday()is affected by
discontinuous jumps
in the system time (e.g., if the system administrator
manually changes
the system time). If you need a monotonically increasing
clock, seeclock_gettime(2).So we can fix the issue by replacing
gettimeofday()withclock_gettime(CLOCK_MONOTONIC).--- daemon/automount.c | 4 ++-- daemon/direct.c | 16 ++++++++-------- daemon/indirect.c | 16 ++++++++-------- daemon/lookup.c | 6 +++--- daemon/state.c | 2 +- include/automount.h | 9 +++++++++ include/rpc_subs.h | 1 + lib/alarm.c | 23 +++++++++++++++++------ lib/cache.c | 2 +- lib/master.c | 4 ++-- lib/rpc_subs.c | 17 ++++++++++++----- modules/dclist.c | 2 +- modules/lookup_file.c | 8 ++++---- modules/lookup_hesiod.c | 6 +++--- modules/lookup_hosts.c | 4 ++-- modules/lookup_ldap.c | 10 +++++----- modules/lookup_nisplus.c | 10 +++++----- modules/lookup_program.c | 10 +++++----- modules/lookup_sss.c | 6 +++--- modules/lookup_userhome.c | 2 +- modules/lookup_yp.c | 8 ++++---- modules/mount_autofs.c | 2 +- modules/parse_amd.c | 2 +- modules/replicated.c | 34 ++++++++++++++++------------------ 24 files changed, 115 insertions(+), 89 deletions(-)daemon/automount.c +2
-2@@ -1454,7 +1454,7 @@ static void *statemachine(void *arg)break ;case SIGHUP : -do_hup_signal (master_list,time (NULL )); +do_hup_signal (master_list,monotonic_time (NULL ));break ;default :@@ -2004,7 +2004,7 @@ int main(int argc, char *argv[])unsigned ghost, logging, daemon_check;unsigned dumpmaps, foreground, have_global_options;time_t timeout; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );struct rlimit rlim;const char *options ="+hp:t:vmdD:fVrO:l:n:CF" ;static const struct option long_options[] = {daemon/direct.c +1
-1@@ -464,7 +464,7 @@ int mount_autofs_direct(struct autofs_point *ap)struct mapent_cache *nc, *mc;struct mapent *me, *ne, *nested;struct mnt_list *mnts; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );if (strcmp (ap->path,"/-" )) {error (ap->logopt,"expected direct map, exiting" );@@ -1041,7 +1041,7 @@ int handle_packet_expire_direct(struct
autofs_point*ap,autofs_packet_expire_di
char buf[MAX_ERR_BUF];
pthread_tthid;
struct timespec wait;
- struct timeval now;
+ struct timespec now;
int status, state;pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &state);daemon/direct.c +0
-0@@ -1159,9 +1159,9 @@ int handle_packet_expire_direct(struct
autofs_point*ap,autofs_packet_expire_di
mt->signaled= 0;
while (!mt->signaled) {
-gettimeofday(&now, NULL);
+clock_gettime(CLOCK_MONOTONIC, &now);
wait.tv_sec = now.tv_sec + 2;
- wait.tv_nsec = now.tv_usec * 1000;
+ wait.tv_nsec = now.tv_nsec;
status =pthread_cond_timedwait(&mt->cond, &mt->mutex, &wait); if (status && status != ETIMEDOUT)
fatal(status);daemon/direct.c +0
-0@@ -1296,7 +1296,7 @@ int handle_packet_missing_direct(struct
autofs_point*ap,autofs_packet_missing_
char buf[MAX_ERR_BUF];
int status = 0;
struct timespec wait;
- struct timeval now;
+ struct timespec now;
int ioctlfd, len, state;
unsigned intkver_major=get_kver_major();
unsigned intkver_minor=get_kver_minor();daemon/direct.c +0
-0@@ -1388,7 +1388,7 @@ int handle_packet_missing_direct(struct
autofs_point*ap,autofs_packet_missing_
}/* Check if we recorded a mount fail for this key */
- if (me->status>= time(NULL)) {
+ if (me->status>=monotonic_time(NULL)) { ops->send_fail(ap->logopt,ioctlfd, pkt->wait_queue_token, -ENOENT);
ops->close(ap->logopt, ioctlfd);daemon/direct.c +0
-0@@ -1478,9 +1478,9 @@ int handle_packet_missing_direct(struct
autofs_point*ap,autofs_packet_missing_
mt->signaled= 0;
while (!mt->signaled) {
-gettimeofday(&now, NULL);
+clock_gettime(CLOCK_MONOTONIC, &now);
wait.tv_sec = now.tv_sec + 2;
- wait.tv_nsec = now.tv_usec * 1000;
+ wait.tv_nsec = now.tv_nsec;
status =pthread_cond_timedwait(&mt->cond, &mt->mutex, &wait); if (status && status != ETIMEDOUT)
fatal(status);daemon/indirect.c +1
-1@@ -197,7 +197,7 @@ out_err:int mount_autofs_indirect (struct autofs_point *ap,const char *root) { -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );int status;int map;@@ -636,7 +636,7 @@ int handle_packet_expire_indirect(struct
autofs_point*ap,autofs_packet_expire_
char buf[MAX_ERR_BUF];
pthread_tthid;
struct timespec wait;
- struct timeval now;
+ struct timespec now;
int status, state;pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &state);daemon/indirect.c +0
-0@@ -691,9 +691,9 @@ int handle_packet_expire_indirect(struct
autofs_point*ap,autofs_packet_expire_
mt->signaled= 0;
while (!mt->signaled) {
-gettimeofday(&now, NULL);
+clock_gettime(CLOCK_MONOTONIC, &now);
wait.tv_sec = now.tv_sec + 2;
- wait.tv_nsec = now.tv_usec * 1000;
+ wait.tv_nsec = now.tv_nsec;
status =pthread_cond_timedwait(&mt->cond, &mt->mutex, &wait); if (status && status != ETIMEDOUT)
fatal(status);daemon/indirect.c +0
-0@@ -795,7 +795,7 @@ int handle_packet_missing_indirect(struct
autofs_point*ap,autofs_packet_missin
char buf[MAX_ERR_BUF];
structpending_args*mt;
struct timespec wait;
- struct timeval now;
+ struct timespec now;
struct mapent *me;
int status, state;daemon/indirect.c +0
-0@@ -818,7 +818,7 @@ int handle_packet_missing_indirect(struct
autofs_point*ap,autofs_packet_missin
/* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent(ap, pkt->name, LKP_DISTINCT); if (me) {
- if (me->status>= time(NULL)) {
+ if (me->status>=monotonic_time(NULL)) { ops->send_fail(ap->logopt,ap->ioctlfd,pkt->wait_queue_token, -ENOENT);
cache_unlock(me->mc);daemon/indirect.c +0
-0@@ -884,9 +884,9 @@ int handle_packet_missing_indirect(struct
autofs_point*ap,autofs_packet_missin
mt->signaled= 0;
while (!mt->signaled) {
-gettimeofday(&now, NULL);
+clock_gettime(CLOCK_MONOTONIC, &now);
wait.tv_sec = now.tv_sec + 2;
- wait.tv_nsec = now.tv_usec * 1000;
+ wait.tv_nsec = now.tv_nsec;
status =pthread_cond_timedwait(&mt->cond, &mt->mutex, &wait); if (status && status != ETIMEDOUT)
fatal(status);daemon/lookup.c +0
-0@@ -875,7 +875,7 @@ static int lookup_name_file_source_instance(struct
autofs_point*ap, structmap_
structmap_source*instance;
char src_file[] = "file";
char src_prog[] = "program";
-time_tage = time(NULL);
+time_tage =monotonic_time(NULL);
struct stat st;
char *type, *format;daemon/lookup.c +0
-0@@ -915,7 +915,7 @@ static int lookup_name_source_instance(struct
autofs_point*ap, structmap_sourc
{
structmap_source*instance;
const char *format;
-time_tage = time(NULL);
+time_tage =monotonic_time(NULL);if (*name == '/' && map->flags & MAP_FLAG_FORMAT_AMD) return lookup_amd_instance(ap, map, name, name_len);daemon/lookup.c +0
-0@@ -1079,7 +1079,7 @@ static void update_negative_cache(struct
autofs_point*ap, structmap_source*so
else
map =entry->maps;
if (map) {
-time_tnow = time(NULL);
+time_tnow =monotonic_time(NULL);
int rv =CHE_FAIL;cache_writelock(map->mc);daemon/state.c +1
-1@@ -553,7 +553,7 @@ static unsigned int st_readmap(struct autofs_point *ap)pthread_t thid;struct readmap_args *ra;int status; -int now =time (NULL ); +int now =monotonic_time (NULL );debug (ap->logopt,"state %d path %s" , ap->state, ap->path);include/automount.h +9
-0@@ -565,6 +565,15 @@ do { \fatal (_m_unlock); \ }while (0 ) +static inline time_t monotonic_time(time_t *t) +{ +struct timespec ts; +clock_gettime (CLOCK_MONOTONIC , &ts); +if (t) + *t = (time_t ) ts.tv_sec; +return (time_t ) ts.tv_sec; +} +/* Expire alarm handling routines */ int alarm_start_handler (void );int alarm_add (struct autofs_point *ap,time_t seconds);include/rpc_subs.h +1
-0@@ -71,6 +71,7 @@ int rpc_portmap_getport(struct conn_info *, struct pmap *, unsigned short *);int rpc_ping_proto (struct conn_info *);int rpc_ping (const char *,long ,long ,unsigned int );double elapsed (struct timeval ,struct timeval ); +double monotonic_elapsed (struct timespec ,struct timespec );int rpc_time (const char *,unsigned int ,unsigned int ,long ,long ,unsigned int ,double *);const char *get_addr_string(struct sockaddr *, char *,
socklen_t);lib/alarm.c +17
-6@@ -23,7 +23,7 @@ struct alarm { };static pthread_mutex_t mutex =PTHREAD_MUTEX_INITIALIZER ; -static pthread_cond_t cond =PTHREAD_COND_INITIALIZER ; +static pthread_cond_t cond;static LIST_HEAD (alarms);#define alarm_lock () \@@ -46,7 +46,7 @@ int alarm_add(struct autofs_point *ap, time_t seconds)struct list_head *head;struct list_head *p;struct alarm *new; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t next_alarm =0 ;unsigned int empty =1 ;int status;@@ -175,17 +175,17 @@ static void *alarm_handler(void *arg) first = list_entry(head->next, struct alarm, list); - now =time (NULL ); + now =monotonic_time (NULL );if (first->time > now) { -struct timeval usecs; +struct timespec nsecs;/* * Wait for alarm to trigger or a new alarm * to be added. */ -gettimeofday (&usecs,NULL ); +clock_gettime (CLOCK_MONOTONIC , &nsecs); expire.tv_sec = first->time; - expire.tv_nsec = usecs.tv_usec *1000 ; + expire.tv_nsec = nsecs.tv_nsec; status =pthread_cond_timedwait (&cond, &mutex, &expire);if (status && status !=ETIMEDOUT )@@ -212,6 +212,7 @@ int alarm_start_handler(void)pthread_t thid;pthread_attr_t attrs;pthread_attr_t *pattrs = &attrs; +pthread_condattr_t condattrs;int status; status =pthread_attr_init (pattrs);@@ -224,8 +225,18 @@ int alarm_start_handler(void)#endif } + status =pthread_condattr_init (&condattrs); +if (status) +fatal (status); + +pthread_condattr_setclock (&condattrs,CLOCK_MONOTONIC ); +pthread_cond_init (&cond, &condattrs); + status =pthread_create (&thid, pattrs, alarm_handler,NULL ); +pthread_condattr_destroy (&condattrs); +pthread_condattr_destroy (&cond); +if (pattrs)pthread_attr_destroy (pattrs);lib/cache.c +1
-1@@ -775,7 +775,7 @@ void cache_update_negative(struct mapent_cache *mc, struct map_source *ms, const char *key, time_t timeout) { - time_t now = time(NULL); + time_t now = monotonic_time(NULL);struct mapent *me;int rv =CHE_OK ;lib/master.c +1
-1@@ -1483,7 +1483,7 @@ int dump_map(struct master *master, const char *type, const char *name)struct map_source *source;struct master_mapent *this;struct autofs_point *ap; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL ); this = list_entry(p, struct master_mapent, list);p = p->next;lib/master.c +1
-1@@ -1601,7 +1601,7 @@ int master_show_mounts(struct master *master)struct map_source *source;struct master_mapent *this;struct autofs_point *ap; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );unsigned int count =0 ; this = list_entry(p, struct master_mapent, list);lib/rpc_subs.c +12
-5@@ -1086,25 +1086,32 @@ double elapsed(struct timeval start, struct timeval end)return t2-t1; } +double monotonic_elapsed (struct timespec start,struct timespec end) +{ +double t1, t2; + t1 = (double )start.tv_sec + (double )start.tv_nsec/(1000 *1000 *1000 ); + t2 = (double )end.tv_sec + (double )end.tv_nsec/(1000 *1000 *1000 ); +return t2-t1; +} +int rpc_time (const char *host,unsigned int ping_vers,unsigned int ping_proto,long seconds,long micros,unsigned int option,double *result) {int status;double taken; -struct timeval start, end; -struct timezone tz; +struct timespec start, end;int proto = (ping_proto &RPC_PING_UDP ) ?IPPROTO_UDP :IPPROTO_TCP ;unsigned long vers = ping_vers; -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =__rpc_ping (host, vers, proto, seconds, micros, option); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status ==RPC_PING_FAIL || status <0 )return status; - taken =elapsed (start, end); + taken =monotonic_elapsed (start, end);if (result !=NULL ) *result = taken;modules/dclist.c +1
-1@@ -568,7 +568,7 @@ struct dclist *get_dc_list(unsigned int logopt, const char *uri)if (!list) goto out_error; - dclist->expire =time (NULL ) + min_ttl; + dclist->expire =monotonic_time (NULL ) + min_ttl; dclist->uri = list;return dclist;
modules/lookup_file.c +3
-3@@ -743,7 +743,7 @@ static int match_key(struct autofs_point *ap, {char buf[MAX_ERR_BUF ];struct mapent_cache *mc; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char *lkp_key;char *prefix;size_t map_key_len;@@ -808,7 +808,7 @@ static int lookup_one(struct autofs_point *ap,struct mapent_cache *mc = source->mc;char mkey[KEY_MAX_LEN +1 ];char mapent[MAPENT_MAX_LEN +1 ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );FILE *f;unsigned int k_len, m_len;int entry, ret;@@ -914,7 +914,7 @@ static int lookup_wild(struct autofs_point *ap,struct mapent_cache *mc;char mkey[KEY_MAX_LEN +1 ];char mapent[MAPENT_MAX_LEN +1 ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );FILE *f;unsigned int k_len, m_len;int entry, ret;@@ -1118,7 +1118,7 @@ int lookup_mount(struct autofs_point *ap, constchar *name, int
name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent(ap, key, LKP_DISTINCT); if (me) {
- if (me->status>= time(NULL)) {
+ if (me->status>=monotonic_time(NULL)) {cache_unlock(me->mc);
returnNSS_STATUS_NOTFOUND;
} else {modules/lookup_hesiod.c +2
-2@@ -163,7 +163,7 @@ static int lookup_one(struct autofs_point *ap, }cache_writelock (mc); - ret =cache_update (mc, source, key, best_record,time (NULL )); + ret =cache_update (mc, source, key, best_record,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {hesiod_free_list (ctxt->hesiod_context, hes_result);@@ -228,7 +228,7 @@ static int lookup_one_amd(struct autofs_point *ap, }cache_writelock (mc); - ret =cache_update (mc, source, lkp_key, *hes_result,time (NULL )); + ret =cache_update (mc, source, lkp_key, *hes_result,monotonic_time (NULL ));cache_unlock (mc);if (hes_result)@@ -339,7 +339,7 @@ int lookup_mount(struct autofs_point *ap, constchar *name, int
name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent(ap, name, LKP_DISTINCT); if (me) {
- if (me->status>= time(NULL)) {
+ if (me->status>=monotonic_time(NULL)) {cache_unlock(me->mc);
returnNSS_STATUS_NOTFOUND;
} else {modules/lookup_hosts.c +0
-0@@ -284,7 +284,7 @@ int lookup_mount(struct autofs_point *ap, constchar *name, int
name_len, void *
struct mapent *me;
char *mapent = NULL;
intmapent_len;
-time_tnow = time(NULL);
+time_tnow =monotonic_time(NULL);
int ret;source = ap->entry->current;modules/lookup_hosts.c +0
-0@@ -296,7 +296,7 @@ int lookup_mount(struct autofs_point *ap, constchar *name, int
name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent(ap, name, LKP_DISTINCT); if (me) {
- if (me->status>= time(NULL)) {
+ if (me->status>=monotonic_time(NULL)) {cache_unlock(me->mc);
returnNSS_STATUS_NOTFOUND;
} else {modules/lookup_ldap.c +1
-1@@ -944,7 +944,7 @@ static LDAP *do_reconnect(unsigned logopt, struct lookup_context *ctxt)uris_mutex_lock (ctxt );if (ctxt->dclist) { -if (!ldap || ctxt->dclist->expire <time (NULL )) { +if (!ldap || ctxt->dclist->expire <monotonic_time (NULL )) {free_dclist (ctxt->dclist); ctxt->dclist =NULL ;}modules/lookup_ldap.c +1
-1@@ -2851,7 +2851,7 @@ static int lookup_one(struct autofs_point *ap,struct map_source *source, struct mapent_cache *mc;int rv, i, l, ql, count;char buf[MAX_ERR_BUF ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char *query;LDAPMessage *result =NULL , *e;char *class, *info, *entry;
modules/lookup_ldap.c +2
-2@@ -3214,7 +3214,7 @@ static int lookup_one_amd(struct autofs_point *ap,struct berval **bvKey;struct berval **bvValues;char buf[MAX_ERR_BUF ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int rv, l, ql, count;int ret =CHE_MISSING ;@@ -3417,7 +3417,7 @@ static int check_map_indirect(struct autofs_point *ap,unsigned int is_amd_format = source->flags &MAP_FLAG_FORMAT_AMD ;struct mapent_cache *mc;struct mapent *me; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret, cur_state;int status;@@ -3555,7 +3555,7 @@ int lookup_mount(struct autofs_point *ap, constchar *name, int
name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent(ap, key, LKP_DISTINCT); if (me) {
- if (me->status>= time(NULL)) {
+ if (me->status>=monotonic_time(NULL)) {cache_unlock(me->mc);
returnNSS_STATUS_NOTFOUND;
} else {modules/lookup_nisplus.c +4
-4@@ -288,7 +288,7 @@ static int lookup_one(struct autofs_point *ap,nis_result *result;nis_object *this;char *mapent; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret, cur_state;char buf[MAX_ERR_BUF ];@@ -400,7 +400,7 @@ static int lookup_wild(struct autofs_point *ap,nis_result *result;nis_object *this;char *mapent; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret, cur_state;char buf[MAX_ERR_BUF ];@@ -487,7 +487,7 @@ static int lookup_amd_defaults(struct autofs_point *ap, mapent =ENTRY_VAL (this,1 );cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , mapent,time (NULL )); + ret =cache_update (mc, source,"/defaults" , mapent,monotonic_time (NULL ));cache_unlock (mc);nis_freeresult (result);@@ -505,7 +505,7 @@ static int check_map_indirect(struct autofs_point *ap,unsigned int is_amd_format = source->flags &MAP_FLAG_FORMAT_AMD ;struct mapent_cache *mc;struct mapent *me, *exists; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret =0 ;@@ -650,7 +650,7 @@ int lookup_mount(struct autofs_point *ap, constchar *name, int
name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent(ap, key, LKP_DISTINCT); if (me) {
- if (me->status>= time(NULL)) {
+ if (me->status>=monotonic_time(NULL)) {cache_unlock(me->mc);
returnNSS_STATUS_NOTFOUND;
} else {modules/lookup_program.c +3
-3@@ -369,7 +369,7 @@ static int lookup_amd_defaults(struct autofs_point *ap,while (isblank (*start)) start++;cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , start,time (NULL )); + ret =cache_update (mc, source,"/defaults" , start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (ment);@@ -438,7 +438,7 @@ static int match_key(struct autofs_point *ap, start++; }cache_writelock (mc); - ret =cache_update (mc, source, lkp_key, start,time (NULL )); + ret =cache_update (mc, source, lkp_key, start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (ment);@@ -491,7 +491,7 @@ static int match_key(struct autofs_point *ap,while (isblank (*start)) start++;cache_writelock (mc); - ret =cache_update (mc, source, match, start,time (NULL )); + ret =cache_update (mc, source, match, start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (match);@@ -537,7 +537,7 @@ int lookup_mount(struct autofs_point *ap, constchar *name, int
name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent(ap, name, LKP_DISTINCT); if (me) {
- if (me->status>= time(NULL)) {
+ if (me->status>=monotonic_time(NULL)) {cache_unlock(me->mc);
returnNSS_STATUS_NOTFOUND;
} else {modules/lookup_program.c +0
-0@@ -586,7 +586,7 @@ int lookup_mount(struct autofs_point *ap, constchar *name, int
name_len, void *
* proceed with the program map lookup.
*/
if (strchr(name, '/')||modules/lookup_program.c +1
-1- me->age + ap->negative_timeout > time(NULL)) { + me->age + ap->negative_timeout > monotonic_time(NULL)) {char *ent =NULL ;if (me->mapent) {modules/lookup_sss.c +2
-2@@ -374,7 +374,7 @@ static int lookup_one(struct autofs_point *ap,struct mapent_cache *mc;struct mapent *we;void *sss_ctxt =NULL ; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char buf[MAX_ERR_BUF ];char *value =NULL ;char *s_key;@@ -491,7 +491,7 @@ static int check_map_indirect(struct autofs_point *ap,struct map_source *source;struct mapent_cache *mc;struct mapent *me; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret, cur_state;@@ -585,7 +585,7 @@ int lookup_mount(struct autofs_point *ap, constchar *name, int
name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent(ap, key, LKP_DISTINCT); if (me) {
- if (me->status>= time(NULL)) {
+ if (me->status>=monotonic_time(NULL)) {cache_unlock(me->mc);
returnNSS_STATUS_NOTFOUND;
} else {modules/lookup_userhome.c +1
-1@@ -77,7 +77,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void * }cache_writelock (mc); - ret =cache_update (mc, source, name,NULL ,time (NULL )); + ret =cache_update (mc, source, name,NULL ,monotonic_time (NULL ));cache_unlock (mc);if (ret == CHE_FAIL) {modules/lookup_yp.c +3
-3@@ -405,7 +405,7 @@ static int lookup_one(struct autofs_point *ap,char *mapname;char *mapent;int mapent_len; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret; mc = source->mc;@@ -517,7 +517,7 @@ static int lookup_wild(struct autofs_point *ap,char *mapname;char *mapent;int mapent_len; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret; mc = source->mc;@@ -598,7 +598,7 @@ static int lookup_amd_defaults(struct autofs_point *ap,return CHE_FAIL ;cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , mapent,time (NULL )); + ret =cache_update (mc, source,"/defaults" , mapent,monotonic_time (NULL ));cache_unlock (mc);return ret;@@ -753,7 +753,7 @@ int lookup_mount(struct autofs_point *ap, constchar *name, int
name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent(ap, key, LKP_DISTINCT); if (me) {
- if (me->status>= time(NULL)) {
+ if (me->status>=monotonic_time(NULL)) {cache_unlock(me->mc);
returnNSS_STATUS_NOTFOUND;
} else {modules/mount_autofs.c +1
-1@@ -242,7 +242,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, source =master_add_map_source (entry, info->type, info->format, -time (NULL ), argc, argv); +monotonic_time (NULL ), argc, argv);if (!source) { error(ap->logopt,MODPREFIX "failed to add map source to entry");modules/parse_amd.c +1
-1@@ -1181,7 +1181,7 @@ static int do_host_mount(struct autofs_point *ap, const char *name, "hosts", "sun", argc, pargv);if (!instance) { instance =master_add_source_instance (source, -"hosts" ,"sun" ,time (NULL ), argc, pargv); +"hosts" ,"sun" ,monotonic_time (NULL ), argc, pargv);if (!instance) { error(ap->logopt, MODPREFIX"failed to create source instance for hosts map");modules/replicated.c +3
-4@@ -69,14 +69,14 @@ void seed_random(void) fd =open_fd ("/dev/urandom" ,O_RDONLY );if (fd <0 ) { -srandom (time (NULL )); +srandom (monotonic_time (NULL ));return ; }if (read (fd, &seed,sizeof (seed)) !=-1 )srandom (seed);else -srandom (time (NULL )); +srandom (monotonic_time (NULL ));close (fd);@@ -231,8 +231,7 @@ static unsigned int get_nfs_info(unsigned logopt,struct host *host, socklen_t len = INET6_ADDRSTRLEN;char buf[len +1 ];struct pmap parms; -struct timeval start, end; -struct timezone tz; +struct timespec start, end;unsigned int supported =0 ;double taken =0 ;int status, count = 0;modules/replicated.c +2
-2@@ -292,9 +291,9 @@ static unsigned int get_nfs_info(unsigned logopt,struct host *host, supported = status; goto done_ver; }else if (!status) { -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =rpc_ping_proto (rpc_info); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status == -ETIMEDOUT ) { supported = status;goto
done_ver;modules/replicated.c +1
-1@@ -306,7 +305,7 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host, debug(logopt, "nfs v4 random selection time: %f", reply); }else { - reply =elapsed (start, end); + reply =monotonic_elapsed (start, end);debug (logopt,"nfs v4 rpc ping time: %f" , reply); }taken += reply;modules/replicated.c +7
-8@@ -351,9 +350,9 @@ v3_ver: supported = status; goto done_ver; }else if (!status) { -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =rpc_ping_proto (rpc_info); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status == -ETIMEDOUT ) { supported = status; goto done_ver;@@ -365,7 +364,7 @@ v3_ver:debug (logopt,"nfs v3 random selection time: %f" , reply); }else { - reply =elapsed (start, end); + reply =monotonic_elapsed (start, end);debug (logopt,"nfs v3 rpc ping time: %f" , reply); } taken += reply;@@ -407,9 +406,9 @@ v2_ver: supported = status; goto done_ver; }else if (!status) { -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =rpc_ping_proto (rpc_info); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status == -ETIMEDOUT ) supported = status;else if (status >0 ) {@@ -420,7 +419,7 @@ v2_ver:debug (logopt,"nfs v2 random selection time: %f" , reply); }else { - reply =elapsed (start, end);; + reply =monotonic_elapsed (start, end);;debug (logopt,"nfs v2 rpc ping time: %f" , reply); } taken += reply;@@ -523,8 +522,7 @@ static int get_supported_ver_and_cost(unsigned logopt, struct host *host, struct conn_info pm_info, rpc_info;int proto;unsigned int vers; -struct timeval start, end; -struct timezone tz; +struct timespec start, end;double taken =0 ;time_t timeout =RPC_TIMEOUT ;int status = 0;modules/replicated.c +3
-3@@ -610,16 +608,16 @@ static int get_supported_ver_and_cost(unsigned logopt, struct host *host, if (status == -EHOSTUNREACH) goto done; else if (!status) { -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =rpc_ping_proto (&rpc_info); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status >0 ) {if (random_selection) {/* Random value between 0 and 1 */ taken = ((float )random ())/((float )RAND_MAX +1 );debug (logopt,"random selection time %f" , taken); }else { - taken =elapsed (start, end); + taken =monotonic_elapsed (start, end);debug (logopt,"rpc ping time %f" , taken); }
Quoted 1 line
}
--
To unsubscribe from this list: send the line "unsubscribe autofs" in
Quoted 6 lines · Ian Kent
Quoted 5 lines · Ning Yu
Hi,
I have composed a patch for this issue, it works in my side, what it does is replacing
gettimeofday()withclock_gettime(CLOCK_MONOTONIC).
Quoted 8 lines
Quoted 1 line
Would anyone please help to review it? Thanks in advance.
Are you joking!
How is this meant to apply to the current source, it won't.If you can manage to post a sane patch you will need to break it up into a few separate standalone patches with sane explanations of what each one is meant to achieve.
I'm sorry, not to offend, the previous patch was huge because all the call to time() or gettimeofday() functions are replaced with clock_gettime().
Please allow me to re-send the patch, this time I have splitted it into several smaller patches, hope it won't be as stupid as previous one.
Quoted 7 lines
Quoted 7 lines
From
cdb2bcd563420cd39af199309e8c0c7fc45a7bd1Mon Sep 17 00:00:00 2001
From: Yu Ning <[email protected]>
Date: Wed, 16 Sep 2015 15:56:21 +0800
Subject: [PATCH] Useclock_gettime()instead ofgettimeofday().
Quoted 9 lines
Quoted 4 lines
This patch is to fix the issue that a mount point may not be automatically unmounted after a system date/time change.
Reproducer with 100% failrate:
Since of you to hammer the result of the problem you've identified rather than just explain the problem and what needs to be done to resolve it in a polite and sensible manner.
--
To unsubscribe from this list: send the line "unsubscribe autofs" in
Ian Kent
maintainerQuoted 12 lines · Ning Yu
Quoted 11 lines · Ian Kent
Quoted 6 lines · Ning Yu
Hi,
I have composed a patch for this issue, it works in my side, what it does is replacing
gettimeofday()withclock_gettime(CLOCK_MONOTONIC).Would anyone please help to review it? Thanks in advance.
Are you joking!
How is this meant to apply to the current source, it won't.
Quoted 6 lines
Quoted 3 lines
If you can manage to post a sane patch you will need to break it up into a few separate standalone patches with sane explanations of what each one is meant to achieve.
I'm sorry, not to offend, the previous patch was huge because all the call to
time()orgettimeofday()functions are replaced withclock_gettime().
Encountering this after a generally unpleasant day is bound to get a short and unpleasant response, ;)
Quoted 3 lines
Please allow me to re-send the patch, this time I have splitted it into several smaller patches, hope it won't be as stupid as previous one.
Well, I see those posts but there are still problems with your email program.
Apart from the DOS line ends all the tabs appear to have been collapsed to single spaces.
I really don't want to go through and apply these hunk by hunk manually when you must have a properly formatted patch already.
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
From
cdb2bcd563420cd39af199309e8c0c7fc45a7bd1Mon Sep 17 00:00:00 2001
From: Yu Ning <[email protected]>
Date: Wed, 16 Sep 2015 15:56:21 +0800
Subject: [PATCH] Useclock_gettime()instead ofgettimeofday().This patch is to fix the issue that a mount point may not be automatically unmounted after a system date/time change.
Quoted 6 lines
Quoted 6 lines
Quoted 1 line
Reproducer with 100% failrate:
Since of you to hammer the result of the problem you've identified rather than just explain the problem and what needs to be done to resolve it in a polite and sensible manner.
--
To unsubscribe from this list: send the line "unsubscribe autofs" in
Quoted 17 lines · Ian Kent
Quoted 16 lines · Ning Yu
Quoted 14 lines · Ian Kent
Quoted 6 lines · Ning Yu
Hi,
I have composed a patch for this issue, it works in my side, what it does is replacing
gettimeofday()withclock_gettime(CLOCK_MONOTONIC).Would anyone please help to review it? Thanks in advance.
Are you joking!
How is this meant to apply to the current source, it won't.If you can manage to post a sane patch you will need to break it up into a few separate standalone patches with sane explanations of what each one is meant to achieve.
Quoted 6 lines
Quoted 2 lines
I'm sorry, not to offend, the previous patch was huge because all the call to
time()orgettimeofday()functions are replaced withclock_gettime().Encountering this after a generally unpleasant day is bound to get a short and unpleasant response, ;)
Best wishes for you and have a nice day/night :)
Quoted 4 lines
Quoted 3 lines
Please allow me to re-send the patch, this time I have splitted it into several smaller patches, hope it won't be as stupid as previous one.
Quoted 9 lines
Well, I see those posts but there are still problems with your email program.
Apart from the DOS line ends all the tabs appear to have been collapsed to single spaces.
I really don't want to go through and apply these hunk by hunk manually when you must have a properly formatted patch already.
Thanks for pointing it out, I will have to fix my email client issue first and resend the patches. Sorry for wasting you so much of time.
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
From
cdb2bcd563420cd39af199309e8c0c7fc45a7bd1Mon Sep 17 00:00:00 2001
From: Yu Ning <[email protected]>
Date: Wed, 16 Sep 2015 15:56:21 +0800
Subject: [PATCH] Useclock_gettime()instead ofgettimeofday().This patch is to fix the issue that a mount point may not be automatically unmounted after a system date/time change.
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
Quoted 1 line
Reproducer with 100% failrate:
Since of you to hammer the result of the problem you've identified rather than just explain the problem and what needs to be done to resolve it in a polite and sensible manner.
--
To unsubscribe from this list: send the line "unsubscribe autofs" in
Ian Kent
maintainerQuoted 37 lines · Ning Yu
Quoted 17 lines · Ian Kent
Quoted 16 lines · Ning Yu
Quoted 14 lines · Ian Kent
Quoted 6 lines · Ning Yu
Hi,
I have composed a patch for this issue, it works in my side, what it does is replacing
gettimeofday()withclock_gettime(CLOCK_MONOTONIC).Would anyone please help to review it? Thanks in advance.
Are you joking!
How is this meant to apply to the current source, it won't.If you can manage to post a sane patch you will need to break it up into a few separate standalone patches with sane explanations of what each one is meant to achieve.
Quoted 6 lines
Quoted 2 lines
I'm sorry, not to offend, the previous patch was huge because all the call to
time()orgettimeofday()functions are replaced withclock_gettime().Encountering this after a generally unpleasant day is bound to get a short and unpleasant response, ;)
Best wishes for you and have a nice day/night :)
Quoted 10 lines
Quoted 3 lines
Please allow me to re-send the patch, this time I have splitted it into several smaller patches, hope it won't be as stupid as previous one.
Well, I see those posts but there are still problems with your email program.
Apart from the DOS line ends all the tabs appear to have been collapsed to single spaces.
Quoted 6 lines
Quoted 3 lines
I really don't want to go through and apply these hunk by hunk manually when you must have a properly formatted patch already.
Thanks for pointing it out, I will have to fix my email client issue first and resend the patches. Sorry for wasting you so much of time.
A couple of other small things.
Please make the title of the patch email the same as the tittle of the patch. And if possible add a [PATCH x/y] prefix to the title, x being the ordering of the patch within the y patches posted.
And in patch titles I commonly use "autofs-n-v-r - actual title".
So for example one of these would have a title like:
autofs-5.1.1 - Use monotonic clock instead of time()
assuming you had made them against the 5.1.1 source.
I've also started to use (quite recently in fact) "Signed-off-by:" in patches so please add yours too, I don't feel right about adding it for someone else as it's an assumption that may or may not be correct.
These things aren't a big deal as I can change most of them myself easily if it's not convenient for you to do it.
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
From
cdb2bcd563420cd39af199309e8c0c7fc45a7bd1Mon Sep 17 00:00:00 2001
From: Yu Ning <[email protected]>
Date: Wed, 16 Sep 2015 15:56:21 +0800
Subject: [PATCH] Useclock_gettime()instead ofgettimeofday().This patch is to fix the issue that a mount point may not be automatically unmounted after a system date/time change.
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
Quoted 1 line
Reproducer with 100% failrate:
Since of you to hammer the result of the problem you've identified rather than just explain the problem and what needs to be done to resolve it in a polite and sensible manner.
--
To unsubscribe from this list: send the line "unsubscribe autofs" in
PATCH v3 1/3 autofs-5.1.1 - use clock_gettime() instead of gettimeofday().
The time returned by gettimeofday() is affected by discontinuous jumps in the system time, so it causes an issue that autofs may not auto unmount a mount point if system time is manually changed by the system administrator.
To fix the issue we can use clock_gettime(CLOCK_MONOTONIC) instead of gettimeofday().
A new function monotonic_elapsed() is introduced in rpc_subs.h as a timespec version of elapsed().
--- daemon/direct.c | 12 ++++++------ daemon/indirect.c | 12 ++++++------ include/rpc_subs.h | 1 + lib/alarm.c | 6 +++--- lib/rpc_subs.c | 17 ++++++++++++----- modules/replicated.c | 30 ++++++++++++++---------------- 6 files changed, 42 insertions(+), 36 deletions(-)
daemon/direct.c +6 -6
@@ -1041,7 +1041,7 @@ int handle_packet_expire_direct(struct autofs_point *ap, autofs_packet_expire_dichar buf[MAX_ERR_BUF ];pthread_t thid;struct timespec wait; -struct timeval now; +struct timespec now;int status, state;pthread_setcancelstate (PTHREAD_CANCEL_DISABLE , &state);
@@ -1159,9 +1159,9 @@ int handle_packet_expire_direct(struct autofs_point *ap, autofs_packet_expire_di mt->signaled =0 ;while (!mt->signaled) { -gettimeofday (&now,NULL ); +clock_gettime (CLOCK_MONOTONIC , &now); wait.tv_sec = now.tv_sec +2 ; - wait.tv_nsec = now.tv_usec *1000 ; + wait.tv_nsec = now.tv_nsec; status =pthread_cond_timedwait (&mt->cond, &mt->mutex, &wait);if (status && status !=ETIMEDOUT )fatal (status);
@@ -1296,7 +1296,7 @@ int handle_packet_missing_direct(struct autofs_point *ap, autofs_packet_missing_char buf[MAX_ERR_BUF ];int status =0 ;struct timespec wait; -struct timeval now; +struct timespec now;int ioctlfd, len, state;unsigned int kver_major =get_kver_major ();unsigned int kver_minor =get_kver_minor ();
@@ -1478,9 +1478,9 @@ int handle_packet_missing_direct(struct autofs_point *ap, autofs_packet_missing_ mt->signaled =0 ;while (!mt->signaled) { -gettimeofday (&now,NULL ); +clock_gettime (CLOCK_MONOTONIC , &now); wait.tv_sec = now.tv_sec +2 ; - wait.tv_nsec = now.tv_usec *1000 ; + wait.tv_nsec = now.tv_nsec; status =pthread_cond_timedwait (&mt->cond, &mt->mutex, &wait);if (status && status !=ETIMEDOUT )fatal (status);
daemon/indirect.c +6 -6
@@ -636,7 +636,7 @@ int handle_packet_expire_indirect(struct autofs_point *ap, autofs_packet_expire_char buf[MAX_ERR_BUF ];pthread_t thid;struct timespec wait; -struct timeval now; +struct timespec now;int status, state;pthread_setcancelstate (PTHREAD_CANCEL_DISABLE , &state);
@@ -691,9 +691,9 @@ int handle_packet_expire_indirect(struct autofs_point *ap, autofs_packet_expire_ mt->signaled =0 ;while (!mt->signaled) { -gettimeofday (&now,NULL ); +clock_gettime (CLOCK_MONOTONIC , &now); wait.tv_sec = now.tv_sec +2 ; - wait.tv_nsec = now.tv_usec *1000 ; + wait.tv_nsec = now.tv_nsec; status =pthread_cond_timedwait (&mt->cond, &mt->mutex, &wait);if (status && status !=ETIMEDOUT )fatal (status);
@@ -795,7 +795,7 @@ int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missinchar buf[MAX_ERR_BUF ];struct pending_args *mt;struct timespec wait; -struct timeval now; +struct timespec now;struct mapent *me;int status, state;
@@ -884,9 +884,9 @@ int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missin mt->signaled =0 ;while (!mt->signaled) { -gettimeofday (&now,NULL ); +clock_gettime (CLOCK_MONOTONIC , &now); wait.tv_sec = now.tv_sec +2 ; - wait.tv_nsec = now.tv_usec *1000 ; + wait.tv_nsec = now.tv_nsec; status =pthread_cond_timedwait (&mt->cond, &mt->mutex, &wait);if (status && status !=ETIMEDOUT )fatal (status);
include/rpc_subs.h +1 -0
@@ -71,6 +71,7 @@ int rpc_portmap_getport(struct conn_info *, struct pmap *, unsigned short *);int rpc_ping_proto (struct conn_info *);int rpc_ping (const char *,long ,long ,unsigned int );double elapsed (struct timeval ,struct timeval ); +double monotonic_elapsed (struct timespec ,struct timespec );int rpc_time (const char *,unsigned int ,unsigned int ,long ,long ,unsigned int ,double *);const char *get_addr_string (struct sockaddr *,char *,socklen_t );
lib/alarm.c +3 -3
@@ -178,14 +178,14 @@ static void *alarm_handler(void *arg) now =time (NULL );if (first->time > now) { -struct timeval usecs; +struct timespec nsecs;/* * Wait for alarm to trigger or a new alarm * to be added. */ -gettimeofday (&usecs,NULL ); +clock_gettime (CLOCK_MONOTONIC , &nsecs); expire.tv_sec = first->time; - expire.tv_nsec = usecs.tv_usec *1000 ; + expire.tv_nsec = nsecs.tv_nsec; status =pthread_cond_timedwait (&cond, &mutex, &expire);if (status && status !=ETIMEDOUT )
lib/rpc_subs.c +12 -5
@@ -1086,25 +1086,32 @@ double elapsed(struct timeval start, struct timeval end)return t2-t1; } +double monotonic_elapsed (struct timespec start,struct timespec end) +{ +double t1, t2; + t1 = (double )start.tv_sec + (double )start.tv_nsec/(1000 *1000 *1000 ); + t2 = (double )end.tv_sec + (double )end.tv_nsec/(1000 *1000 *1000 ); +return t2-t1; +} +int rpc_time (const char *host,unsigned int ping_vers,unsigned int ping_proto,long seconds,long micros,unsigned int option,double *result) {int status;double taken; -struct timeval start, end; -struct timezone tz; +struct timespec start, end;int proto = (ping_proto &RPC_PING_UDP ) ?IPPROTO_UDP :IPPROTO_TCP ;unsigned long vers = ping_vers; -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =__rpc_ping (host, vers, proto, seconds, micros, option); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status ==RPC_PING_FAIL || status <0 )return status; - taken =elapsed (start, end); + taken =monotonic_elapsed (start, end);if (result !=NULL ) *result = taken;
modules/replicated.c +14 -16
@@ -231,8 +231,7 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host,socklen_t len =INET6_ADDRSTRLEN ;char buf[len +1 ];struct pmap parms; -struct timeval start, end; -struct timezone tz; +struct timespec start, end;unsigned int supported =0 ;double taken =0 ;int status, count =0 ;
@@ -292,9 +291,9 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host, supported = status; goto done_ver; }else if (!status) { -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =rpc_ping_proto (rpc_info); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status == -ETIMEDOUT ) { supported = status; goto done_ver;
@@ -306,7 +305,7 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host,debug (logopt,"nfs v4 random selection time: %f" , reply); }else { - reply =elapsed (start, end); + reply =monotonic_elapsed (start, end);debug (logopt,"nfs v4 rpc ping time: %f" , reply); } taken += reply;
@@ -351,9 +350,9 @@ v3_ver: supported = status; goto done_ver; }else if (!status) { -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =rpc_ping_proto (rpc_info); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status == -ETIMEDOUT ) { supported = status; goto done_ver;
@@ -365,7 +364,7 @@ v3_ver:debug (logopt,"nfs v3 random selection time: %f" , reply); }else { - reply =elapsed (start, end); + reply =monotonic_elapsed (start, end);debug (logopt,"nfs v3 rpc ping time: %f" , reply); } taken += reply;
@@ -407,9 +406,9 @@ v2_ver: supported = status; goto done_ver; }else if (!status) { -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =rpc_ping_proto (rpc_info); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status == -ETIMEDOUT ) supported = status;else if (status >0 ) {
@@ -420,7 +419,7 @@ v2_ver:debug (logopt,"nfs v2 random selection time: %f" , reply); }else { - reply =elapsed (start, end);; + reply =monotonic_elapsed (start, end);;debug (logopt,"nfs v2 rpc ping time: %f" , reply); } taken += reply;
@@ -523,8 +522,7 @@ static int get_supported_ver_and_cost(unsigned logopt, struct host *host,struct conn_info pm_info, rpc_info;int proto;unsigned int vers; -struct timeval start, end; -struct timezone tz; +struct timespec start, end;double taken =0 ;time_t timeout =RPC_TIMEOUT ;int status =0 ;
@@ -610,16 +608,16 @@ static int get_supported_ver_and_cost(unsigned logopt, struct host *host,if (status == -EHOSTUNREACH ) goto done;else if (!status) { -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =rpc_ping_proto (&rpc_info); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status >0 ) {if (random_selection) {/* Random value between 0 and 1 */ taken = ((float )random ())/((float )RAND_MAX +1 );debug (logopt,"random selection time %f" , taken); }else { - taken =elapsed (start, end); + taken =monotonic_elapsed (start, end);debug (logopt,"rpc ping time %f" , taken); } }
Signature · 4 lines
1.9.1 -- To unsubscribe from this list: send the line "unsubscribe autofs" in
PATCH v3 2/3 autofs-5.1.1 - use monotonic clock for pthread cond timed wait.
The default PTHREAD_COND_INITIALIZER initializer uses realtime clock, we need to switch to use the monotic clock.
--- lib/alarm.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
lib/alarm.c +12 -1
@@ -23,7 +23,7 @@ struct alarm { };static pthread_mutex_t mutex =PTHREAD_MUTEX_INITIALIZER ; -static pthread_cond_t cond =PTHREAD_COND_INITIALIZER ; +static pthread_cond_t cond;static LIST_HEAD (alarms);#define alarm_lock () \
@@ -212,6 +212,7 @@ int alarm_start_handler(void)pthread_t thid;pthread_attr_t attrs;pthread_attr_t *pattrs = &attrs; +pthread_condattr_t condattrs;int status; status =pthread_attr_init (pattrs);
@@ -224,8 +225,18 @@ int alarm_start_handler(void)#endif } + status =pthread_condattr_init (&condattrs); +if (status) +fatal (status); + +pthread_condattr_setclock (&condattrs,CLOCK_MONOTONIC ); +pthread_cond_init (&cond, &condattrs); + status =pthread_create (&thid, pattrs, alarm_handler,NULL ); +pthread_condattr_destroy (&condattrs); +pthread_condattr_destroy (&cond); +if (pattrs)pthread_attr_destroy (pattrs);
Signature · 4 lines
1.9.1 -- To unsubscribe from this list: send the line "unsubscribe autofs" in
Ian Kent
maintainerRe: [PATCH v3 2/3] autofs-5.1.1 - use monotonic clock for pthread cond timed wait.
Quoted 34 lines · Yu Ning
The default
PTHREAD_COND_INITIALIZERinitializer uses realtime clock, we need to switch to use the monotic clock.Signed-off-by Yu Ning <[email protected]>--- lib/alarm.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)lib/alarm.c +3
-1@@ -23,7 +23,7 @@ struct alarm { };static pthread_mutex_t mutex =PTHREAD_MUTEX_INITIALIZER ; -static pthread_cond_t cond =PTHREAD_COND_INITIALIZER ; +static pthread_cond_t cond;static LIST_HEAD (alarms);#define alarm_lock () \@@ -212,6 +212,7 @@ int alarm_start_handler(void)pthread_t thid;pthread_attr_t attrs;pthread_attr_t *pattrs = &attrs; +pthread_condattr_t condattrs;int status; status =pthread_attr_init (pattrs);@@ -224,8 +225,18 @@ int alarm_start_handler(void)#endif } + status =pthread_condattr_init (&condattrs);
lib/alarm.c int alarm_start_handler(void) · line 238
Quoted 10 lines
lib/alarm.c +8
-0+if (status) +fatal (status); + +pthread_condattr_setclock (&condattrs,CLOCK_MONOTONIC ); +pthread_cond_init (&cond, &condattrs); + status =pthread_create (&thid, pattrs, alarm_handler,NULL ); +pthread_condattr_destroy (&condattrs); +pthread_condattr_destroy (&cond);
I don't think we can do this.
The condition is used by the alarm_handler() for the duration of it's life so I don't think we can't destroy its attributes after thread creation.
In fact I'm not sure we even need the pthread_condattr_destroy(&cond) but I'm not sure.
Destroying the condition attributes (condattrs) OTOH must not affect any condition which it has been used to initialize so destroying that is fine.
Let me have a closer look at this, maybe I've misunderstood what's going on, and report back later.
lib/alarm.c int alarm_start_handler(void) · line 242
Quoted 4 lines
lib/alarm.c +1
-0+if (pattrs)pthread_attr_destroy (pattrs);
--
To unsubscribe from this list: send the line "unsubscribe autofs" in
Re: [PATCH v3 2/3] autofs-5.1.1 - use monotonic clock for pthread cond timed wait.
Quoted 55 lines · Ian Kent
Quoted 34 lines · Yu Ning
The default
PTHREAD_COND_INITIALIZERinitializer uses realtime clock, we need to switch to use the monotic clock.Signed-off-by Yu Ning <[email protected]>--- lib/alarm.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)lib/alarm.c +3
-1@@ -23,7 +23,7 @@ struct alarm { };static pthread_mutex_t mutex =PTHREAD_MUTEX_INITIALIZER ; -static pthread_cond_t cond =PTHREAD_COND_INITIALIZER ; +static pthread_cond_t cond;static LIST_HEAD (alarms);#define alarm_lock () \@@ -212,6 +212,7 @@ int alarm_start_handler(void)pthread_t thid;pthread_attr_t attrs;pthread_attr_t *pattrs = &attrs; +pthread_condattr_t condattrs;int status; status =pthread_attr_init (pattrs);@@ -224,8 +225,18 @@ int alarm_start_handler(void)#endif } + status =pthread_condattr_init (&condattrs);lib/alarm.c int alarm_start_handler(void) · line 238
Quoted 10 lines
lib/alarm.c +8
-0+if (status) +fatal (status); + +pthread_condattr_setclock (&condattrs,CLOCK_MONOTONIC ); +pthread_cond_init (&cond, &condattrs); + status =pthread_create (&thid, pattrs, alarm_handler,NULL ); +pthread_condattr_destroy (&condattrs); +pthread_condattr_destroy (&cond);I don't think we can do this.
The condition is used by the
alarm_handler()for the duration of it's life so I don't think we can't destroy its attributes after thread creation.In fact I'm not sure we even need the
pthread_condattr_destroy(&cond)but I'm not sure.
Quoted 7 lines
Destroying the condition attributes (condattrs) OTOH must not affect any condition which it has been used to initialize so destroying that is fine.
Let me have a closer look at this, maybe I've misunderstood what's going on, and report back later.
I think you are right, we shouldn't destroy the cond attrs, nor the cond (and I used wrong function to destroy cond...) if the thread is successfully created.
In fact I think we should do the cleanup at the end of the thread, however since the thread is expected to live __forever__, maybe we can simply ignore the cleanup.
Quoted 6 lines
lib/alarm.c int alarm_start_handler(void) · line 242
Quoted 4 lines
lib/alarm.c +1
-0+if (pattrs)pthread_attr_destroy (pattrs);
--
To unsubscribe from this list: send the line "unsubscribe autofs" in
Ian Kent
maintainerRe: [PATCH v3 2/3] autofs-5.1.1 - use monotonic clock for pthread cond timed wait.
Quoted 64 lines · Ning Yu
Quoted 55 lines · Ian Kent
Quoted 34 lines · Yu Ning
The default
PTHREAD_COND_INITIALIZERinitializer uses realtime clock, we need to switch to use the monotic clock.Signed-off-by Yu Ning <[email protected]>--- lib/alarm.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)lib/alarm.c +3
-1@@ -23,7 +23,7 @@ struct alarm { };static pthread_mutex_t mutex =PTHREAD_MUTEX_INITIALIZER ; -static pthread_cond_t cond =PTHREAD_COND_INITIALIZER ; +static pthread_cond_t cond;static LIST_HEAD (alarms);#define alarm_lock () \@@ -212,6 +212,7 @@ int alarm_start_handler(void)pthread_t thid;pthread_attr_t attrs;pthread_attr_t *pattrs = &attrs; +pthread_condattr_t condattrs;int status; status =pthread_attr_init (pattrs);@@ -224,8 +225,18 @@ int alarm_start_handler(void)#endif } + status =pthread_condattr_init (&condattrs);lib/alarm.c int alarm_start_handler(void) · line 238
Quoted 10 lines
lib/alarm.c +8
-0+if (status) +fatal (status); + +pthread_condattr_setclock (&condattrs,CLOCK_MONOTONIC ); +pthread_cond_init (&cond, &condattrs); + status =pthread_create (&thid, pattrs, alarm_handler,NULL ); +pthread_condattr_destroy (&condattrs); +pthread_condattr_destroy (&cond);I don't think we can do this.
The condition is used by the
alarm_handler()for the duration of it's life so I don't think we can't destroy its attributes after thread creation.In fact I'm not sure we even need the
pthread_condattr_destroy(&cond)but I'm not sure.Quoted 7 lines
Destroying the condition attributes (condattrs) OTOH must not affect any condition which it has been used to initialize so destroying that is fine.
Let me have a closer look at this, maybe I've misunderstood what's going on, and report back later.
Quoted 7 lines
I think you are right, we shouldn't destroy the cond attrs, nor the cond (and I used wrong function to destroy cond...) if the thread is successfully created.
In fact I think we should do the cleanup at the end of the thread, however since the thread is expected to live
__forever__, maybe we can simply ignore the cleanup.
That's what I'm thinking too.
I don't think there is any problem assuming the monotonic clock is available (I think it's been around a very long time) so there's no point in complicating things to cater for that case.
Although I am thinking of checking the return and calling the fatal() function on failure as I do for other pthreads functions that should never fail, so if it does fail we'll get a simple message and a core so we know where to look.
Quoted 7 lines
Quoted 7 lines
lib/alarm.c int alarm_start_handler(void) · line 242
Quoted 5 lines
lib/alarm.c +1
-0+if (pattrs)pthread_attr_destroy (pattrs);
--
To unsubscribe from this list: send the line "unsubscribe autofs" in
Re: [PATCH v3 2/3] autofs-5.1.1 - use monotonic clock for pthread cond timed wait.
Quoted 75 lines · Ian Kent
Quoted 64 lines · Ning Yu
Quoted 55 lines · Ian Kent
Quoted 34 lines · Yu Ning
The default
PTHREAD_COND_INITIALIZERinitializer uses realtime clock, we need to switch to use the monotic clock.Signed-off-by Yu Ning <[email protected]>--- lib/alarm.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)lib/alarm.c +3
-1@@ -23,7 +23,7 @@ struct alarm { };static pthread_mutex_t mutex =PTHREAD_MUTEX_INITIALIZER ; -static pthread_cond_t cond =PTHREAD_COND_INITIALIZER ; +static pthread_cond_t cond;static LIST_HEAD (alarms);#define alarm_lock () \@@ -212,6 +212,7 @@ int alarm_start_handler(void)pthread_t thid;pthread_attr_t attrs;pthread_attr_t *pattrs = &attrs; +pthread_condattr_t condattrs;int status; status =pthread_attr_init (pattrs);@@ -224,8 +225,18 @@ int alarm_start_handler(void)#endif } + status =pthread_condattr_init (&condattrs);lib/alarm.c int alarm_start_handler(void) · line 238
Quoted 10 lines
lib/alarm.c +8
-0+if (status) +fatal (status); + +pthread_condattr_setclock (&condattrs,CLOCK_MONOTONIC ); +pthread_cond_init (&cond, &condattrs); + status =pthread_create (&thid, pattrs, alarm_handler,NULL ); +pthread_condattr_destroy (&condattrs); +pthread_condattr_destroy (&cond);I don't think we can do this.
The condition is used by the
alarm_handler()for the duration of it's life so I don't think we can't destroy its attributes after thread creation.In fact I'm not sure we even need the
pthread_condattr_destroy(&cond)but I'm not sure.Quoted 7 lines
Destroying the condition attributes (condattrs) OTOH must not affect any condition which it has been used to initialize so destroying that is fine.
Let me have a closer look at this, maybe I've misunderstood what's going on, and report back later.
Quoted 7 lines
I think you are right, we shouldn't destroy the cond attrs, nor the cond (and I used wrong function to destroy cond...) if the thread is successfully created.
In fact I think we should do the cleanup at the end of the thread, however since the thread is expected to live
__forever__, maybe we can simply ignore the cleanup.That's what I'm thinking too.
Quoted 9 lines
I don't think there is any problem assuming the monotonic clock is available (I think it's been around a very long time) so there's no point in complicating things to cater for that case.
Although I am thinking of checking the return and calling the
fatal()function on failure as I do for other pthreads functions that should never fail, so if it does fail we'll get a simple message and a core so we know where to look.
Yes, those messages will definitely be very useful for debugging, do you mind that I update my patch to add those checking and messages? Or will it be better to submit a new patch for that job?
Quoted 9 lines
Quoted 7 lines
Quoted 7 lines
lib/alarm.c int alarm_start_handler(void) · line 242
Quoted 5 lines
lib/alarm.c +1
-0+if (pattrs)pthread_attr_destroy (pattrs);
--
To unsubscribe from this list: send the line "unsubscribe autofs" in
Ian Kent
maintainerRe: [PATCH v3 2/3] autofs-5.1.1 - use monotonic clock for pthread cond timed wait.
Quoted 86 lines · Ning Yu
Quoted 75 lines · Ian Kent
Quoted 64 lines · Ning Yu
Quoted 55 lines · Ian Kent
Quoted 34 lines · Yu Ning
The default
PTHREAD_COND_INITIALIZERinitializer uses realtime clock, we need to switch to use the monotic clock.Signed-off-by Yu Ning <[email protected]>--- lib/alarm.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)lib/alarm.c +3
-1@@ -23,7 +23,7 @@ struct alarm { };static pthread_mutex_t mutex =PTHREAD_MUTEX_INITIALIZER ; -static pthread_cond_t cond =PTHREAD_COND_INITIALIZER ; +static pthread_cond_t cond;static LIST_HEAD (alarms);#define alarm_lock () \@@ -212,6 +212,7 @@ int alarm_start_handler(void)pthread_t thid;pthread_attr_t attrs;pthread_attr_t *pattrs = &attrs; +pthread_condattr_t condattrs;int status; status =pthread_attr_init (pattrs);@@ -224,8 +225,18 @@ int alarm_start_handler(void)#endif } + status =pthread_condattr_init (&condattrs);lib/alarm.c int alarm_start_handler(void) · line 238
Quoted 10 lines
lib/alarm.c +8
-0+if (status) +fatal (status); + +pthread_condattr_setclock (&condattrs,CLOCK_MONOTONIC ); +pthread_cond_init (&cond, &condattrs); + status =pthread_create (&thid, pattrs, alarm_handler,NULL ); +pthread_condattr_destroy (&condattrs); +pthread_condattr_destroy (&cond);I don't think we can do this.
The condition is used by the
alarm_handler()for the duration of it's life so I don't think we can't destroy its attributes after thread creation.In fact I'm not sure we even need the
pthread_condattr_destroy(&cond)but I'm not sure.Quoted 7 lines
Destroying the condition attributes (condattrs) OTOH must not affect any condition which it has been used to initialize so destroying that is fine.
Let me have a closer look at this, maybe I've misunderstood what's going on, and report back later.
Quoted 7 lines
I think you are right, we shouldn't destroy the cond attrs, nor the cond (and I used wrong function to destroy cond...) if the thread is successfully created.
In fact I think we should do the cleanup at the end of the thread, however since the thread is expected to live
__forever__, maybe we can simply ignore the cleanup.That's what I'm thinking too.
Quoted 9 lines
I don't think there is any problem assuming the monotonic clock is available (I think it's been around a very long time) so there's no point in complicating things to cater for that case.
Although I am thinking of checking the return and calling the
fatal()function on failure as I do for other pthreads functions that should never fail, so if it does fail we'll get a simple message and a core so we know where to look.
Quoted 3 lines
Yes, those messages will definitely be very useful for debugging, do you mind that I update my patch to add those checking and messages? Or will it be better to submit a new patch for that job?
Sure, send an updated patch, I'm not able to start work on it quite yet.
Quoted 10 lines
Quoted 10 lines
Quoted 8 lines
Quoted 8 lines
lib/alarm.c int alarm_start_handler(void) · line 242
Quoted 6 lines
lib/alarm.c +1
-0+if (pattrs)pthread_attr_destroy (pattrs);
--
To unsubscribe from this list: send the line "unsubscribe autofs" in
PATCH v5 1/3 autofs-5.1.1 - use clock_gettime() instead of gettimeofday().
The time returned by gettimeofday() is affected by discontinuous jumps in the system time, so it causes an issue that autofs may not auto unmount a mount point if system time is manually changed by the system administrator.
To fix the issue we can use clock_gettime(CLOCK_MONOTONIC) instead of gettimeofday().
A new function monotonic_elapsed() is introduced in rpc_subs.h as a timespec version of elapsed().
--- daemon/direct.c | 12 ++++++------ daemon/indirect.c | 12 ++++++------ include/rpc_subs.h | 1 + lib/alarm.c | 6 +++--- lib/rpc_subs.c | 17 ++++++++++++----- modules/replicated.c | 30 ++++++++++++++---------------- 6 files changed, 42 insertions(+), 36 deletions(-)
daemon/direct.c +6 -6
@@ -1041,7 +1041,7 @@ int handle_packet_expire_direct(struct autofs_point *ap, autofs_packet_expire_dichar buf[MAX_ERR_BUF ];pthread_t thid;struct timespec wait; -struct timeval now; +struct timespec now;int status, state;pthread_setcancelstate (PTHREAD_CANCEL_DISABLE , &state);
@@ -1159,9 +1159,9 @@ int handle_packet_expire_direct(struct autofs_point *ap, autofs_packet_expire_di mt->signaled =0 ;while (!mt->signaled) { -gettimeofday (&now,NULL ); +clock_gettime (CLOCK_MONOTONIC , &now); wait.tv_sec = now.tv_sec +2 ; - wait.tv_nsec = now.tv_usec *1000 ; + wait.tv_nsec = now.tv_nsec; status =pthread_cond_timedwait (&mt->cond, &mt->mutex, &wait);if (status && status !=ETIMEDOUT )fatal (status);
@@ -1296,7 +1296,7 @@ int handle_packet_missing_direct(struct autofs_point *ap, autofs_packet_missing_char buf[MAX_ERR_BUF ];int status =0 ;struct timespec wait; -struct timeval now; +struct timespec now;int ioctlfd, len, state;unsigned int kver_major =get_kver_major ();unsigned int kver_minor =get_kver_minor ();
@@ -1478,9 +1478,9 @@ int handle_packet_missing_direct(struct autofs_point *ap, autofs_packet_missing_ mt->signaled =0 ;while (!mt->signaled) { -gettimeofday (&now,NULL ); +clock_gettime (CLOCK_MONOTONIC , &now); wait.tv_sec = now.tv_sec +2 ; - wait.tv_nsec = now.tv_usec *1000 ; + wait.tv_nsec = now.tv_nsec; status =pthread_cond_timedwait (&mt->cond, &mt->mutex, &wait);if (status && status !=ETIMEDOUT )fatal (status);
daemon/indirect.c +6 -6
@@ -636,7 +636,7 @@ int handle_packet_expire_indirect(struct autofs_point *ap, autofs_packet_expire_char buf[MAX_ERR_BUF ];pthread_t thid;struct timespec wait; -struct timeval now; +struct timespec now;int status, state;pthread_setcancelstate (PTHREAD_CANCEL_DISABLE , &state);
@@ -691,9 +691,9 @@ int handle_packet_expire_indirect(struct autofs_point *ap, autofs_packet_expire_ mt->signaled =0 ;while (!mt->signaled) { -gettimeofday (&now,NULL ); +clock_gettime (CLOCK_MONOTONIC , &now); wait.tv_sec = now.tv_sec +2 ; - wait.tv_nsec = now.tv_usec *1000 ; + wait.tv_nsec = now.tv_nsec; status =pthread_cond_timedwait (&mt->cond, &mt->mutex, &wait);if (status && status !=ETIMEDOUT )fatal (status);
@@ -795,7 +795,7 @@ int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missinchar buf[MAX_ERR_BUF ];struct pending_args *mt;struct timespec wait; -struct timeval now; +struct timespec now;struct mapent *me;int status, state;
@@ -884,9 +884,9 @@ int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missin mt->signaled =0 ;while (!mt->signaled) { -gettimeofday (&now,NULL ); +clock_gettime (CLOCK_MONOTONIC , &now); wait.tv_sec = now.tv_sec +2 ; - wait.tv_nsec = now.tv_usec *1000 ; + wait.tv_nsec = now.tv_nsec; status =pthread_cond_timedwait (&mt->cond, &mt->mutex, &wait);if (status && status !=ETIMEDOUT )fatal (status);
include/rpc_subs.h +1 -0
@@ -71,6 +71,7 @@ int rpc_portmap_getport(struct conn_info *, struct pmap *, unsigned short *);int rpc_ping_proto (struct conn_info *);int rpc_ping (const char *,long ,long ,unsigned int );double elapsed (struct timeval ,struct timeval ); +double monotonic_elapsed (struct timespec ,struct timespec );int rpc_time (const char *,unsigned int ,unsigned int ,long ,long ,unsigned int ,double *);const char *get_addr_string (struct sockaddr *,char *,socklen_t );
lib/alarm.c +3 -3
@@ -178,14 +178,14 @@ static void *alarm_handler(void *arg) now =time (NULL );if (first->time > now) { -struct timeval usecs; +struct timespec nsecs;/* * Wait for alarm to trigger or a new alarm * to be added. */ -gettimeofday (&usecs,NULL ); +clock_gettime (CLOCK_MONOTONIC , &nsecs); expire.tv_sec = first->time; - expire.tv_nsec = usecs.tv_usec *1000 ; + expire.tv_nsec = nsecs.tv_nsec; status =pthread_cond_timedwait (&cond, &mutex, &expire);if (status && status !=ETIMEDOUT )
lib/rpc_subs.c +12 -5
@@ -1086,25 +1086,32 @@ double elapsed(struct timeval start, struct timeval end)return t2-t1; } +double monotonic_elapsed (struct timespec start,struct timespec end) +{ +double t1, t2; + t1 = (double )start.tv_sec + (double )start.tv_nsec/(1000 *1000 *1000 ); + t2 = (double )end.tv_sec + (double )end.tv_nsec/(1000 *1000 *1000 ); +return t2-t1; +} +int rpc_time (const char *host,unsigned int ping_vers,unsigned int ping_proto,long seconds,long micros,unsigned int option,double *result) {int status;double taken; -struct timeval start, end; -struct timezone tz; +struct timespec start, end;int proto = (ping_proto &RPC_PING_UDP ) ?IPPROTO_UDP :IPPROTO_TCP ;unsigned long vers = ping_vers; -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =__rpc_ping (host, vers, proto, seconds, micros, option); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status ==RPC_PING_FAIL || status <0 )return status; - taken =elapsed (start, end); + taken =monotonic_elapsed (start, end);if (result !=NULL ) *result = taken;
modules/replicated.c +14 -16
@@ -231,8 +231,7 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host,socklen_t len =INET6_ADDRSTRLEN ;char buf[len +1 ];struct pmap parms; -struct timeval start, end; -struct timezone tz; +struct timespec start, end;unsigned int supported =0 ;double taken =0 ;int status, count =0 ;
@@ -292,9 +291,9 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host, supported = status; goto done_ver; }else if (!status) { -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =rpc_ping_proto (rpc_info); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status == -ETIMEDOUT ) { supported = status; goto done_ver;
@@ -306,7 +305,7 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host,debug (logopt,"nfs v4 random selection time: %f" , reply); }else { - reply =elapsed (start, end); + reply =monotonic_elapsed (start, end);debug (logopt,"nfs v4 rpc ping time: %f" , reply); } taken += reply;
@@ -351,9 +350,9 @@ v3_ver: supported = status; goto done_ver; }else if (!status) { -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =rpc_ping_proto (rpc_info); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status == -ETIMEDOUT ) { supported = status; goto done_ver;
@@ -365,7 +364,7 @@ v3_ver:debug (logopt,"nfs v3 random selection time: %f" , reply); }else { - reply =elapsed (start, end); + reply =monotonic_elapsed (start, end);debug (logopt,"nfs v3 rpc ping time: %f" , reply); } taken += reply;
@@ -407,9 +406,9 @@ v2_ver: supported = status; goto done_ver; }else if (!status) { -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =rpc_ping_proto (rpc_info); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status == -ETIMEDOUT ) supported = status;else if (status >0 ) {
@@ -420,7 +419,7 @@ v2_ver:debug (logopt,"nfs v2 random selection time: %f" , reply); }else { - reply =elapsed (start, end);; + reply =monotonic_elapsed (start, end);;debug (logopt,"nfs v2 rpc ping time: %f" , reply); } taken += reply;
@@ -523,8 +522,7 @@ static int get_supported_ver_and_cost(unsigned logopt, struct host *host,struct conn_info pm_info, rpc_info;int proto;unsigned int vers; -struct timeval start, end; -struct timezone tz; +struct timespec start, end;double taken =0 ;time_t timeout =RPC_TIMEOUT ;int status =0 ;
@@ -610,16 +608,16 @@ static int get_supported_ver_and_cost(unsigned logopt, struct host *host,if (status == -EHOSTUNREACH ) goto done;else if (!status) { -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =rpc_ping_proto (&rpc_info); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status >0 ) {if (random_selection) {/* Random value between 0 and 1 */ taken = ((float )random ())/((float )RAND_MAX +1 );debug (logopt,"random selection time %f" , taken); }else { - taken =elapsed (start, end); + taken =monotonic_elapsed (start, end);debug (logopt,"rpc ping time %f" , taken); } }
Signature · 4 lines
1.9.1 -- To unsubscribe from this list: send the line "unsubscribe autofs" in
PATCH v5 2/3 autofs-5.1.1 - use monotonic clock for pthread cond timed wait.
The default PTHREAD_COND_INITIALIZER initializer uses realtime clock, we need to switch to use the monotic clock.
--- lib/alarm.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-)
lib/alarm.c +23 -3
@@ -23,7 +23,7 @@ struct alarm { };static pthread_mutex_t mutex =PTHREAD_MUTEX_INITIALIZER ; -static pthread_cond_t cond =PTHREAD_COND_INITIALIZER ; +static pthread_cond_t cond;static LIST_HEAD (alarms);#define alarm_lock () \
@@ -212,20 +212,40 @@ int alarm_start_handler(void)pthread_t thid;pthread_attr_t attrs;pthread_attr_t *pattrs = &attrs; +pthread_condattr_t condattrs;int status; status =pthread_attr_init (pattrs);if (status) pattrs =NULL ;else { -pthread_attr_setdetachstate (pattrs,PTHREAD_CREATE_DETACHED ); + status =pthread_attr_setdetachstate (pattrs,PTHREAD_CREATE_DETACHED ); +if (status) +fatal (status);#ifdef _POSIX_THREAD_ATTR_STACKSIZE -pthread_attr_setstacksize (pattrs,PTHREAD_STACK_MIN *4 ); + status =pthread_attr_setstacksize (pattrs,PTHREAD_STACK_MIN *4 ); +if (status) +fatal (status);#endif } + status =pthread_condattr_init (&condattrs); +if (status) +fatal (status); + status =pthread_condattr_setclock (&condattrs,CLOCK_MONOTONIC ); +if (status) +fatal (status); + status =pthread_cond_init (&cond, &condattrs); +if (status) +fatal (status); + status =pthread_create (&thid, pattrs, alarm_handler,NULL ); +if (status) { +pthread_condattr_destroy (&condattrs); +pthread_cond_destroy (&cond); + } +if (pattrs)pthread_attr_destroy (pattrs);
Signature · 4 lines
1.9.1 -- To unsubscribe from this list: send the line "unsubscribe autofs" in
PATCH v5 3/3 autofs-5.1.1 - use monotonic clock instead of time().
In reply to Yu NingA new function monotonic_time() is introduced in automount.h as a monotonic version of time(), all the calls to time() have been switched to use this new function.
--- daemon/automount.c | 4 ++-- daemon/direct.c | 4 ++-- daemon/indirect.c | 4 ++-- daemon/lookup.c | 6 +++--- daemon/state.c | 2 +- include/automount.h | 9 +++++++++ lib/alarm.c | 4 ++-- lib/cache.c | 2 +- lib/master.c | 4 ++-- modules/dclist.c | 2 +- modules/lookup_file.c | 8 ++++---- modules/lookup_hesiod.c | 6 +++--- modules/lookup_hosts.c | 4 ++-- modules/lookup_ldap.c | 10 +++++----- modules/lookup_nisplus.c | 10 +++++----- modules/lookup_program.c | 10 +++++----- modules/lookup_sss.c | 6 +++--- modules/lookup_userhome.c | 2 +- modules/lookup_yp.c | 8 ++++---- modules/mount_autofs.c | 2 +- modules/parse_amd.c | 2 +- modules/replicated.c | 4 ++-- 22 files changed, 61 insertions(+), 52 deletions(-)
daemon/automount.c +2 -2
@@ -1454,7 +1454,7 @@ static void *statemachine(void *arg)break ;case SIGHUP : -do_hup_signal (master_list,time (NULL )); +do_hup_signal (master_list,monotonic_time (NULL ));break ;default :
@@ -2004,7 +2004,7 @@ int main(int argc, char *argv[])unsigned ghost, logging, daemon_check;unsigned dumpmaps, foreground, have_global_options;time_t timeout; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );struct rlimit rlim;const char *options ="+hp:t:vmdD:fVrO:l:n:CF" ;static const struct option long_options[] = {
daemon/direct.c +2 -2
@@ -464,7 +464,7 @@ int mount_autofs_direct(struct autofs_point *ap)struct mapent_cache *nc, *mc;struct mapent *me, *ne, *nested;struct mnt_list *mnts; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );if (strcmp (ap->path,"/-" )) {error (ap->logopt,"expected direct map, exiting" );
@@ -1388,7 +1388,7 @@ int handle_packet_missing_direct(struct autofs_point *ap, autofs_packet_missing_ }/* Check if we recorded a mount fail for this key */ -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) { ops->send_fail (ap->logopt, ioctlfd, pkt->wait_queue_token, -ENOENT ); ops->close (ap->logopt, ioctlfd);
daemon/indirect.c +2 -2
@@ -197,7 +197,7 @@ out_err:int mount_autofs_indirect (struct autofs_point *ap,const char *root) { -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );int status;int map;
@@ -818,7 +818,7 @@ int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missin/* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, pkt->name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) { ops->send_fail (ap->logopt, ap->ioctlfd, pkt->wait_queue_token, -ENOENT );cache_unlock (me->mc);
daemon/lookup.c +3 -3
@@ -875,7 +875,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_struct map_source *instance;char src_file[] ="file" ;char src_prog[] ="program" ; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );struct stat st;char *type, *format;
@@ -915,7 +915,7 @@ static int lookup_name_source_instance(struct autofs_point *ap, struct map_sourc {struct map_source *instance;const char *format; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );if (*name =='/' && map->flags &MAP_FLAG_FORMAT_AMD )return lookup_amd_instance (ap, map, name, name_len);
@@ -1079,7 +1079,7 @@ static void update_negative_cache(struct autofs_point *ap, struct map_source *soelse map = entry->maps;if (map) { -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );int rv =CHE_FAIL ;cache_writelock (map->mc);
daemon/state.c +1 -1
@@ -553,7 +553,7 @@ static unsigned int st_readmap(struct autofs_point *ap)pthread_t thid;struct readmap_args *ra;int status; -int now =time (NULL ); +int now =monotonic_time (NULL );debug (ap->logopt,"state %d path %s" , ap->state, ap->path);
include/automount.h +9 -0
@@ -565,6 +565,15 @@ do { \fatal (_m_unlock); \ }while (0 ) +static inline time_t monotonic_time(time_t *t) +{ +struct timespec ts; +clock_gettime (CLOCK_MONOTONIC , &ts); +if (t) + *t = (time_t ) ts.tv_sec; +return (time_t ) ts.tv_sec; +} +/* Expire alarm handling routines */ int alarm_start_handler (void );int alarm_add (struct autofs_point *ap,time_t seconds);
lib/alarm.c +2 -2
@@ -46,7 +46,7 @@ int alarm_add(struct autofs_point *ap, time_t seconds)struct list_head *head;struct list_head *p;struct alarm *new; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t next_alarm =0 ;unsigned int empty =1 ;int status;
@@ -175,7 +175,7 @@ static void *alarm_handler(void *arg) first = list_entry(head->next, struct alarm, list); - now =time (NULL ); + now =monotonic_time (NULL );if (first->time > now) {struct timespec nsecs;
lib/cache.c +1 -1
@@ -775,7 +775,7 @@ void cache_update_negative(struct mapent_cache *mc, struct map_source *ms, const char *key, time_t timeout) { - time_t now = time(NULL); + time_t now = monotonic_time(NULL);struct mapent *me;int rv =CHE_OK ;
lib/master.c +2 -2
@@ -1483,7 +1483,7 @@ int dump_map(struct master *master, const char *type, const char *name)struct map_source *source;struct master_mapent *this;struct autofs_point *ap; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL ); this = list_entry(p, struct master_mapent, list); p = p->next;
@@ -1601,7 +1601,7 @@ int master_show_mounts(struct master *master)struct map_source *source;struct master_mapent *this;struct autofs_point *ap; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );unsigned int count =0 ; this = list_entry(p, struct master_mapent, list);
modules/dclist.c +1 -1
@@ -568,7 +568,7 @@ struct dclist *get_dc_list(unsigned int logopt, const char *uri)if (!list) goto out_error; - dclist->expire =time (NULL ) + min_ttl; + dclist->expire =monotonic_time (NULL ) + min_ttl; dclist->uri = list;return dclist;
modules/lookup_file.c +4 -4
@@ -743,7 +743,7 @@ static int match_key(struct autofs_point *ap, {char buf[MAX_ERR_BUF ];struct mapent_cache *mc; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char *lkp_key;char *prefix;size_t map_key_len;
@@ -808,7 +808,7 @@ static int lookup_one(struct autofs_point *ap,struct mapent_cache *mc = source->mc;char mkey[KEY_MAX_LEN +1 ];char mapent[MAPENT_MAX_LEN +1 ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );FILE *f;unsigned int k_len, m_len;int entry, ret;
@@ -914,7 +914,7 @@ static int lookup_wild(struct autofs_point *ap,struct mapent_cache *mc;char mkey[KEY_MAX_LEN +1 ];char mapent[MAPENT_MAX_LEN +1 ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );FILE *f;unsigned int k_len, m_len;int entry, ret;
@@ -1118,7 +1118,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
modules/lookup_hesiod.c +3 -3
@@ -163,7 +163,7 @@ static int lookup_one(struct autofs_point *ap, }cache_writelock (mc); - ret =cache_update (mc, source, key, best_record,time (NULL )); + ret =cache_update (mc, source, key, best_record,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {hesiod_free_list (ctxt->hesiod_context, hes_result);
@@ -228,7 +228,7 @@ static int lookup_one_amd(struct autofs_point *ap, }cache_writelock (mc); - ret =cache_update (mc, source, lkp_key, *hes_result,time (NULL )); + ret =cache_update (mc, source, lkp_key, *hes_result,monotonic_time (NULL ));cache_unlock (mc);if (hes_result)
@@ -339,7 +339,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
modules/lookup_hosts.c +2 -2
@@ -284,7 +284,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *struct mapent *me;char *mapent =NULL ;int mapent_len; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );int ret; source = ap->entry->current;
@@ -296,7 +296,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
modules/lookup_ldap.c +5 -5
@@ -944,7 +944,7 @@ static LDAP *do_reconnect(unsigned logopt, struct lookup_context *ctxt)uris_mutex_lock (ctxt);if (ctxt->dclist) { -if (!ldap || ctxt->dclist->expire <time (NULL )) { +if (!ldap || ctxt->dclist->expire <monotonic_time (NULL )) {free_dclist (ctxt->dclist); ctxt->dclist =NULL ; }
@@ -2851,7 +2851,7 @@ static int lookup_one(struct autofs_point *ap, struct map_source *source,struct mapent_cache *mc;int rv, i, l, ql, count;char buf[MAX_ERR_BUF ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char *query;LDAPMessage *result =NULL , *e;char *class, *info, *entry;
@@ -3214,7 +3214,7 @@ static int lookup_one_amd(struct autofs_point *ap,struct berval **bvKey;struct berval **bvValues;char buf[MAX_ERR_BUF ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int rv, l, ql, count;int ret =CHE_MISSING ;
@@ -3417,7 +3417,7 @@ static int check_map_indirect(struct autofs_point *ap,unsigned int is_amd_format = source->flags &MAP_FLAG_FORMAT_AMD ;struct mapent_cache *mc;struct mapent *me; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret, cur_state;int status;
@@ -3555,7 +3555,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
modules/lookup_nisplus.c +5 -5
@@ -288,7 +288,7 @@ static int lookup_one(struct autofs_point *ap,nis_result *result;nis_object *this;char *mapent; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret, cur_state;char buf[MAX_ERR_BUF ];
@@ -400,7 +400,7 @@ static int lookup_wild(struct autofs_point *ap,nis_result *result;nis_object *this;char *mapent; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret, cur_state;char buf[MAX_ERR_BUF ];
@@ -487,7 +487,7 @@ static int lookup_amd_defaults(struct autofs_point *ap, mapent =ENTRY_VAL (this,1 );cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , mapent,time (NULL )); + ret =cache_update (mc, source,"/defaults" , mapent,monotonic_time (NULL ));cache_unlock (mc);nis_freeresult (result);
@@ -505,7 +505,7 @@ static int check_map_indirect(struct autofs_point *ap,unsigned int is_amd_format = source->flags &MAP_FLAG_FORMAT_AMD ;struct mapent_cache *mc;struct mapent *me, *exists; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret =0 ;
@@ -650,7 +650,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
modules/lookup_program.c +5 -5
@@ -369,7 +369,7 @@ static int lookup_amd_defaults(struct autofs_point *ap,while (isblank (*start)) start++;cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , start,time (NULL )); + ret =cache_update (mc, source,"/defaults" , start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (ment);
@@ -438,7 +438,7 @@ static int match_key(struct autofs_point *ap, start++; }cache_writelock (mc); - ret =cache_update (mc, source, lkp_key, start,time (NULL )); + ret =cache_update (mc, source, lkp_key, start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (ment);
@@ -491,7 +491,7 @@ static int match_key(struct autofs_point *ap,while (isblank (*start)) start++;cache_writelock (mc); - ret =cache_update (mc, source, match, start,time (NULL )); + ret =cache_update (mc, source, match, start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (match);
@@ -537,7 +537,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
@@ -586,7 +586,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void ** proceed with the program map lookup. */ if (strchr (name,'/' ) || - me->age + ap->negative_timeout >time (NULL )) { + me->age + ap->negative_timeout >monotonic_time (NULL )) {char *ent =NULL ;if (me->mapent) {
modules/lookup_sss.c +3 -3
@@ -374,7 +374,7 @@ static int lookup_one(struct autofs_point *ap,struct mapent_cache *mc;struct mapent *we;void *sss_ctxt =NULL ; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char buf[MAX_ERR_BUF ];char *value =NULL ;char *s_key;
@@ -491,7 +491,7 @@ static int check_map_indirect(struct autofs_point *ap,struct map_source *source;struct mapent_cache *mc;struct mapent *me; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret, cur_state;
@@ -585,7 +585,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
modules/lookup_userhome.c +1 -1
@@ -77,7 +77,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void * }cache_writelock (mc); - ret =cache_update (mc, source, name,NULL ,time (NULL )); + ret =cache_update (mc, source, name,NULL ,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {
modules/lookup_yp.c +4 -4
@@ -405,7 +405,7 @@ static int lookup_one(struct autofs_point *ap,char *mapname;char *mapent;int mapent_len; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret; mc = source->mc;
@@ -517,7 +517,7 @@ static int lookup_wild(struct autofs_point *ap,char *mapname;char *mapent;int mapent_len; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret; mc = source->mc;
@@ -598,7 +598,7 @@ static int lookup_amd_defaults(struct autofs_point *ap,return CHE_FAIL ;cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , mapent,time (NULL )); + ret =cache_update (mc, source,"/defaults" , mapent,monotonic_time (NULL ));cache_unlock (mc);return ret;
@@ -753,7 +753,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
modules/mount_autofs.c +1 -1
@@ -242,7 +242,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, source =master_add_map_source (entry, info->type, info->format, -time (NULL ), argc, argv); +monotonic_time (NULL ), argc, argv);if (!source) {error (ap->logopt,MODPREFIX "failed to add map source to entry" );
modules/parse_amd.c +1 -1
@@ -1181,7 +1181,7 @@ static int do_host_mount(struct autofs_point *ap, const char *name, "hosts", "sun", argc, pargv);if (!instance) { instance =master_add_source_instance (source, -"hosts" ,"sun" ,time (NULL ), argc, pargv); +"hosts" ,"sun" ,monotonic_time (NULL ), argc, pargv);if (!instance) {error (ap->logopt,MODPREFIX "failed to create source instance for hosts map" );
modules/replicated.c +2 -2
@@ -69,14 +69,14 @@ void seed_random(void) fd =open_fd ("/dev/urandom" ,O_RDONLY );if (fd <0 ) { -srandom (time (NULL )); +srandom (monotonic_time (NULL ));return ; }if (read (fd, &seed,sizeof (seed)) !=-1 )srandom (seed);else -srandom (time (NULL )); +srandom (monotonic_time (NULL ));close (fd);
Signature · 4 lines
1.9.1 -- To unsubscribe from this list: send the line "unsubscribe autofs" in
Re: [PATCH v3 2/3] autofs-5.1.1 - use monotonic clock for pthread cond timed wait.
In reply to Ian KentQuoted 87 lines · Ian Kent
Quoted 86 lines · Ning Yu
Quoted 84 lines · Ian Kent
Quoted 64 lines · Ning Yu
Quoted 55 lines · Ian Kent
Quoted 34 lines · Yu Ning
The default
PTHREAD_COND_INITIALIZERinitializer uses realtime clock, we need to switch to use the monotic clock.Signed-off-by Yu Ning <[email protected]>--- lib/alarm.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)lib/alarm.c +3
-1@@ -23,7 +23,7 @@ struct alarm { };static pthread_mutex_t mutex =PTHREAD_MUTEX_INITIALIZER ; -static pthread_cond_t cond =PTHREAD_COND_INITIALIZER ; +static pthread_cond_t cond;static LIST_HEAD (alarms);#define alarm_lock () \@@ -212,6 +212,7 @@ int alarm_start_handler(void)pthread_t thid;pthread_attr_t attrs;pthread_attr_t *pattrs = &attrs; +pthread_condattr_t condattrs;int status; status =pthread_attr_init (pattrs);@@ -224,8 +225,18 @@ int alarm_start_handler(void)#endif } + status =pthread_condattr_init (&condattrs);lib/alarm.c int alarm_start_handler(void) · line 238
Quoted 10 lines
lib/alarm.c +8
-0+if (status) +fatal (status); + +pthread_condattr_setclock (&condattrs,CLOCK_MONOTONIC ); +pthread_cond_init (&cond, &condattrs); + status =pthread_create (&thid, pattrs, alarm_handler,NULL ); +pthread_condattr_destroy (&condattrs); +pthread_condattr_destroy (&cond);I don't think we can do this.
The condition is used by the
alarm_handler()for the duration of it's life so I don't think we can't destroy its attributes after thread creation.In fact I'm not sure we even need the
pthread_condattr_destroy(&cond)but I'm not sure.Quoted 7 lines
Destroying the condition attributes (condattrs) OTOH must not affect any condition which it has been used to initialize so destroying that is fine.
Let me have a closer look at this, maybe I've misunderstood what's going on, and report back later.
Quoted 7 lines
I think you are right, we shouldn't destroy the cond attrs, nor the cond (and I used wrong function to destroy cond...) if the thread is successfully created.
In fact I think we should do the cleanup at the end of the thread, however since the thread is expected to live
__forever__, maybe we can simply ignore the cleanup.That's what I'm thinking too.
I don't think there is any problem assuming the monotonic clock is available (I think it's been around a very long time) so there's no point in complicating things to cater for that case.
Although I am thinking of checking the return and calling the
fatal()function on failure as I do for other pthreads functions that should never fail, so if it does fail we'll get a simple message and a core so we know where to look.
Quoted 6 lines
Quoted 3 lines
Yes, those messages will definitely be very useful for debugging, do you mind that I update my patch to add those checking and messages? Or will it be better to submit a new patch for that job?
Sure, send an updated patch, I'm not able to start work on it quite yet.
v5 patches are sent to you, please check for v5-0002 for the updates.
Quoted 12 lines
Quoted 10 lines
Quoted 10 lines
Quoted 8 lines
Quoted 8 lines
lib/alarm.c int alarm_start_handler(void) · line 242
Quoted 6 lines
lib/alarm.c +1
-0+if (pattrs)pthread_attr_destroy (pattrs);
--
To unsubscribe from this list: send the line "unsubscribe autofs" in
PATCH v3 3/3 autofs-5.1.1 - use monotonic clock instead of time().
In reply to Yu NingA new function monotonic_time() is introduced in automount.h as a monotonic version of time(), all the calls to time() have been switched to use this new function.
--- daemon/automount.c | 4 ++-- daemon/direct.c | 4 ++-- daemon/indirect.c | 4 ++-- daemon/lookup.c | 6 +++--- daemon/state.c | 2 +- include/automount.h | 9 +++++++++ lib/alarm.c | 4 ++-- lib/cache.c | 2 +- lib/master.c | 4 ++-- modules/dclist.c | 2 +- modules/lookup_file.c | 8 ++++---- modules/lookup_hesiod.c | 6 +++--- modules/lookup_hosts.c | 4 ++-- modules/lookup_ldap.c | 10 +++++----- modules/lookup_nisplus.c | 10 +++++----- modules/lookup_program.c | 10 +++++----- modules/lookup_sss.c | 6 +++--- modules/lookup_userhome.c | 2 +- modules/lookup_yp.c | 8 ++++---- modules/mount_autofs.c | 2 +- modules/parse_amd.c | 2 +- modules/replicated.c | 4 ++-- 22 files changed, 61 insertions(+), 52 deletions(-)
daemon/automount.c +2 -2
@@ -1454,7 +1454,7 @@ static void *statemachine(void *arg)break ;case SIGHUP : -do_hup_signal (master_list,time (NULL )); +do_hup_signal (master_list,monotonic_time (NULL ));break ;default :
@@ -2004,7 +2004,7 @@ int main(int argc, char *argv[])unsigned ghost, logging, daemon_check;unsigned dumpmaps, foreground, have_global_options;time_t timeout; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );struct rlimit rlim;const char *options ="+hp:t:vmdD:fVrO:l:n:CF" ;static const struct option long_options[] = {
daemon/direct.c +2 -2
@@ -464,7 +464,7 @@ int mount_autofs_direct(struct autofs_point *ap)struct mapent_cache *nc, *mc;struct mapent *me, *ne, *nested;struct mnt_list *mnts; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );if (strcmp (ap->path,"/-" )) {error (ap->logopt,"expected direct map, exiting" );
@@ -1388,7 +1388,7 @@ int handle_packet_missing_direct(struct autofs_point *ap, autofs_packet_missing_ }/* Check if we recorded a mount fail for this key */ -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) { ops->send_fail (ap->logopt, ioctlfd, pkt->wait_queue_token, -ENOENT ); ops->close (ap->logopt, ioctlfd);
daemon/indirect.c +2 -2
@@ -197,7 +197,7 @@ out_err:int mount_autofs_indirect (struct autofs_point *ap,const char *root) { -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );int status;int map;
@@ -818,7 +818,7 @@ int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missin/* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, pkt->name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) { ops->send_fail (ap->logopt, ap->ioctlfd, pkt->wait_queue_token, -ENOENT );cache_unlock (me->mc);
daemon/lookup.c +3 -3
@@ -875,7 +875,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_struct map_source *instance;char src_file[] ="file" ;char src_prog[] ="program" ; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );struct stat st;char *type, *format;
@@ -915,7 +915,7 @@ static int lookup_name_source_instance(struct autofs_point *ap, struct map_sourc {struct map_source *instance;const char *format; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );if (*name =='/' && map->flags &MAP_FLAG_FORMAT_AMD )return lookup_amd_instance (ap, map, name, name_len);
@@ -1079,7 +1079,7 @@ static void update_negative_cache(struct autofs_point *ap, struct map_source *soelse map = entry->maps;if (map) { -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );int rv =CHE_FAIL ;cache_writelock (map->mc);
daemon/state.c +1 -1
@@ -553,7 +553,7 @@ static unsigned int st_readmap(struct autofs_point *ap)pthread_t thid;struct readmap_args *ra;int status; -int now =time (NULL ); +int now =monotonic_time (NULL );debug (ap->logopt,"state %d path %s" , ap->state, ap->path);
include/automount.h +9 -0
@@ -565,6 +565,15 @@ do { \fatal (_m_unlock); \ }while (0 ) +static inline time_t monotonic_time(time_t *t) +{ +struct timespec ts; +clock_gettime (CLOCK_MONOTONIC , &ts); +if (t) + *t = (time_t ) ts.tv_sec; +return (time_t ) ts.tv_sec; +} +/* Expire alarm handling routines */ int alarm_start_handler (void );int alarm_add (struct autofs_point *ap,time_t seconds);
lib/alarm.c +2 -2
@@ -46,7 +46,7 @@ int alarm_add(struct autofs_point *ap, time_t seconds)struct list_head *head;struct list_head *p;struct alarm *new; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t next_alarm =0 ;unsigned int empty =1 ;int status;
@@ -175,7 +175,7 @@ static void *alarm_handler(void *arg) first = list_entry(head->next, struct alarm, list); - now =time (NULL ); + now =monotonic_time (NULL );if (first->time > now) {struct timespec nsecs;
lib/cache.c +1 -1
@@ -775,7 +775,7 @@ void cache_update_negative(struct mapent_cache *mc, struct map_source *ms, const char *key, time_t timeout) { - time_t now = time(NULL); + time_t now = monotonic_time(NULL);struct mapent *me;int rv =CHE_OK ;
lib/master.c +2 -2
@@ -1483,7 +1483,7 @@ int dump_map(struct master *master, const char *type, const char *name)struct map_source *source;struct master_mapent *this;struct autofs_point *ap; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL ); this = list_entry(p, struct master_mapent, list); p = p->next;
@@ -1601,7 +1601,7 @@ int master_show_mounts(struct master *master)struct map_source *source;struct master_mapent *this;struct autofs_point *ap; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );unsigned int count =0 ; this = list_entry(p, struct master_mapent, list);
modules/dclist.c +1 -1
@@ -568,7 +568,7 @@ struct dclist *get_dc_list(unsigned int logopt, const char *uri)if (!list) goto out_error; - dclist->expire =time (NULL ) + min_ttl; + dclist->expire =monotonic_time (NULL ) + min_ttl; dclist->uri = list;return dclist;
modules/lookup_file.c +4 -4
@@ -743,7 +743,7 @@ static int match_key(struct autofs_point *ap, {char buf[MAX_ERR_BUF ];struct mapent_cache *mc; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char *lkp_key;char *prefix;size_t map_key_len;
@@ -808,7 +808,7 @@ static int lookup_one(struct autofs_point *ap,struct mapent_cache *mc = source->mc;char mkey[KEY_MAX_LEN +1 ];char mapent[MAPENT_MAX_LEN +1 ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );FILE *f;unsigned int k_len, m_len;int entry, ret;
@@ -914,7 +914,7 @@ static int lookup_wild(struct autofs_point *ap,struct mapent_cache *mc;char mkey[KEY_MAX_LEN +1 ];char mapent[MAPENT_MAX_LEN +1 ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );FILE *f;unsigned int k_len, m_len;int entry, ret;
@@ -1118,7 +1118,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
modules/lookup_hesiod.c +3 -3
@@ -163,7 +163,7 @@ static int lookup_one(struct autofs_point *ap, }cache_writelock (mc); - ret =cache_update (mc, source, key, best_record,time (NULL )); + ret =cache_update (mc, source, key, best_record,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {hesiod_free_list (ctxt->hesiod_context, hes_result);
@@ -228,7 +228,7 @@ static int lookup_one_amd(struct autofs_point *ap, }cache_writelock (mc); - ret =cache_update (mc, source, lkp_key, *hes_result,time (NULL )); + ret =cache_update (mc, source, lkp_key, *hes_result,monotonic_time (NULL ));cache_unlock (mc);if (hes_result)
@@ -339,7 +339,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
modules/lookup_hosts.c +2 -2
@@ -284,7 +284,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *struct mapent *me;char *mapent =NULL ;int mapent_len; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );int ret; source = ap->entry->current;
@@ -296,7 +296,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
modules/lookup_ldap.c +5 -5
@@ -944,7 +944,7 @@ static LDAP *do_reconnect(unsigned logopt, struct lookup_context *ctxt)uris_mutex_lock (ctxt);if (ctxt->dclist) { -if (!ldap || ctxt->dclist->expire <time (NULL )) { +if (!ldap || ctxt->dclist->expire <monotonic_time (NULL )) {free_dclist (ctxt->dclist); ctxt->dclist =NULL ; }
@@ -2851,7 +2851,7 @@ static int lookup_one(struct autofs_point *ap, struct map_source *source,struct mapent_cache *mc;int rv, i, l, ql, count;char buf[MAX_ERR_BUF ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char *query;LDAPMessage *result =NULL , *e;char *class, *info, *entry;
@@ -3214,7 +3214,7 @@ static int lookup_one_amd(struct autofs_point *ap,struct berval **bvKey;struct berval **bvValues;char buf[MAX_ERR_BUF ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int rv, l, ql, count;int ret =CHE_MISSING ;
@@ -3417,7 +3417,7 @@ static int check_map_indirect(struct autofs_point *ap,unsigned int is_amd_format = source->flags &MAP_FLAG_FORMAT_AMD ;struct mapent_cache *mc;struct mapent *me; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret, cur_state;int status;
@@ -3555,7 +3555,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
modules/lookup_nisplus.c +5 -5
@@ -288,7 +288,7 @@ static int lookup_one(struct autofs_point *ap,nis_result *result;nis_object *this;char *mapent; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret, cur_state;char buf[MAX_ERR_BUF ];
@@ -400,7 +400,7 @@ static int lookup_wild(struct autofs_point *ap,nis_result *result;nis_object *this;char *mapent; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret, cur_state;char buf[MAX_ERR_BUF ];
@@ -487,7 +487,7 @@ static int lookup_amd_defaults(struct autofs_point *ap, mapent =ENTRY_VAL (this,1 );cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , mapent,time (NULL )); + ret =cache_update (mc, source,"/defaults" , mapent,monotonic_time (NULL ));cache_unlock (mc);nis_freeresult (result);
@@ -505,7 +505,7 @@ static int check_map_indirect(struct autofs_point *ap,unsigned int is_amd_format = source->flags &MAP_FLAG_FORMAT_AMD ;struct mapent_cache *mc;struct mapent *me, *exists; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret =0 ;
@@ -650,7 +650,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
modules/lookup_program.c +5 -5
@@ -369,7 +369,7 @@ static int lookup_amd_defaults(struct autofs_point *ap,while (isblank (*start)) start++;cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , start,time (NULL )); + ret =cache_update (mc, source,"/defaults" , start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (ment);
@@ -438,7 +438,7 @@ static int match_key(struct autofs_point *ap, start++; }cache_writelock (mc); - ret =cache_update (mc, source, lkp_key, start,time (NULL )); + ret =cache_update (mc, source, lkp_key, start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (ment);
@@ -491,7 +491,7 @@ static int match_key(struct autofs_point *ap,while (isblank (*start)) start++;cache_writelock (mc); - ret =cache_update (mc, source, match, start,time (NULL )); + ret =cache_update (mc, source, match, start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (match);
@@ -537,7 +537,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
@@ -586,7 +586,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void ** proceed with the program map lookup. */ if (strchr (name,'/' ) || - me->age + ap->negative_timeout >time (NULL )) { + me->age + ap->negative_timeout >monotonic_time (NULL )) {char *ent =NULL ;if (me->mapent) {
modules/lookup_sss.c +3 -3
@@ -374,7 +374,7 @@ static int lookup_one(struct autofs_point *ap,struct mapent_cache *mc;struct mapent *we;void *sss_ctxt =NULL ; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char buf[MAX_ERR_BUF ];char *value =NULL ;char *s_key;
@@ -491,7 +491,7 @@ static int check_map_indirect(struct autofs_point *ap,struct map_source *source;struct mapent_cache *mc;struct mapent *me; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret, cur_state;
@@ -585,7 +585,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
modules/lookup_userhome.c +1 -1
@@ -77,7 +77,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void * }cache_writelock (mc); - ret =cache_update (mc, source, name,NULL ,time (NULL )); + ret =cache_update (mc, source, name,NULL ,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {
modules/lookup_yp.c +4 -4
@@ -405,7 +405,7 @@ static int lookup_one(struct autofs_point *ap,char *mapname;char *mapent;int mapent_len; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret; mc = source->mc;
@@ -517,7 +517,7 @@ static int lookup_wild(struct autofs_point *ap,char *mapname;char *mapent;int mapent_len; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret; mc = source->mc;
@@ -598,7 +598,7 @@ static int lookup_amd_defaults(struct autofs_point *ap,return CHE_FAIL ;cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , mapent,time (NULL )); + ret =cache_update (mc, source,"/defaults" , mapent,monotonic_time (NULL ));cache_unlock (mc);return ret;
@@ -753,7 +753,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
modules/mount_autofs.c +1 -1
@@ -242,7 +242,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, source =master_add_map_source (entry, info->type, info->format, -time (NULL ), argc, argv); +monotonic_time (NULL ), argc, argv);if (!source) {error (ap->logopt,MODPREFIX "failed to add map source to entry" );
modules/parse_amd.c +1 -1
@@ -1181,7 +1181,7 @@ static int do_host_mount(struct autofs_point *ap, const char *name, "hosts", "sun", argc, pargv);if (!instance) { instance =master_add_source_instance (source, -"hosts" ,"sun" ,time (NULL ), argc, pargv); +"hosts" ,"sun" ,monotonic_time (NULL ), argc, pargv);if (!instance) {error (ap->logopt,MODPREFIX "failed to create source instance for hosts map" );
modules/replicated.c +2 -2
@@ -69,14 +69,14 @@ void seed_random(void) fd =open_fd ("/dev/urandom" ,O_RDONLY );if (fd <0 ) { -srandom (time (NULL )); +srandom (monotonic_time (NULL ));return ; }if (read (fd, &seed,sizeof (seed)) !=-1 )srandom (seed);else -srandom (time (NULL )); +srandom (monotonic_time (NULL ));close (fd);
Signature · 4 lines
1.9.1 -- To unsubscribe from this list: send the line "unsubscribe autofs" in
Ian Kent
maintainerRe: [PATCH v3 3/3] autofs-5.1.1 - use monotonic clock instead of time().
Quoted 3 lines · Yu Ning
A new function
monotonic_time()is introduced inautomount.has a monotonic version oftime(), all the calls totime()have been switched to use this new function.
I'm also thinking we should have a slightly different patch breakup.
Let me see if I can actually apply the patches we have and if I can I'll post a revision with the changes I'm recommending.
Quoted 588 lines
Signed-off-by Yu Ning <[email protected]>--- daemon/automount.c | 4 ++-- daemon/direct.c | 4 ++-- daemon/indirect.c | 4 ++-- daemon/lookup.c | 6 +++--- daemon/state.c | 2 +- include/automount.h | 9 +++++++++ lib/alarm.c | 4 ++-- lib/cache.c | 2 +- lib/master.c | 4 ++-- modules/dclist.c | 2 +- modules/lookup_file.c | 8 ++++---- modules/lookup_hesiod.c | 6 +++--- modules/lookup_hosts.c | 4 ++-- modules/lookup_ldap.c | 10 +++++----- modules/lookup_nisplus.c | 10 +++++----- modules/lookup_program.c | 10 +++++----- modules/lookup_sss.c | 6 +++--- modules/lookup_userhome.c | 2 +- modules/lookup_yp.c | 8 ++++---- modules/mount_autofs.c | 2 +- modules/parse_amd.c | 2 +- modules/replicated.c | 4 ++-- 22 files changed, 61 insertions(+), 52 deletions(-)daemon/automount.c +2
-2@@ -1454,7 +1454,7 @@ static void *statemachine(void *arg)break ;case SIGHUP : -do_hup_signal (master_list,time (NULL )); +do_hup_signal (master_list,monotonic_time (NULL ));break ;default :@@ -2004,7 +2004,7 @@ int main(int argc, char *argv[])unsigned ghost, logging, daemon_check;unsigned dumpmaps, foreground, have_global_options;time_t timeout; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );struct rlimit rlim;const char *options ="+hp:t:vmdD:fVrO:l:n:CF" ;static const struct option long_options[] = {daemon/direct.c +2
-2@@ -464,7 +464,7 @@ int mount_autofs_direct(struct autofs_point *ap)struct mapent_cache *nc, *mc;struct mapent *me, *ne, *nested;struct mnt_list *mnts; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );if (strcmp (ap->path,"/-" )) {error (ap->logopt,"expected direct map, exiting" );@@ -1388,7 +1388,7 @@ int handle_packet_missing_direct(struct autofs_point *ap, autofs_packet_missing_ }/* Check if we recorded a mount fail for this key */ -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) { ops->send_fail (ap->logopt, ioctlfd, pkt->wait_queue_token, -ENOENT ); ops->close (ap->logopt, ioctlfd);daemon/indirect.c +2
-2@@ -197,7 +197,7 @@ out_err:int mount_autofs_indirect (struct autofs_point *ap,const char *root) { -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );int status;int map;@@ -818,7 +818,7 @@ int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missin/* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, pkt->name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) { ops->send_fail (ap->logopt, ap->ioctlfd, pkt->wait_queue_token, -ENOENT );cache_unlock (me->mc);daemon/lookup.c +3
-3@@ -875,7 +875,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_struct map_source *instance;char src_file[] ="file" ;char src_prog[] ="program" ; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );struct stat st;char *type, *format;@@ -915,7 +915,7 @@ static int lookup_name_source_instance(struct autofs_point *ap, struct map_sourc {struct map_source *instance;const char *format; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );if (*name =='/' && map->flags &MAP_FLAG_FORMAT_AMD )return lookup_amd_instance (ap, map, name, name_len);@@ -1079,7 +1079,7 @@ static void update_negative_cache(struct autofs_point *ap, struct map_source *soelse map = entry->maps;if (map) { -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );int rv =CHE_FAIL ;cache_writelock (map->mc);daemon/state.c +1
-1@@ -553,7 +553,7 @@ static unsigned int st_readmap(struct autofs_point *ap)pthread_t thid;struct readmap_args *ra;int status; -int now =time (NULL ); +int now =monotonic_time (NULL );debug (ap->logopt,"state %d path %s" , ap->state, ap->path);include/automount.h +9
-0@@ -565,6 +565,15 @@ do { \fatal (_m_unlock); \ }while (0 ) +static inline time_t monotonic_time(time_t *t) +{ +struct timespec ts; +clock_gettime (CLOCK_MONOTONIC , &ts); +if (t) + *t = (time_t ) ts.tv_sec; +return (time_t ) ts.tv_sec; +} +/* Expire alarm handling routines */ int alarm_start_handler (void );int alarm_add (struct autofs_point *ap,time_t seconds);lib/alarm.c +2
-2@@ -46,7 +46,7 @@ int alarm_add(struct autofs_point *ap, time_t seconds)struct list_head *head;struct list_head *p;struct alarm *new; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t next_alarm =0 ;unsigned int empty =1 ;int status;@@ -175,7 +175,7 @@ static void *alarm_handler(void *arg) first = list_entry(head->next, struct alarm, list); - now =time (NULL ); + now =monotonic_time (NULL );if (first->time > now) {struct timespec nsecs;lib/cache.c +1
-1@@ -775,7 +775,7 @@ void cache_update_negative(struct mapent_cache *mc, struct map_source *ms, const char *key, time_t timeout) { - time_t now = time(NULL); + time_t now = monotonic_time(NULL);struct mapent *me;int rv =CHE_OK ;lib/master.c +2
-2@@ -1483,7 +1483,7 @@ int dump_map(struct master *master, const char *type, const char *name)struct map_source *source;struct master_mapent *this;struct autofs_point *ap; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL ); this = list_entry(p, struct master_mapent, list); p = p->next;@@ -1601,7 +1601,7 @@ int master_show_mounts(struct master *master)struct map_source *source;struct master_mapent *this;struct autofs_point *ap; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );unsigned int count =0 ; this = list_entry(p, struct master_mapent, list);modules/dclist.c +1
-1@@ -568,7 +568,7 @@ struct dclist *get_dc_list(unsigned int logopt, const char *uri)if (!list) goto out_error; - dclist->expire =time (NULL ) + min_ttl; + dclist->expire =monotonic_time (NULL ) + min_ttl; dclist->uri = list;return dclist;modules/lookup_file.c +4
-4@@ -743,7 +743,7 @@ static int match_key(struct autofs_point *ap, {char buf[MAX_ERR_BUF ];struct mapent_cache *mc; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char *lkp_key;char *prefix;size_t map_key_len;@@ -808,7 +808,7 @@ static int lookup_one(struct autofs_point *ap,struct mapent_cache *mc = source->mc;char mkey[KEY_MAX_LEN +1 ];char mapent[MAPENT_MAX_LEN +1 ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );FILE *f;unsigned int k_len, m_len;int entry, ret;@@ -914,7 +914,7 @@ static int lookup_wild(struct autofs_point *ap,struct mapent_cache *mc;char mkey[KEY_MAX_LEN +1 ];char mapent[MAPENT_MAX_LEN +1 ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );FILE *f;unsigned int k_len, m_len;int entry, ret;@@ -1118,7 +1118,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {modules/lookup_hesiod.c +3
-3@@ -163,7 +163,7 @@ static int lookup_one(struct autofs_point *ap, }cache_writelock (mc); - ret =cache_update (mc, source, key, best_record,time (NULL )); + ret =cache_update (mc, source, key, best_record,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {hesiod_free_list (ctxt->hesiod_context, hes_result);@@ -228,7 +228,7 @@ static int lookup_one_amd(struct autofs_point *ap, }cache_writelock (mc); - ret =cache_update (mc, source, lkp_key, *hes_result,time (NULL )); + ret =cache_update (mc, source, lkp_key, *hes_result,monotonic_time (NULL ));cache_unlock (mc);if (hes_result)@@ -339,7 +339,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {modules/lookup_hosts.c +2
-2@@ -284,7 +284,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *struct mapent *me;char *mapent =NULL ;int mapent_len; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );int ret; source = ap->entry->current;@@ -296,7 +296,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {modules/lookup_ldap.c +5
-5@@ -944,7 +944,7 @@ static LDAP *do_reconnect(unsigned logopt, struct lookup_context *ctxt)uris_mutex_lock (ctxt);if (ctxt->dclist) { -if (!ldap || ctxt->dclist->expire <time (NULL )) { +if (!ldap || ctxt->dclist->expire <monotonic_time (NULL )) {free_dclist (ctxt->dclist); ctxt->dclist =NULL ; }@@ -2851,7 +2851,7 @@ static int lookup_one(struct autofs_point *ap, struct map_source *source,struct mapent_cache *mc;int rv, i, l, ql, count;char buf[MAX_ERR_BUF ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char *query;LDAPMessage *result =NULL , *e;char *class, *info, *entry;@@ -3214,7 +3214,7 @@ static int lookup_one_amd(struct autofs_point *ap,struct berval **bvKey;struct berval **bvValues;char buf[MAX_ERR_BUF ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int rv, l, ql, count;int ret =CHE_MISSING ;@@ -3417,7 +3417,7 @@ static int check_map_indirect(struct autofs_point *ap,unsigned int is_amd_format = source->flags &MAP_FLAG_FORMAT_AMD ;struct mapent_cache *mc;struct mapent *me; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret, cur_state;int status;@@ -3555,7 +3555,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {modules/lookup_nisplus.c +5
-5@@ -288,7 +288,7 @@ static int lookup_one(struct autofs_point *ap,nis_result *result;nis_object *this;char *mapent; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret, cur_state;char buf[MAX_ERR_BUF ];@@ -400,7 +400,7 @@ static int lookup_wild(struct autofs_point *ap,nis_result *result;nis_object *this;char *mapent; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret, cur_state;char buf[MAX_ERR_BUF ];@@ -487,7 +487,7 @@ static int lookup_amd_defaults(struct autofs_point *ap, mapent =ENTRY_VAL (this,1 );cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , mapent,time (NULL )); + ret =cache_update (mc, source,"/defaults" , mapent,monotonic_time (NULL ));cache_unlock (mc);nis_freeresult (result);@@ -505,7 +505,7 @@ static int check_map_indirect(struct autofs_point *ap,unsigned int is_amd_format = source->flags &MAP_FLAG_FORMAT_AMD ;struct mapent_cache *mc;struct mapent *me, *exists; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret =0 ;@@ -650,7 +650,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {modules/lookup_program.c +5
-5@@ -369,7 +369,7 @@ static int lookup_amd_defaults(struct autofs_point *ap,while (isblank (*start)) start++;cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , start,time (NULL )); + ret =cache_update (mc, source,"/defaults" , start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (ment);@@ -438,7 +438,7 @@ static int match_key(struct autofs_point *ap, start++; }cache_writelock (mc); - ret =cache_update (mc, source, lkp_key, start,time (NULL )); + ret =cache_update (mc, source, lkp_key, start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (ment);@@ -491,7 +491,7 @@ static int match_key(struct autofs_point *ap,while (isblank (*start)) start++;cache_writelock (mc); - ret =cache_update (mc, source, match, start,time (NULL )); + ret =cache_update (mc, source, match, start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (match);@@ -537,7 +537,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {@@ -586,7 +586,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void ** proceed with the program map lookup. */ if (strchr (name,'/' ) || - me->age + ap->negative_timeout >time (NULL )) { + me->age + ap->negative_timeout >monotonic_time (NULL )) {char *ent =NULL ;if (me->mapent) {modules/lookup_sss.c +3
-3@@ -374,7 +374,7 @@ static int lookup_one(struct autofs_point *ap,struct mapent_cache *mc;struct mapent *we;void *sss_ctxt =NULL ; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char buf[MAX_ERR_BUF ];char *value =NULL ;char *s_key;@@ -491,7 +491,7 @@ static int check_map_indirect(struct autofs_point *ap,struct map_source *source;struct mapent_cache *mc;struct mapent *me; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret, cur_state;@@ -585,7 +585,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {modules/lookup_userhome.c +1
-1@@ -77,7 +77,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void * }cache_writelock (mc); - ret =cache_update (mc, source, name,NULL ,time (NULL )); + ret =cache_update (mc, source, name,NULL ,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {modules/lookup_yp.c +4
-4@@ -405,7 +405,7 @@ static int lookup_one(struct autofs_point *ap,char *mapname;char *mapent;int mapent_len; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret; mc = source->mc;@@ -517,7 +517,7 @@ static int lookup_wild(struct autofs_point *ap,char *mapname;char *mapent;int mapent_len; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret; mc = source->mc;@@ -598,7 +598,7 @@ static int lookup_amd_defaults(struct autofs_point *ap,return CHE_FAIL ;cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , mapent,time (NULL )); + ret =cache_update (mc, source,"/defaults" , mapent,monotonic_time (NULL ));cache_unlock (mc);return ret;@@ -753,7 +753,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {modules/mount_autofs.c +1
-1@@ -242,7 +242,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, source =master_add_map_source (entry, info->type, info->format, -time (NULL ), argc, argv); +monotonic_time (NULL ), argc, argv);if (!source) {error (ap->logopt,MODPREFIX "failed to add map source to entry" );modules/parse_amd.c +1
-1@@ -1181,7 +1181,7 @@ static int do_host_mount(struct autofs_point *ap, const char *name, "hosts", "sun", argc, pargv);if (!instance) { instance =master_add_source_instance (source, -"hosts" ,"sun" ,time (NULL ), argc, pargv); +"hosts" ,"sun" ,monotonic_time (NULL ), argc, pargv);if (!instance) {error (ap->logopt,MODPREFIX "failed to create source instance for hosts map" );modules/replicated.c +1
-1@@ -69,14 +69,14 @@ void seed_random(void) fd =open_fd ("/dev/urandom" ,O_RDONLY );if (fd <0 ) { -srandom (time (NULL )); +srandom (monotonic_time (NULL ));return ;
modules/replicated.c void seed_random(void) · line 82
Quoted 10 lines
modules/replicated.c +1
-1}if (read (fd, &seed,sizeof (seed)) !=-1 )srandom (seed);else -srandom (time (NULL )); +srandom (monotonic_time (NULL ));close (fd);
--
To unsubscribe from this list: send the line "unsubscribe autofs" in
Ian Kent
maintainerRe: [PATCH v3 3/3] autofs-5.1.1 - use monotonic clock instead of time().
Quoted 9 lines · Ian Kent
Quoted 3 lines · Yu Ning
A new function
monotonic_time()is introduced inautomount.has a monotonic version oftime(), all the calls totime()have been switched to use this new function.I'm also thinking we should have a slightly different patch breakup.
Let me see if I can actually apply the patches we have and if I can I'll post a revision with the changes I'm recommending.
Using dos2unix does work in this case so I've been able to import them to my queue using StGIT.
I'll have a go at making my recommended changes which will also give me a chance to look closely at all the changes (even though most as straight forward conversion to monotonic clock usage).
That's probably going to take a little while as I have other priority work on the go.
Quoted 597 lines
Quoted 597 lines
Signed-off-by Yu Ning <[email protected]>--- daemon/automount.c | 4 ++-- daemon/direct.c | 4 ++-- daemon/indirect.c | 4 ++-- daemon/lookup.c | 6 +++--- daemon/state.c | 2 +- include/automount.h | 9 +++++++++ lib/alarm.c | 4 ++-- lib/cache.c | 2 +- lib/master.c | 4 ++-- modules/dclist.c | 2 +- modules/lookup_file.c | 8 ++++---- modules/lookup_hesiod.c | 6 +++--- modules/lookup_hosts.c | 4 ++-- modules/lookup_ldap.c | 10 +++++----- modules/lookup_nisplus.c | 10 +++++----- modules/lookup_program.c | 10 +++++----- modules/lookup_sss.c | 6 +++--- modules/lookup_userhome.c | 2 +- modules/lookup_yp.c | 8 ++++---- modules/mount_autofs.c | 2 +- modules/parse_amd.c | 2 +- modules/replicated.c | 4 ++-- 22 files changed, 61 insertions(+), 52 deletions(-)daemon/automount.c +2
-2@@ -1454,7 +1454,7 @@ static void *statemachine(void *arg)break ;case SIGHUP : -do_hup_signal (master_list,time (NULL )); +do_hup_signal (master_list,monotonic_time (NULL ));break ;default :@@ -2004,7 +2004,7 @@ int main(int argc, char *argv[])unsigned ghost, logging, daemon_check;unsigned dumpmaps, foreground, have_global_options;time_t timeout; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );struct rlimit rlim;const char *options ="+hp:t:vmdD:fVrO:l:n:CF" ;static const struct option long_options[] = {daemon/direct.c +2
-2@@ -464,7 +464,7 @@ int mount_autofs_direct(struct autofs_point *ap)struct mapent_cache *nc, *mc;struct mapent *me, *ne, *nested;struct mnt_list *mnts; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );if (strcmp (ap->path,"/-" )) {error (ap->logopt,"expected direct map, exiting" );@@ -1388,7 +1388,7 @@ int handle_packet_missing_direct(struct autofs_point *ap, autofs_packet_missing_ }/* Check if we recorded a mount fail for this key */ -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) { ops->send_fail (ap->logopt, ioctlfd, pkt->wait_queue_token, -ENOENT ); ops->close (ap->logopt, ioctlfd);daemon/indirect.c +2
-2@@ -197,7 +197,7 @@ out_err:int mount_autofs_indirect (struct autofs_point *ap,const char *root) { -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );int status;int map;@@ -818,7 +818,7 @@ int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missin/* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, pkt->name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) { ops->send_fail (ap->logopt, ap->ioctlfd, pkt->wait_queue_token, -ENOENT );cache_unlock (me->mc);daemon/lookup.c +3
-3@@ -875,7 +875,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_struct map_source *instance;char src_file[] ="file" ;char src_prog[] ="program" ; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );struct stat st;char *type, *format;@@ -915,7 +915,7 @@ static int lookup_name_source_instance(struct autofs_point *ap, struct map_sourc {struct map_source *instance;const char *format; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );if (*name =='/' && map->flags &MAP_FLAG_FORMAT_AMD )return lookup_amd_instance (ap, map, name, name_len);@@ -1079,7 +1079,7 @@ static void update_negative_cache(struct autofs_point *ap, struct map_source *soelse map = entry->maps;if (map) { -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );int rv =CHE_FAIL ;cache_writelock (map->mc);daemon/state.c +1
-1@@ -553,7 +553,7 @@ static unsigned int st_readmap(struct autofs_point *ap)pthread_t thid;struct readmap_args *ra;int status; -int now =time (NULL ); +int now =monotonic_time (NULL );debug (ap->logopt,"state %d path %s" , ap->state, ap->path);include/automount.h +9
-0@@ -565,6 +565,15 @@ do { \fatal (_m_unlock); \ }while (0 ) +static inline time_t monotonic_time(time_t *t) +{ +struct timespec ts; +clock_gettime (CLOCK_MONOTONIC , &ts); +if (t) + *t = (time_t ) ts.tv_sec; +return (time_t ) ts.tv_sec; +} +/* Expire alarm handling routines */ int alarm_start_handler (void );int alarm_add (struct autofs_point *ap,time_t seconds);lib/alarm.c +2
-2@@ -46,7 +46,7 @@ int alarm_add(struct autofs_point *ap, time_t seconds)struct list_head *head;struct list_head *p;struct alarm *new; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t next_alarm =0 ;unsigned int empty =1 ;int status;@@ -175,7 +175,7 @@ static void *alarm_handler(void *arg) first = list_entry(head->next, struct alarm, list); - now =time (NULL ); + now =monotonic_time (NULL );if (first->time > now) {struct timespec nsecs;lib/cache.c +1
-1@@ -775,7 +775,7 @@ void cache_update_negative(struct mapent_cache *mc, struct map_source *ms, const char *key, time_t timeout) { - time_t now = time(NULL); + time_t now = monotonic_time(NULL);struct mapent *me;int rv =CHE_OK ;lib/master.c +2
-2@@ -1483,7 +1483,7 @@ int dump_map(struct master *master, const char *type, const char *name)struct map_source *source;struct master_mapent *this;struct autofs_point *ap; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL ); this = list_entry(p, struct master_mapent, list); p = p->next;@@ -1601,7 +1601,7 @@ int master_show_mounts(struct master *master)struct map_source *source;struct master_mapent *this;struct autofs_point *ap; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );unsigned int count =0 ; this = list_entry(p, struct master_mapent, list);modules/dclist.c +1
-1@@ -568,7 +568,7 @@ struct dclist *get_dc_list(unsigned int logopt, const char *uri)if (!list) goto out_error; - dclist->expire =time (NULL ) + min_ttl; + dclist->expire =monotonic_time (NULL ) + min_ttl; dclist->uri = list;return dclist;modules/lookup_file.c +4
-4@@ -743,7 +743,7 @@ static int match_key(struct autofs_point *ap, {char buf[MAX_ERR_BUF ];struct mapent_cache *mc; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char *lkp_key;char *prefix;size_t map_key_len;@@ -808,7 +808,7 @@ static int lookup_one(struct autofs_point *ap,struct mapent_cache *mc = source->mc;char mkey[KEY_MAX_LEN +1 ];char mapent[MAPENT_MAX_LEN +1 ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );FILE *f;unsigned int k_len, m_len;int entry, ret;@@ -914,7 +914,7 @@ static int lookup_wild(struct autofs_point *ap,struct mapent_cache *mc;char mkey[KEY_MAX_LEN +1 ];char mapent[MAPENT_MAX_LEN +1 ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );FILE *f;unsigned int k_len, m_len;int entry, ret;@@ -1118,7 +1118,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {modules/lookup_hesiod.c +3
-3@@ -163,7 +163,7 @@ static int lookup_one(struct autofs_point *ap, }cache_writelock (mc); - ret =cache_update (mc, source, key, best_record,time (NULL )); + ret =cache_update (mc, source, key, best_record,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {hesiod_free_list (ctxt->hesiod_context, hes_result);@@ -228,7 +228,7 @@ static int lookup_one_amd(struct autofs_point *ap, }cache_writelock (mc); - ret =cache_update (mc, source, lkp_key, *hes_result,time (NULL )); + ret =cache_update (mc, source, lkp_key, *hes_result,monotonic_time (NULL ));cache_unlock (mc);if (hes_result)@@ -339,7 +339,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {modules/lookup_hosts.c +2
-2@@ -284,7 +284,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *struct mapent *me;char *mapent =NULL ;int mapent_len; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );int ret; source = ap->entry->current;@@ -296,7 +296,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {modules/lookup_ldap.c +5
-5@@ -944,7 +944,7 @@ static LDAP *do_reconnect(unsigned logopt, struct lookup_context *ctxt)uris_mutex_lock (ctxt);if (ctxt->dclist) { -if (!ldap || ctxt->dclist->expire <time (NULL )) { +if (!ldap || ctxt->dclist->expire <monotonic_time (NULL )) {free_dclist (ctxt->dclist); ctxt->dclist =NULL ; }@@ -2851,7 +2851,7 @@ static int lookup_one(struct autofs_point *ap, struct map_source *source,struct mapent_cache *mc;int rv, i, l, ql, count;char buf[MAX_ERR_BUF ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char *query;LDAPMessage *result =NULL , *e;char *class, *info, *entry;@@ -3214,7 +3214,7 @@ static int lookup_one_amd(struct autofs_point *ap,struct berval **bvKey;struct berval **bvValues;char buf[MAX_ERR_BUF ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int rv, l, ql, count;int ret =CHE_MISSING ;@@ -3417,7 +3417,7 @@ static int check_map_indirect(struct autofs_point *ap,unsigned int is_amd_format = source->flags &MAP_FLAG_FORMAT_AMD ;struct mapent_cache *mc;struct mapent *me; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret, cur_state;int status;@@ -3555,7 +3555,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {modules/lookup_nisplus.c +5
-5@@ -288,7 +288,7 @@ static int lookup_one(struct autofs_point *ap,nis_result *result;nis_object *this;char *mapent; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret, cur_state;char buf[MAX_ERR_BUF ];@@ -400,7 +400,7 @@ static int lookup_wild(struct autofs_point *ap,nis_result *result;nis_object *this;char *mapent; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret, cur_state;char buf[MAX_ERR_BUF ];@@ -487,7 +487,7 @@ static int lookup_amd_defaults(struct autofs_point *ap, mapent =ENTRY_VAL (this,1 );cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , mapent,time (NULL )); + ret =cache_update (mc, source,"/defaults" , mapent,monotonic_time (NULL ));cache_unlock (mc);nis_freeresult (result);@@ -505,7 +505,7 @@ static int check_map_indirect(struct autofs_point *ap,unsigned int is_amd_format = source->flags &MAP_FLAG_FORMAT_AMD ;struct mapent_cache *mc;struct mapent *me, *exists; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret =0 ;@@ -650,7 +650,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {modules/lookup_program.c +5
-5@@ -369,7 +369,7 @@ static int lookup_amd_defaults(struct autofs_point *ap,while (isblank (*start)) start++;cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , start,time (NULL )); + ret =cache_update (mc, source,"/defaults" , start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (ment);@@ -438,7 +438,7 @@ static int match_key(struct autofs_point *ap, start++; }cache_writelock (mc); - ret =cache_update (mc, source, lkp_key, start,time (NULL )); + ret =cache_update (mc, source, lkp_key, start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (ment);@@ -491,7 +491,7 @@ static int match_key(struct autofs_point *ap,while (isblank (*start)) start++;cache_writelock (mc); - ret =cache_update (mc, source, match, start,time (NULL )); + ret =cache_update (mc, source, match, start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (match);@@ -537,7 +537,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {@@ -586,7 +586,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void ** proceed with the program map lookup. */ if (strchr (name,'/' ) || - me->age + ap->negative_timeout >time (NULL )) { + me->age + ap->negative_timeout >monotonic_time (NULL )) {char *ent =NULL ;if (me->mapent) {modules/lookup_sss.c +3
-3@@ -374,7 +374,7 @@ static int lookup_one(struct autofs_point *ap,struct mapent_cache *mc;struct mapent *we;void *sss_ctxt =NULL ; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char buf[MAX_ERR_BUF ];char *value =NULL ;char *s_key;@@ -491,7 +491,7 @@ static int check_map_indirect(struct autofs_point *ap,struct map_source *source;struct mapent_cache *mc;struct mapent *me; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret, cur_state;@@ -585,7 +585,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {modules/lookup_userhome.c +1
-1@@ -77,7 +77,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void * }cache_writelock (mc); - ret =cache_update (mc, source, name,NULL ,time (NULL )); + ret =cache_update (mc, source, name,NULL ,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {modules/lookup_yp.c +4
-4@@ -405,7 +405,7 @@ static int lookup_one(struct autofs_point *ap,char *mapname;char *mapent;int mapent_len; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret; mc = source->mc;@@ -517,7 +517,7 @@ static int lookup_wild(struct autofs_point *ap,char *mapname;char *mapent;int mapent_len; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret; mc = source->mc;@@ -598,7 +598,7 @@ static int lookup_amd_defaults(struct autofs_point *ap,return CHE_FAIL ;cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , mapent,time (NULL )); + ret =cache_update (mc, source,"/defaults" , mapent,monotonic_time (NULL ));cache_unlock (mc);return ret;@@ -753,7 +753,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {modules/mount_autofs.c +1
-1@@ -242,7 +242,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, source =master_add_map_source (entry, info->type, info->format, -time (NULL ), argc, argv); +monotonic_time (NULL ), argc, argv);if (!source) {error (ap->logopt,MODPREFIX "failed to add map source to entry" );modules/parse_amd.c +1
-1@@ -1181,7 +1181,7 @@ static int do_host_mount(struct autofs_point *ap, const char *name, "hosts", "sun", argc, pargv);if (!instance) { instance =master_add_source_instance (source, -"hosts" ,"sun" ,time (NULL ), argc, pargv); +"hosts" ,"sun" ,monotonic_time (NULL ), argc, pargv);if (!instance) {error (ap->logopt,MODPREFIX "failed to create source instance for hosts map" );modules/replicated.c +2
-2@@ -69,14 +69,14 @@ void seed_random(void) fd =open_fd ("/dev/urandom" ,O_RDONLY );if (fd <0 ) { -srandom (time (NULL )); +srandom (monotonic_time (NULL ));return ; }if (read (fd, &seed,sizeof (seed)) !=-1 )srandom (seed);else -srandom (time (NULL )); +srandom (monotonic_time (NULL ));
Quoted 6 lines
modules/replicated.c void seed_random(void) · line 82
Quoted 2 lines
modules/replicated.c +0
-0close (fd);--
To unsubscribe from this list: send the line "unsubscribe autofs" in
--
To unsubscribe from this list: send the line "unsubscribe autofs" in
Re: [PATCH v3 3/3] autofs-5.1.1 - use monotonic clock instead of time().
Quoted 14 lines · Ian Kent
Quoted 9 lines · Ian Kent
Quoted 3 lines · Yu Ning
A new function
monotonic_time()is introduced inautomount.has a monotonic version oftime(), all the calls totime()have been switched to use this new function.I'm also thinking we should have a slightly different patch breakup.
Let me see if I can actually apply the patches we have and if I can I'll post a revision with the changes I'm recommending.
Using dos2unix does work in this case so I've been able to import them to my queue using StGIT.
Quoted 7 lines
I'll have a go at making my recommended changes which will also give me a chance to look closely at all the changes (even though most as straight forward conversion to monotonic clock usage).
That's probably going to take a little while as I have other priority work on the go.
Thank you so much, please let me know if anything can be done by me, it's my pleasure.
Quoted 597 lines
Quoted 597 lines
Quoted 597 lines
Signed-off-by Yu Ning <[email protected]>--- daemon/automount.c | 4 ++-- daemon/direct.c | 4 ++-- daemon/indirect.c | 4 ++-- daemon/lookup.c | 6 +++--- daemon/state.c | 2 +- include/automount.h | 9 +++++++++ lib/alarm.c | 4 ++-- lib/cache.c | 2 +- lib/master.c | 4 ++-- modules/dclist.c | 2 +- modules/lookup_file.c | 8 ++++---- modules/lookup_hesiod.c | 6 +++--- modules/lookup_hosts.c | 4 ++-- modules/lookup_ldap.c | 10 +++++----- modules/lookup_nisplus.c | 10 +++++----- modules/lookup_program.c | 10 +++++----- modules/lookup_sss.c | 6 +++--- modules/lookup_userhome.c | 2 +- modules/lookup_yp.c | 8 ++++---- modules/mount_autofs.c | 2 +- modules/parse_amd.c | 2 +- modules/replicated.c | 4 ++-- 22 files changed, 61 insertions(+), 52 deletions(-)daemon/automount.c +2
-2@@ -1454,7 +1454,7 @@ static void *statemachine(void *arg)break ;case SIGHUP : -do_hup_signal (master_list,time (NULL )); +do_hup_signal (master_list,monotonic_time (NULL ));break ;default :@@ -2004,7 +2004,7 @@ int main(int argc, char *argv[])unsigned ghost, logging, daemon_check;unsigned dumpmaps, foreground, have_global_options;time_t timeout; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );struct rlimit rlim;const char *options ="+hp:t:vmdD:fVrO:l:n:CF" ;static const struct option long_options[] = {daemon/direct.c +2
-2@@ -464,7 +464,7 @@ int mount_autofs_direct(struct autofs_point *ap)struct mapent_cache *nc, *mc;struct mapent *me, *ne, *nested;struct mnt_list *mnts; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );if (strcmp (ap->path,"/-" )) {error (ap->logopt,"expected direct map, exiting" );@@ -1388,7 +1388,7 @@ int handle_packet_missing_direct(struct autofs_point *ap, autofs_packet_missing_ }/* Check if we recorded a mount fail for this key */ -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) { ops->send_fail (ap->logopt, ioctlfd, pkt->wait_queue_token, -ENOENT ); ops->close (ap->logopt, ioctlfd);daemon/indirect.c +2
-2@@ -197,7 +197,7 @@ out_err:int mount_autofs_indirect (struct autofs_point *ap,const char *root) { -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );int status;int map;@@ -818,7 +818,7 @@ int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missin/* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, pkt->name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) { ops->send_fail (ap->logopt, ap->ioctlfd, pkt->wait_queue_token, -ENOENT );cache_unlock (me->mc);daemon/lookup.c +3
-3@@ -875,7 +875,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_struct map_source *instance;char src_file[] ="file" ;char src_prog[] ="program" ; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );struct stat st;char *type, *format;@@ -915,7 +915,7 @@ static int lookup_name_source_instance(struct autofs_point *ap, struct map_sourc {struct map_source *instance;const char *format; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );if (*name =='/' && map->flags &MAP_FLAG_FORMAT_AMD )return lookup_amd_instance (ap, map, name, name_len);@@ -1079,7 +1079,7 @@ static void update_negative_cache(struct autofs_point *ap, struct map_source *soelse map = entry->maps;if (map) { -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );int rv =CHE_FAIL ;cache_writelock (map->mc);daemon/state.c +1
-1@@ -553,7 +553,7 @@ static unsigned int st_readmap(struct autofs_point *ap)pthread_t thid;struct readmap_args *ra;int status; -int now =time (NULL ); +int now =monotonic_time (NULL );debug (ap->logopt,"state %d path %s" , ap->state, ap->path);include/automount.h +9
-0@@ -565,6 +565,15 @@ do { \fatal (_m_unlock); \ }while (0 ) +static inline time_t monotonic_time(time_t *t) +{ +struct timespec ts; +clock_gettime (CLOCK_MONOTONIC , &ts); +if (t) + *t = (time_t ) ts.tv_sec; +return (time_t ) ts.tv_sec; +} +/* Expire alarm handling routines */ int alarm_start_handler (void );int alarm_add (struct autofs_point *ap,time_t seconds);lib/alarm.c +2
-2@@ -46,7 +46,7 @@ int alarm_add(struct autofs_point *ap, time_t seconds)struct list_head *head;struct list_head *p;struct alarm *new; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t next_alarm =0 ;unsigned int empty =1 ;int status;@@ -175,7 +175,7 @@ static void *alarm_handler(void *arg) first = list_entry(head->next, struct alarm, list); - now =time (NULL ); + now =monotonic_time (NULL );if (first->time > now) {struct timespec nsecs;lib/cache.c +1
-1@@ -775,7 +775,7 @@ void cache_update_negative(struct mapent_cache *mc, struct map_source *ms, const char *key, time_t timeout) { - time_t now = time(NULL); + time_t now = monotonic_time(NULL);struct mapent *me;int rv =CHE_OK ;lib/master.c +2
-2@@ -1483,7 +1483,7 @@ int dump_map(struct master *master, const char *type, const char *name)struct map_source *source;struct master_mapent *this;struct autofs_point *ap; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL ); this = list_entry(p, struct master_mapent, list); p = p->next;@@ -1601,7 +1601,7 @@ int master_show_mounts(struct master *master)struct map_source *source;struct master_mapent *this;struct autofs_point *ap; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );unsigned int count =0 ; this = list_entry(p, struct master_mapent, list);modules/dclist.c +1
-1@@ -568,7 +568,7 @@ struct dclist *get_dc_list(unsigned int logopt, const char *uri)if (!list) goto out_error; - dclist->expire =time (NULL ) + min_ttl; + dclist->expire =monotonic_time (NULL ) + min_ttl; dclist->uri = list;return dclist;modules/lookup_file.c +4
-4@@ -743,7 +743,7 @@ static int match_key(struct autofs_point *ap, {char buf[MAX_ERR_BUF ];struct mapent_cache *mc; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char *lkp_key;char *prefix;size_t map_key_len;@@ -808,7 +808,7 @@ static int lookup_one(struct autofs_point *ap,struct mapent_cache *mc = source->mc;char mkey[KEY_MAX_LEN +1 ];char mapent[MAPENT_MAX_LEN +1 ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );FILE *f;unsigned int k_len, m_len;int entry, ret;@@ -914,7 +914,7 @@ static int lookup_wild(struct autofs_point *ap,struct mapent_cache *mc;char mkey[KEY_MAX_LEN +1 ];char mapent[MAPENT_MAX_LEN +1 ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );FILE *f;unsigned int k_len, m_len;int entry, ret;@@ -1118,7 +1118,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {modules/lookup_hesiod.c +3
-3@@ -163,7 +163,7 @@ static int lookup_one(struct autofs_point *ap, }cache_writelock (mc); - ret =cache_update (mc, source, key, best_record,time (NULL )); + ret =cache_update (mc, source, key, best_record,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {hesiod_free_list (ctxt->hesiod_context, hes_result);@@ -228,7 +228,7 @@ static int lookup_one_amd(struct autofs_point *ap, }cache_writelock (mc); - ret =cache_update (mc, source, lkp_key, *hes_result,time (NULL )); + ret =cache_update (mc, source, lkp_key, *hes_result,monotonic_time (NULL ));cache_unlock (mc);if (hes_result)@@ -339,7 +339,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {modules/lookup_hosts.c +2
-2@@ -284,7 +284,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *struct mapent *me;char *mapent =NULL ;int mapent_len; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );int ret; source = ap->entry->current;@@ -296,7 +296,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {modules/lookup_ldap.c +5
-5@@ -944,7 +944,7 @@ static LDAP *do_reconnect(unsigned logopt, struct lookup_context *ctxt)uris_mutex_lock (ctxt);if (ctxt->dclist) { -if (!ldap || ctxt->dclist->expire <time (NULL )) { +if (!ldap || ctxt->dclist->expire <monotonic_time (NULL )) {free_dclist (ctxt->dclist); ctxt->dclist =NULL ; }@@ -2851,7 +2851,7 @@ static int lookup_one(struct autofs_point *ap, struct map_source *source,struct mapent_cache *mc;int rv, i, l, ql, count;char buf[MAX_ERR_BUF ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char *query;LDAPMessage *result =NULL , *e;char *class, *info, *entry;@@ -3214,7 +3214,7 @@ static int lookup_one_amd(struct autofs_point *ap,struct berval **bvKey;struct berval **bvValues;char buf[MAX_ERR_BUF ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int rv, l, ql, count;int ret =CHE_MISSING ;@@ -3417,7 +3417,7 @@ static int check_map_indirect(struct autofs_point *ap,unsigned int is_amd_format = source->flags &MAP_FLAG_FORMAT_AMD ;struct mapent_cache *mc;struct mapent *me; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret, cur_state;int status;@@ -3555,7 +3555,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {modules/lookup_nisplus.c +5
-5@@ -288,7 +288,7 @@ static int lookup_one(struct autofs_point *ap,nis_result *result;nis_object *this;char *mapent; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret, cur_state;char buf[MAX_ERR_BUF ];@@ -400,7 +400,7 @@ static int lookup_wild(struct autofs_point *ap,nis_result *result;nis_object *this;char *mapent; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret, cur_state;char buf[MAX_ERR_BUF ];@@ -487,7 +487,7 @@ static int lookup_amd_defaults(struct autofs_point *ap, mapent =ENTRY_VAL (this,1 );cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , mapent,time (NULL )); + ret =cache_update (mc, source,"/defaults" , mapent,monotonic_time (NULL ));cache_unlock (mc);nis_freeresult (result);@@ -505,7 +505,7 @@ static int check_map_indirect(struct autofs_point *ap,unsigned int is_amd_format = source->flags &MAP_FLAG_FORMAT_AMD ;struct mapent_cache *mc;struct mapent *me, *exists; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret =0 ;@@ -650,7 +650,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {modules/lookup_program.c +5
-5@@ -369,7 +369,7 @@ static int lookup_amd_defaults(struct autofs_point *ap,while (isblank (*start)) start++;cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , start,time (NULL )); + ret =cache_update (mc, source,"/defaults" , start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (ment);@@ -438,7 +438,7 @@ static int match_key(struct autofs_point *ap, start++; }cache_writelock (mc); - ret =cache_update (mc, source, lkp_key, start,time (NULL )); + ret =cache_update (mc, source, lkp_key, start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (ment);@@ -491,7 +491,7 @@ static int match_key(struct autofs_point *ap,while (isblank (*start)) start++;cache_writelock (mc); - ret =cache_update (mc, source, match, start,time (NULL )); + ret =cache_update (mc, source, match, start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (match);@@ -537,7 +537,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {@@ -586,7 +586,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void ** proceed with the program map lookup. */ if (strchr (name,'/' ) || - me->age + ap->negative_timeout >time (NULL )) { + me->age + ap->negative_timeout >monotonic_time (NULL )) {char *ent =NULL ;if (me->mapent) {modules/lookup_sss.c +3
-3@@ -374,7 +374,7 @@ static int lookup_one(struct autofs_point *ap,struct mapent_cache *mc;struct mapent *we;void *sss_ctxt =NULL ; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char buf[MAX_ERR_BUF ];char *value =NULL ;char *s_key;@@ -491,7 +491,7 @@ static int check_map_indirect(struct autofs_point *ap,struct map_source *source;struct mapent_cache *mc;struct mapent *me; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret, cur_state;@@ -585,7 +585,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {modules/lookup_userhome.c +1
-1@@ -77,7 +77,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void * }cache_writelock (mc); - ret =cache_update (mc, source, name,NULL ,time (NULL )); + ret =cache_update (mc, source, name,NULL ,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {modules/lookup_yp.c +4
-4@@ -405,7 +405,7 @@ static int lookup_one(struct autofs_point *ap,char *mapname;char *mapent;int mapent_len; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret; mc = source->mc;@@ -517,7 +517,7 @@ static int lookup_wild(struct autofs_point *ap,char *mapname;char *mapent;int mapent_len; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret; mc = source->mc;@@ -598,7 +598,7 @@ static int lookup_amd_defaults(struct autofs_point *ap,return CHE_FAIL ;cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , mapent,time (NULL )); + ret =cache_update (mc, source,"/defaults" , mapent,monotonic_time (NULL ));cache_unlock (mc);return ret;@@ -753,7 +753,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {modules/mount_autofs.c +1
-1@@ -242,7 +242,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, source =master_add_map_source (entry, info->type, info->format, -time (NULL ), argc, argv); +monotonic_time (NULL ), argc, argv);if (!source) {error (ap->logopt,MODPREFIX "failed to add map source to entry" );modules/parse_amd.c +1
-1@@ -1181,7 +1181,7 @@ static int do_host_mount(struct autofs_point *ap, const char *name, "hosts", "sun", argc, pargv);if (!instance) { instance =master_add_source_instance (source, -"hosts" ,"sun" ,time (NULL ), argc, pargv); +"hosts" ,"sun" ,monotonic_time (NULL ), argc, pargv);if (!instance) {error (ap->logopt,MODPREFIX "failed to create source instance for hosts map" );modules/replicated.c +2
-2@@ -69,14 +69,14 @@ void seed_random(void) fd =open_fd ("/dev/urandom" ,O_RDONLY );if (fd <0 ) { -srandom (time (NULL )); +srandom (monotonic_time (NULL ));return ; }if (read (fd, &seed,sizeof (seed)) !=-1 )srandom (seed);else -srandom (time (NULL )); +srandom (monotonic_time (NULL ));
Quoted 8 lines
Quoted 6 lines
modules/replicated.c void seed_random(void) · line 82
Quoted 2 lines
modules/replicated.c +0
-0close (fd);--
To unsubscribe from this list: send the line "unsubscribe autofs" in
--
To unsubscribe from this list: send the line "unsubscribe autofs" in
Quoted 56 lines · Ian Kent
Quoted 37 lines · Ning Yu
Quoted 17 lines · Ian Kent
Quoted 16 lines · Ning Yu
Quoted 14 lines · Ian Kent
Quoted 6 lines · Ning Yu
Hi,
I have composed a patch for this issue, it works in my side, what it does is replacing
gettimeofday()withclock_gettime(CLOCK_MONOTONIC).Would anyone please help to review it? Thanks in advance.
Are you joking!
How is this meant to apply to the current source, it won't.If you can manage to post a sane patch you will need to break it up into a few separate standalone patches with sane explanations of what each one is meant to achieve.
Quoted 6 lines
Quoted 2 lines
I'm sorry, not to offend, the previous patch was huge because all the call to
time()orgettimeofday()functions are replaced withclock_gettime().Encountering this after a generally unpleasant day is bound to get a short and unpleasant response, ;)
Best wishes for you and have a nice day/night :)
Quoted 10 lines
Quoted 3 lines
Please allow me to re-send the patch, this time I have splitted it into several smaller patches, hope it won't be as stupid as previous one.
Well, I see those posts but there are still problems with your email program.
Apart from the DOS line ends all the tabs appear to have been collapsed to single spaces.
Quoted 6 lines
Quoted 3 lines
I really don't want to go through and apply these hunk by hunk manually when you must have a properly formatted patch already.
Thanks for pointing it out, I will have to fix my email client issue first and resend the patches. Sorry for wasting you so much of time.
A couple of other small things.
Please make the title of the patch email the same as the tittle of the patch. And if possible add a [PATCH x/y] prefix to the title, x being the ordering of the patch within the y patches posted.
And in patch titles I commonly use "autofs-n-v-r - actual title".
So for example one of these would have a title like:
autofs-5.1.1 - Use monotonic clock instead oftime()
Quoted 9 lines
assuming you had made them against the 5.1.1 source.
I've also started to use (quite recently in fact) "Signed-off-by:" in patches so please add yours too, I don't feel right about adding it for someone else as it's an assumption that may or may not be correct.
These things aren't a big deal as I can change most of them myself easily if it's not convenient for you to do it.
Thanks very much for the suggestions, I have resent the v3 patches with git command, by CCing myself I checked the patches just now:
* the Signed-off-by part is added;
* the email subject is same with the patch title;
* and the autofs-5.1.1 prefix is added;
* however the EOL is still \r\n, this is really weird, because I use Linux and vim to do the job, and the original patches are generated with 'git format-patch', they contains unix EOL as expected, and they are sent with 'git send-email', not sure why gmail convert them to dos EOL.
Maybe I have to resend them as attachment.
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
From
cdb2bcd563420cd39af199309e8c0c7fc45a7bd1Mon Sep 17 00:00:00 2001
From: Yu Ning <[email protected]>
Date: Wed, 16 Sep 2015 15:56:21 +0800
Subject: [PATCH] Useclock_gettime()instead ofgettimeofday().This patch is to fix the issue that a mount point may not be automatically unmounted after a system date/time change.
Quoted 10 lines
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
Quoted 1 line
Reproducer with 100% failrate:
Since of you to hammer the result of the problem you've identified rather than just explain the problem and what needs to be done to resolve it in a polite and sensible manner.
--
To unsubscribe from this list: send the line "unsubscribe autofs" in
PATCH v4 1/3 autofs-5.1.1 - use clock_gettime() instead of gettimeofday().
The time returned by gettimeofday() is affected by discontinuous jumps in the system time, so it causes an issue that autofs may not auto unmount a mount point if system time is manually changed by the system administrator.
To fix the issue we can use clock_gettime(CLOCK_MONOTONIC) instead of gettimeofday().
A new function monotonic_elapsed() is introduced in rpc_subs.h as a timespec version of elapsed().
--- daemon/direct.c | 12 ++++++------ daemon/indirect.c | 12 ++++++------ include/rpc_subs.h | 1 + lib/alarm.c | 6 +++--- lib/rpc_subs.c | 17 ++++++++++++----- modules/replicated.c | 30 ++++++++++++++---------------- 6 files changed, 42 insertions(+), 36 deletions(-)
daemon/direct.c +6 -6
@@ -1041,7 +1041,7 @@ int handle_packet_expire_direct(struct autofs_point *ap, autofs_packet_expire_dichar buf[MAX_ERR_BUF ];pthread_t thid;struct timespec wait; -struct timeval now; +struct timespec now;int status, state;pthread_setcancelstate (PTHREAD_CANCEL_DISABLE , &state);
@@ -1159,9 +1159,9 @@ int handle_packet_expire_direct(struct autofs_point *ap, autofs_packet_expire_di mt->signaled =0 ;while (!mt->signaled) { -gettimeofday (&now,NULL ); +clock_gettime (CLOCK_MONOTONIC , &now); wait.tv_sec = now.tv_sec +2 ; - wait.tv_nsec = now.tv_usec *1000 ; + wait.tv_nsec = now.tv_nsec; status =pthread_cond_timedwait (&mt->cond, &mt->mutex, &wait);if (status && status !=ETIMEDOUT )fatal (status);
@@ -1296,7 +1296,7 @@ int handle_packet_missing_direct(struct autofs_point *ap, autofs_packet_missing_char buf[MAX_ERR_BUF ];int status =0 ;struct timespec wait; -struct timeval now; +struct timespec now;int ioctlfd, len, state;unsigned int kver_major =get_kver_major ();unsigned int kver_minor =get_kver_minor ();
@@ -1478,9 +1478,9 @@ int handle_packet_missing_direct(struct autofs_point *ap, autofs_packet_missing_ mt->signaled =0 ;while (!mt->signaled) { -gettimeofday (&now,NULL ); +clock_gettime (CLOCK_MONOTONIC , &now); wait.tv_sec = now.tv_sec +2 ; - wait.tv_nsec = now.tv_usec *1000 ; + wait.tv_nsec = now.tv_nsec; status =pthread_cond_timedwait (&mt->cond, &mt->mutex, &wait);if (status && status !=ETIMEDOUT )fatal (status);
daemon/indirect.c +6 -6
@@ -636,7 +636,7 @@ int handle_packet_expire_indirect(struct autofs_point *ap, autofs_packet_expire_char buf[MAX_ERR_BUF ];pthread_t thid;struct timespec wait; -struct timeval now; +struct timespec now;int status, state;pthread_setcancelstate (PTHREAD_CANCEL_DISABLE , &state);
@@ -691,9 +691,9 @@ int handle_packet_expire_indirect(struct autofs_point *ap, autofs_packet_expire_ mt->signaled =0 ;while (!mt->signaled) { -gettimeofday (&now,NULL ); +clock_gettime (CLOCK_MONOTONIC , &now); wait.tv_sec = now.tv_sec +2 ; - wait.tv_nsec = now.tv_usec *1000 ; + wait.tv_nsec = now.tv_nsec; status =pthread_cond_timedwait (&mt->cond, &mt->mutex, &wait);if (status && status !=ETIMEDOUT )fatal (status);
@@ -795,7 +795,7 @@ int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missinchar buf[MAX_ERR_BUF ];struct pending_args *mt;struct timespec wait; -struct timeval now; +struct timespec now;struct mapent *me;int status, state;
@@ -884,9 +884,9 @@ int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missin mt->signaled =0 ;while (!mt->signaled) { -gettimeofday (&now,NULL ); +clock_gettime (CLOCK_MONOTONIC , &now); wait.tv_sec = now.tv_sec +2 ; - wait.tv_nsec = now.tv_usec *1000 ; + wait.tv_nsec = now.tv_nsec; status =pthread_cond_timedwait (&mt->cond, &mt->mutex, &wait);if (status && status !=ETIMEDOUT )fatal (status);
include/rpc_subs.h +1 -0
@@ -71,6 +71,7 @@ int rpc_portmap_getport(struct conn_info *, struct pmap *, unsigned short *);int rpc_ping_proto (struct conn_info *);int rpc_ping (const char *,long ,long ,unsigned int );double elapsed (struct timeval ,struct timeval ); +double monotonic_elapsed (struct timespec ,struct timespec );int rpc_time (const char *,unsigned int ,unsigned int ,long ,long ,unsigned int ,double *);const char *get_addr_string (struct sockaddr *,char *,socklen_t );
lib/alarm.c +3 -3
@@ -178,14 +178,14 @@ static void *alarm_handler(void *arg) now =time (NULL );if (first->time > now) { -struct timeval usecs; +struct timespec nsecs;/* * Wait for alarm to trigger or a new alarm * to be added. */ -gettimeofday (&usecs,NULL ); +clock_gettime (CLOCK_MONOTONIC , &nsecs); expire.tv_sec = first->time; - expire.tv_nsec = usecs.tv_usec *1000 ; + expire.tv_nsec = nsecs.tv_nsec; status =pthread_cond_timedwait (&cond, &mutex, &expire);if (status && status !=ETIMEDOUT )
lib/rpc_subs.c +12 -5
@@ -1086,25 +1086,32 @@ double elapsed(struct timeval start, struct timeval end)return t2-t1; } +double monotonic_elapsed (struct timespec start,struct timespec end) +{ +double t1, t2; + t1 = (double )start.tv_sec + (double )start.tv_nsec/(1000 *1000 *1000 ); + t2 = (double )end.tv_sec + (double )end.tv_nsec/(1000 *1000 *1000 ); +return t2-t1; +} +int rpc_time (const char *host,unsigned int ping_vers,unsigned int ping_proto,long seconds,long micros,unsigned int option,double *result) {int status;double taken; -struct timeval start, end; -struct timezone tz; +struct timespec start, end;int proto = (ping_proto &RPC_PING_UDP ) ?IPPROTO_UDP :IPPROTO_TCP ;unsigned long vers = ping_vers; -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =__rpc_ping (host, vers, proto, seconds, micros, option); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status ==RPC_PING_FAIL || status <0 )return status; - taken =elapsed (start, end); + taken =monotonic_elapsed (start, end);if (result !=NULL ) *result = taken;
modules/replicated.c +14 -16
@@ -231,8 +231,7 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host,socklen_t len =INET6_ADDRSTRLEN ;char buf[len +1 ];struct pmap parms; -struct timeval start, end; -struct timezone tz; +struct timespec start, end;unsigned int supported =0 ;double taken =0 ;int status, count =0 ;
@@ -292,9 +291,9 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host, supported = status; goto done_ver; }else if (!status) { -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =rpc_ping_proto (rpc_info); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status == -ETIMEDOUT ) { supported = status; goto done_ver;
@@ -306,7 +305,7 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host,debug (logopt,"nfs v4 random selection time: %f" , reply); }else { - reply =elapsed (start, end); + reply =monotonic_elapsed (start, end);debug (logopt,"nfs v4 rpc ping time: %f" , reply); } taken += reply;
@@ -351,9 +350,9 @@ v3_ver: supported = status; goto done_ver; }else if (!status) { -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =rpc_ping_proto (rpc_info); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status == -ETIMEDOUT ) { supported = status; goto done_ver;
@@ -365,7 +364,7 @@ v3_ver:debug (logopt,"nfs v3 random selection time: %f" , reply); }else { - reply =elapsed (start, end); + reply =monotonic_elapsed (start, end);debug (logopt,"nfs v3 rpc ping time: %f" , reply); } taken += reply;
@@ -407,9 +406,9 @@ v2_ver: supported = status; goto done_ver; }else if (!status) { -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =rpc_ping_proto (rpc_info); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status == -ETIMEDOUT ) supported = status;else if (status >0 ) {
@@ -420,7 +419,7 @@ v2_ver:debug (logopt,"nfs v2 random selection time: %f" , reply); }else { - reply =elapsed (start, end);; + reply =monotonic_elapsed (start, end);;debug (logopt,"nfs v2 rpc ping time: %f" , reply); } taken += reply;
@@ -523,8 +522,7 @@ static int get_supported_ver_and_cost(unsigned logopt, struct host *host,struct conn_info pm_info, rpc_info;int proto;unsigned int vers; -struct timeval start, end; -struct timezone tz; +struct timespec start, end;double taken =0 ;time_t timeout =RPC_TIMEOUT ;int status =0 ;
@@ -610,16 +608,16 @@ static int get_supported_ver_and_cost(unsigned logopt, struct host *host,if (status == -EHOSTUNREACH ) goto done;else if (!status) { -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =rpc_ping_proto (&rpc_info); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status >0 ) {if (random_selection) {/* Random value between 0 and 1 */ taken = ((float )random ())/((float )RAND_MAX +1 );debug (logopt,"random selection time %f" , taken); }else { - taken =elapsed (start, end); + taken =monotonic_elapsed (start, end);debug (logopt,"rpc ping time %f" , taken); } }
PATCH v4 2/3 autofs-5.1.1 - use monotonic clock for pthread cond timed wait.
The default PTHREAD_COND_INITIALIZER initializer uses realtime clock, we need to switch to use the monotic clock.
--- lib/alarm.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
lib/alarm.c +12 -1
@@ -23,7 +23,7 @@ struct alarm { };static pthread_mutex_t mutex =PTHREAD_MUTEX_INITIALIZER ; -static pthread_cond_t cond =PTHREAD_COND_INITIALIZER ; +static pthread_cond_t cond;static LIST_HEAD (alarms);#define alarm_lock () \
@@ -212,6 +212,7 @@ int alarm_start_handler(void)pthread_t thid;pthread_attr_t attrs;pthread_attr_t *pattrs = &attrs; +pthread_condattr_t condattrs;int status; status =pthread_attr_init (pattrs);
@@ -224,8 +225,18 @@ int alarm_start_handler(void)#endif } + status =pthread_condattr_init (&condattrs); +if (status) +fatal (status); + +pthread_condattr_setclock (&condattrs,CLOCK_MONOTONIC ); +pthread_cond_init (&cond, &condattrs); + status =pthread_create (&thid, pattrs, alarm_handler,NULL ); +pthread_condattr_destroy (&condattrs); +pthread_condattr_destroy (&cond); +if (pattrs)pthread_attr_destroy (pattrs);
PATCH v4 3/3 autofs-5.1.1 - use monotonic clock instead of time().
In reply to Yu NingA new function monotonic_time() is introduced in automount.h as a monotonic version of time(), all the calls to time() have been switched to use this new function.
--- daemon/automount.c | 4 ++-- daemon/direct.c | 4 ++-- daemon/indirect.c | 4 ++-- daemon/lookup.c | 6 +++--- daemon/state.c | 2 +- include/automount.h | 9 +++++++++ lib/alarm.c | 4 ++-- lib/cache.c | 2 +- lib/master.c | 4 ++-- modules/dclist.c | 2 +- modules/lookup_file.c | 8 ++++---- modules/lookup_hesiod.c | 6 +++--- modules/lookup_hosts.c | 4 ++-- modules/lookup_ldap.c | 10 +++++----- modules/lookup_nisplus.c | 10 +++++----- modules/lookup_program.c | 10 +++++----- modules/lookup_sss.c | 6 +++--- modules/lookup_userhome.c | 2 +- modules/lookup_yp.c | 8 ++++---- modules/mount_autofs.c | 2 +- modules/parse_amd.c | 2 +- modules/replicated.c | 4 ++-- 22 files changed, 61 insertions(+), 52 deletions(-)
daemon/automount.c +2 -2
@@ -1454,7 +1454,7 @@ static void *statemachine(void *arg)break ;case SIGHUP : -do_hup_signal (master_list,time (NULL )); +do_hup_signal (master_list,monotonic_time (NULL ));break ;default :
@@ -2004,7 +2004,7 @@ int main(int argc, char *argv[])unsigned ghost, logging, daemon_check;unsigned dumpmaps, foreground, have_global_options;time_t timeout; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );struct rlimit rlim;const char *options ="+hp:t:vmdD:fVrO:l:n:CF" ;static const struct option long_options[] = {
daemon/direct.c +2 -2
@@ -464,7 +464,7 @@ int mount_autofs_direct(struct autofs_point *ap)struct mapent_cache *nc, *mc;struct mapent *me, *ne, *nested;struct mnt_list *mnts; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );if (strcmp (ap->path,"/-" )) {error (ap->logopt,"expected direct map, exiting" );
@@ -1388,7 +1388,7 @@ int handle_packet_missing_direct(struct autofs_point *ap, autofs_packet_missing_ }/* Check if we recorded a mount fail for this key */ -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) { ops->send_fail (ap->logopt, ioctlfd, pkt->wait_queue_token, -ENOENT ); ops->close (ap->logopt, ioctlfd);
daemon/indirect.c +2 -2
@@ -197,7 +197,7 @@ out_err:int mount_autofs_indirect (struct autofs_point *ap,const char *root) { -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );int status;int map;
@@ -818,7 +818,7 @@ int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missin/* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, pkt->name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) { ops->send_fail (ap->logopt, ap->ioctlfd, pkt->wait_queue_token, -ENOENT );cache_unlock (me->mc);
daemon/lookup.c +3 -3
@@ -875,7 +875,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_struct map_source *instance;char src_file[] ="file" ;char src_prog[] ="program" ; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );struct stat st;char *type, *format;
@@ -915,7 +915,7 @@ static int lookup_name_source_instance(struct autofs_point *ap, struct map_sourc {struct map_source *instance;const char *format; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );if (*name =='/' && map->flags &MAP_FLAG_FORMAT_AMD )return lookup_amd_instance (ap, map, name, name_len);
@@ -1079,7 +1079,7 @@ static void update_negative_cache(struct autofs_point *ap, struct map_source *soelse map = entry->maps;if (map) { -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );int rv =CHE_FAIL ;cache_writelock (map->mc);
daemon/state.c +1 -1
@@ -553,7 +553,7 @@ static unsigned int st_readmap(struct autofs_point *ap)pthread_t thid;struct readmap_args *ra;int status; -int now =time (NULL ); +int now =monotonic_time (NULL );debug (ap->logopt,"state %d path %s" , ap->state, ap->path);
include/automount.h +9 -0
@@ -565,6 +565,15 @@ do { \fatal (_m_unlock); \ }while (0 ) +static inline time_t monotonic_time(time_t *t) +{ +struct timespec ts; +clock_gettime (CLOCK_MONOTONIC , &ts); +if (t) + *t = (time_t ) ts.tv_sec; +return (time_t ) ts.tv_sec; +} +/* Expire alarm handling routines */ int alarm_start_handler (void );int alarm_add (struct autofs_point *ap,time_t seconds);
lib/alarm.c +2 -2
@@ -46,7 +46,7 @@ int alarm_add(struct autofs_point *ap, time_t seconds)struct list_head *head;struct list_head *p;struct alarm *new; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t next_alarm =0 ;unsigned int empty =1 ;int status;
@@ -175,7 +175,7 @@ static void *alarm_handler(void *arg) first = list_entry(head->next, struct alarm, list); - now =time (NULL ); + now =monotonic_time (NULL );if (first->time > now) {struct timespec nsecs;
lib/cache.c +1 -1
@@ -775,7 +775,7 @@ void cache_update_negative(struct mapent_cache *mc, struct map_source *ms, const char *key, time_t timeout) { - time_t now = time(NULL); + time_t now = monotonic_time(NULL);struct mapent *me;int rv =CHE_OK ;
lib/master.c +2 -2
@@ -1483,7 +1483,7 @@ int dump_map(struct master *master, const char *type, const char *name)struct map_source *source;struct master_mapent *this;struct autofs_point *ap; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL ); this = list_entry(p, struct master_mapent, list); p = p->next;
@@ -1601,7 +1601,7 @@ int master_show_mounts(struct master *master)struct map_source *source;struct master_mapent *this;struct autofs_point *ap; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );unsigned int count =0 ; this = list_entry(p, struct master_mapent, list);
modules/dclist.c +1 -1
@@ -568,7 +568,7 @@ struct dclist *get_dc_list(unsigned int logopt, const char *uri)if (!list) goto out_error; - dclist->expire =time (NULL ) + min_ttl; + dclist->expire =monotonic_time (NULL ) + min_ttl; dclist->uri = list;return dclist;
modules/lookup_file.c +4 -4
@@ -743,7 +743,7 @@ static int match_key(struct autofs_point *ap, {char buf[MAX_ERR_BUF ];struct mapent_cache *mc; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char *lkp_key;char *prefix;size_t map_key_len;
@@ -808,7 +808,7 @@ static int lookup_one(struct autofs_point *ap,struct mapent_cache *mc = source->mc;char mkey[KEY_MAX_LEN +1 ];char mapent[MAPENT_MAX_LEN +1 ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );FILE *f;unsigned int k_len, m_len;int entry, ret;
@@ -914,7 +914,7 @@ static int lookup_wild(struct autofs_point *ap,struct mapent_cache *mc;char mkey[KEY_MAX_LEN +1 ];char mapent[MAPENT_MAX_LEN +1 ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );FILE *f;unsigned int k_len, m_len;int entry, ret;
@@ -1118,7 +1118,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
modules/lookup_hesiod.c +3 -3
@@ -163,7 +163,7 @@ static int lookup_one(struct autofs_point *ap, }cache_writelock (mc); - ret =cache_update (mc, source, key, best_record,time (NULL )); + ret =cache_update (mc, source, key, best_record,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {hesiod_free_list (ctxt->hesiod_context, hes_result);
@@ -228,7 +228,7 @@ static int lookup_one_amd(struct autofs_point *ap, }cache_writelock (mc); - ret =cache_update (mc, source, lkp_key, *hes_result,time (NULL )); + ret =cache_update (mc, source, lkp_key, *hes_result,monotonic_time (NULL ));cache_unlock (mc);if (hes_result)
@@ -339,7 +339,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
modules/lookup_hosts.c +2 -2
@@ -284,7 +284,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *struct mapent *me;char *mapent =NULL ;int mapent_len; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );int ret; source = ap->entry->current;
@@ -296,7 +296,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
modules/lookup_ldap.c +5 -5
@@ -944,7 +944,7 @@ static LDAP *do_reconnect(unsigned logopt, struct lookup_context *ctxt)uris_mutex_lock (ctxt);if (ctxt->dclist) { -if (!ldap || ctxt->dclist->expire <time (NULL )) { +if (!ldap || ctxt->dclist->expire <monotonic_time (NULL )) {free_dclist (ctxt->dclist); ctxt->dclist =NULL ; }
@@ -2851,7 +2851,7 @@ static int lookup_one(struct autofs_point *ap, struct map_source *source,struct mapent_cache *mc;int rv, i, l, ql, count;char buf[MAX_ERR_BUF ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char *query;LDAPMessage *result =NULL , *e;char *class, *info, *entry;
@@ -3214,7 +3214,7 @@ static int lookup_one_amd(struct autofs_point *ap,struct berval **bvKey;struct berval **bvValues;char buf[MAX_ERR_BUF ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int rv, l, ql, count;int ret =CHE_MISSING ;
@@ -3417,7 +3417,7 @@ static int check_map_indirect(struct autofs_point *ap,unsigned int is_amd_format = source->flags &MAP_FLAG_FORMAT_AMD ;struct mapent_cache *mc;struct mapent *me; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret, cur_state;int status;
@@ -3555,7 +3555,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
modules/lookup_nisplus.c +5 -5
@@ -288,7 +288,7 @@ static int lookup_one(struct autofs_point *ap,nis_result *result;nis_object *this;char *mapent; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret, cur_state;char buf[MAX_ERR_BUF ];
@@ -400,7 +400,7 @@ static int lookup_wild(struct autofs_point *ap,nis_result *result;nis_object *this;char *mapent; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret, cur_state;char buf[MAX_ERR_BUF ];
@@ -487,7 +487,7 @@ static int lookup_amd_defaults(struct autofs_point *ap, mapent =ENTRY_VAL (this,1 );cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , mapent,time (NULL )); + ret =cache_update (mc, source,"/defaults" , mapent,monotonic_time (NULL ));cache_unlock (mc);nis_freeresult (result);
@@ -505,7 +505,7 @@ static int check_map_indirect(struct autofs_point *ap,unsigned int is_amd_format = source->flags &MAP_FLAG_FORMAT_AMD ;struct mapent_cache *mc;struct mapent *me, *exists; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret =0 ;
@@ -650,7 +650,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
modules/lookup_program.c +5 -5
@@ -369,7 +369,7 @@ static int lookup_amd_defaults(struct autofs_point *ap,while (isblank (*start)) start++;cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , start,time (NULL )); + ret =cache_update (mc, source,"/defaults" , start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (ment);
@@ -438,7 +438,7 @@ static int match_key(struct autofs_point *ap, start++; }cache_writelock (mc); - ret =cache_update (mc, source, lkp_key, start,time (NULL )); + ret =cache_update (mc, source, lkp_key, start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (ment);
@@ -491,7 +491,7 @@ static int match_key(struct autofs_point *ap,while (isblank (*start)) start++;cache_writelock (mc); - ret =cache_update (mc, source, match, start,time (NULL )); + ret =cache_update (mc, source, match, start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (match);
@@ -537,7 +537,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, name,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
@@ -586,7 +586,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void ** proceed with the program map lookup. */ if (strchr (name,'/' ) || - me->age + ap->negative_timeout >time (NULL )) { + me->age + ap->negative_timeout >monotonic_time (NULL )) {char *ent =NULL ;if (me->mapent) {
modules/lookup_sss.c +3 -3
@@ -374,7 +374,7 @@ static int lookup_one(struct autofs_point *ap,struct mapent_cache *mc;struct mapent *we;void *sss_ctxt =NULL ; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char buf[MAX_ERR_BUF ];char *value =NULL ;char *s_key;
@@ -491,7 +491,7 @@ static int check_map_indirect(struct autofs_point *ap,struct map_source *source;struct mapent_cache *mc;struct mapent *me; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret, cur_state;
@@ -585,7 +585,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
modules/lookup_userhome.c +1 -1
@@ -77,7 +77,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void * }cache_writelock (mc); - ret =cache_update (mc, source, name,NULL ,time (NULL )); + ret =cache_update (mc, source, name,NULL ,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {
modules/lookup_yp.c +4 -4
@@ -405,7 +405,7 @@ static int lookup_one(struct autofs_point *ap,char *mapname;char *mapent;int mapent_len; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret; mc = source->mc;
@@ -517,7 +517,7 @@ static int lookup_wild(struct autofs_point *ap,char *mapname;char *mapent;int mapent_len; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret; mc = source->mc;
@@ -598,7 +598,7 @@ static int lookup_amd_defaults(struct autofs_point *ap,return CHE_FAIL ;cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , mapent,time (NULL )); + ret =cache_update (mc, source,"/defaults" , mapent,monotonic_time (NULL ));cache_unlock (mc);return ret;
@@ -753,7 +753,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void */* Check if we recorded a mount fail for this key anywhere */ me =lookup_source_mapent (ap, key,LKP_DISTINCT );if (me) { -if (me->status >=time (NULL )) { +if (me->status >=monotonic_time (NULL )) {cache_unlock (me->mc);return NSS_STATUS_NOTFOUND ; }else {
modules/mount_autofs.c +1 -1
@@ -242,7 +242,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, source =master_add_map_source (entry, info->type, info->format, -time (NULL ), argc, argv); +monotonic_time (NULL ), argc, argv);if (!source) {error (ap->logopt,MODPREFIX "failed to add map source to entry" );
modules/parse_amd.c +1 -1
@@ -1181,7 +1181,7 @@ static int do_host_mount(struct autofs_point *ap, const char *name, "hosts", "sun", argc, pargv);if (!instance) { instance =master_add_source_instance (source, -"hosts" ,"sun" ,time (NULL ), argc, pargv); +"hosts" ,"sun" ,monotonic_time (NULL ), argc, pargv);if (!instance) {error (ap->logopt,MODPREFIX "failed to create source instance for hosts map" );
modules/replicated.c +2 -2
@@ -69,14 +69,14 @@ void seed_random(void) fd =open_fd ("/dev/urandom" ,O_RDONLY );if (fd <0 ) { -srandom (time (NULL )); +srandom (monotonic_time (NULL ));return ; }if (read (fd, &seed,sizeof (seed)) !=-1 )srandom (seed);else -srandom (time (NULL )); +srandom (monotonic_time (NULL ));close (fd);
Quoted 77 lines · Ning Yu
Quoted 56 lines · Ian Kent
Quoted 37 lines · Ning Yu
Quoted 17 lines · Ian Kent
Quoted 16 lines · Ning Yu
Quoted 14 lines · Ian Kent
Quoted 6 lines · Ning Yu
Hi,
I have composed a patch for this issue, it works in my side, what it does is replacing
gettimeofday()withclock_gettime(CLOCK_MONOTONIC).Would anyone please help to review it? Thanks in advance.
Are you joking!
How is this meant to apply to the current source, it won't.If you can manage to post a sane patch you will need to break it up into a few separate standalone patches with sane explanations of what each one is meant to achieve.
Quoted 6 lines
Quoted 2 lines
I'm sorry, not to offend, the previous patch was huge because all the call to
time()orgettimeofday()functions are replaced withclock_gettime().Encountering this after a generally unpleasant day is bound to get a short and unpleasant response, ;)
Best wishes for you and have a nice day/night :)
Quoted 10 lines
Quoted 3 lines
Please allow me to re-send the patch, this time I have splitted it into several smaller patches, hope it won't be as stupid as previous one.
Well, I see those posts but there are still problems with your email program.
Apart from the DOS line ends all the tabs appear to have been collapsed to single spaces.
Quoted 6 lines
Quoted 3 lines
I really don't want to go through and apply these hunk by hunk manually when you must have a properly formatted patch already.
Thanks for pointing it out, I will have to fix my email client issue first and resend the patches. Sorry for wasting you so much of time.
A couple of other small things.
Please make the title of the patch email the same as the tittle of the patch. And if possible add a [PATCH x/y] prefix to the title, x being the ordering of the patch within the y patches posted.
And in patch titles I commonly use "autofs-n-v-r - actual title".
So for example one of these would have a title like:
autofs-5.1.1 - Use monotonic clock instead oftime()Quoted 9 lines
assuming you had made them against the 5.1.1 source.
I've also started to use (quite recently in fact) "Signed-off-by:" in patches so please add yours too, I don't feel right about adding it for someone else as it's an assumption that may or may not be correct.
These things aren't a big deal as I can change most of them myself easily if it's not convenient for you to do it.
Thanks very much for the suggestions, I have resent the v3 patches with git command, by CCing myself I checked the patches just now:
* the Signed-off-by part is added;
* the email subject is same with the patch title;
* and the autofs-5.1.1 prefix is added;
* however the EOL is still \r\n, this is really weird, because I use Linux and vim to do the job, and the original patches are generated with 'git format-patch', they contains unix EOL as expected, and they are sent with 'git send-email', not sure why gmail convert them to dos EOL.
Quoted 2 lines
Maybe I have to resend them as attachment.
Oh, the v4 patches are sent as attachment, however they still contains dos EOL strings, please ignore them, sorry for sending so much spam.
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 13 lines
From
cdb2bcd563420cd39af199309e8c0c7fc45a7bd1Mon Sep 17 00:00:00 2001
From: Yu Ning <[email protected]>
Date: Wed, 16 Sep 2015 15:56:21 +0800
Subject: [PATCH] Useclock_gettime()instead ofgettimeofday().This patch is to fix the issue that a mount point may not be automatically unmounted after a system date/time change.
Reproducer with 100% failrate:
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
Quoted 4 lines
Quoted 4 lines
Since of you to hammer the result of the problem you've identified rather than just explain the problem and what needs to be done to resolve it in a polite and sensible manner.
--
To unsubscribe from this list: send the line "unsubscribe autofs" in
Ian Kent
maintainerQuoted 78 lines · Ning Yu
Quoted 77 lines · Ning Yu
Quoted 56 lines · Ian Kent
Quoted 37 lines · Ning Yu
Quoted 17 lines · Ian Kent
Quoted 16 lines · Ning Yu
Quoted 14 lines · Ian Kent
Quoted 6 lines · Ning Yu
Hi,
I have composed a patch for this issue, it works in my side, what it does is replacing
gettimeofday()withclock_gettime(CLOCK_MONOTONIC).Would anyone please help to review it? Thanks in advance.
Are you joking!
How is this meant to apply to the current source, it won't.If you can manage to post a sane patch you will need to break it up into a few separate standalone patches with sane explanations of what each one is meant to achieve.
Quoted 6 lines
Quoted 2 lines
I'm sorry, not to offend, the previous patch was huge because all the call to
time()orgettimeofday()functions are replaced withclock_gettime().Encountering this after a generally unpleasant day is bound to get a short and unpleasant response, ;)
Best wishes for you and have a nice day/night :)
Quoted 10 lines
Quoted 3 lines
Please allow me to re-send the patch, this time I have splitted it into several smaller patches, hope it won't be as stupid as previous one.
Well, I see those posts but there are still problems with your email program.
Apart from the DOS line ends all the tabs appear to have been collapsed to single spaces.
Quoted 6 lines
Quoted 3 lines
I really don't want to go through and apply these hunk by hunk manually when you must have a properly formatted patch already.
Thanks for pointing it out, I will have to fix my email client issue first and resend the patches. Sorry for wasting you so much of time.
A couple of other small things.
Please make the title of the patch email the same as the tittle of the patch. And if possible add a [PATCH x/y] prefix to the title, x being the ordering of the patch within the y patches posted.
And in patch titles I commonly use "autofs-n-v-r - actual title".
So for example one of these would have a title like:
autofs-5.1.1 - Use monotonic clock instead oftime()Quoted 9 lines
assuming you had made them against the 5.1.1 source.
I've also started to use (quite recently in fact) "Signed-off-by:" in patches so please add yours too, I don't feel right about adding it for someone else as it's an assumption that may or may not be correct.
These things aren't a big deal as I can change most of them myself easily if it's not convenient for you to do it.
Thanks very much for the suggestions, I have resent the v3 patches with git command, by CCing myself I checked the patches just now:
* the Signed-off-by part is added;
* the email subject is same with the patch title;
* and the autofs-5.1.1 prefix is added;
* however the EOL is still \r\n, this is really weird, because I use Linux and vim to do the job, and the original patches are generated with 'git format-patch', they contains unix EOL as expected, and they are sent with 'git send-email', not sure why gmail convert them to dos EOL.
Quoted 5 lines
Quoted 2 lines
Maybe I have to resend them as attachment.
Oh, the v4 patches are sent as attachment, however they still contains dos EOL strings, please ignore them, sorry for sending so much spam.
LOL, np, and we're might be left with a problem.
I'll see how it goes.
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 14 lines
From
cdb2bcd563420cd39af199309e8c0c7fc45a7bd1Mon Sep 17 00:00:00 2001
From: Yu Ning <[email protected]>
Date: Wed, 16 Sep 2015 15:56:21 +0800
Subject: [PATCH] Useclock_gettime()instead ofgettimeofday().This patch is to fix the issue that a mount point may not be automatically unmounted after a system date/time change.
Reproducer with 100% failrate:
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
Quoted 4 lines
Quoted 4 lines
Since of you to hammer the result of the problem you've identified rather than just explain the problem and what needs to be done to resolve it in a polite and sensible manner.
--
To unsubscribe from this list: send the line "unsubscribe autofs" in
Ian Kent
maintainerQuoted 63 lines · Ning Yu
Quoted 62 lines · Ian Kent
Quoted 37 lines · Ning Yu
Quoted 17 lines · Ian Kent
Quoted 16 lines · Ning Yu
Quoted 14 lines · Ian Kent
Quoted 6 lines · Ning Yu
Hi,
I have composed a patch for this issue, it works in my side, what it does is replacing
gettimeofday()withclock_gettime(CLOCK_MONOTONIC).Would anyone please help to review it? Thanks in advance.
Are you joking!
How is this meant to apply to the current source, it won't.If you can manage to post a sane patch you will need to break it up into a few separate standalone patches with sane explanations of what each one is meant to achieve.
Quoted 6 lines
Quoted 2 lines
I'm sorry, not to offend, the previous patch was huge because all the call to
time()orgettimeofday()functions are replaced withclock_gettime().Encountering this after a generally unpleasant day is bound to get a short and unpleasant response, ;)
Best wishes for you and have a nice day/night :)
Quoted 10 lines
Quoted 3 lines
Please allow me to re-send the patch, this time I have splitted it into several smaller patches, hope it won't be as stupid as previous one.
Well, I see those posts but there are still problems with your email program.
Apart from the DOS line ends all the tabs appear to have been collapsed to single spaces.
Quoted 6 lines
Quoted 3 lines
I really don't want to go through and apply these hunk by hunk manually when you must have a properly formatted patch already.
Thanks for pointing it out, I will have to fix my email client issue first and resend the patches. Sorry for wasting you so much of time.
A couple of other small things.
Please make the title of the patch email the same as the tittle of the patch. And if possible add a [PATCH x/y] prefix to the title, x being the ordering of the patch within the y patches posted.
And in patch titles I commonly use "autofs-n-v-r - actual title".
So for example one of these would have a title like:
autofs-5.1.1 - Use monotonic clock instead oftime()assuming you had made them against the 5.1.1 source.
I've also started to use (quite recently in fact) "Signed-off-by:" in patches so please add yours too, I don't feel right about adding it for someone else as it's an assumption that may or may not be correct.
Quoted 6 lines
Quoted 3 lines
These things aren't a big deal as I can change most of them myself easily if it's not convenient for you to do it.
Thanks very much for the suggestions, I have resent the v3 patches with git command, by CCing myself I checked the patches just now:
Thanks for the effort.
Even though this is mostly a straight forward change it's still quite a bit of effort to find and make all these small changes.
Quoted 7 lines
* the Signed-off-by part is added;
* the email subject is same with the patch title;
* and the autofs-5.1.1 prefix is added;
* however the EOL is still \r\n, this is really weird, because I use Linux and vim to do the job, and the original patches are generated with 'git format-patch', they contains unix EOL as expected, and they are sent with 'git send-email', not sure why gmail convert them to dos EOL.
Yes, that's strange and I don't use a gmail account for patches so I don't know about what that might mean.
Quoted 2 lines
Maybe I have to resend them as attachment.
Perhaps, I'll see if they apply after dos2unix conversion, when I get to them.
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 14 lines
From
cdb2bcd563420cd39af199309e8c0c7fc45a7bd1Mon Sep 17 00:00:00 2001
From: Yu Ning <[email protected]>
Date: Wed, 16 Sep 2015 15:56:21 +0800
Subject: [PATCH] Useclock_gettime()instead ofgettimeofday().This patch is to fix the issue that a mount point may not be automatically unmounted after a system date/time change.
Reproducer with 100% failrate:
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
Quoted 4 lines
Quoted 4 lines
Since of you to hammer the result of the problem you've identified rather than just explain the problem and what needs to be done to resolve it in a polite and sensible manner.
--
To unsubscribe from this list: send the line "unsubscribe autofs" in
From 6ec16729db72ab07d49e8a17349a3a5bfacd1a2d Mon Sep 17 00:00:00 2001
From: Yu Ning <[email protected]>
Date: Wed, 16 Sep 2015 18:05:46 +0800
Subject: [PATCH 1/3] Use clock_gettime() instead of gettimeofday().
The time returned by gettimeofday() is affected by discontinuous jumps in the system time, so it causes an issue that autofs may not auto unmount a mount point if system time is manually changed by the system administrator.
To fix the issue we can use clock_gettime(CLOCK_MONOTONIC) instead of gettimeofday().
A new function monotonic_elapsed() is introduced in rpc_subs.h as a timespec version of elapsed().
--- daemon/direct.c | 12 ++++++------ daemon/indirect.c | 12 ++++++------ include/rpc_subs.h | 1 + lib/alarm.c | 6 +++--- lib/rpc_subs.c | 17 ++++++++++++----- modules/replicated.c | 30 ++++++++++++++---------------- 6 files changed, 42 insertions(+), 36 deletions(-)
daemon/direct.c +0 -0
@@ -1041,7 +1041,7 @@ int handle_packet_expire_direct(struct
autofs_point *ap, autofs_packet_expire_di
char buf[MAX_ERR_BUF];
pthread_t thid;
struct timespec wait;
- struct timeval now;
+ struct timespec now;
int status, state;
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &state);
@@ -1159,9 +1159,9 @@ int handle_packet_expire_direct(struct autofs_point *ap, autofs_packet_expire_di
mt->signaled = 0;
while (!mt->signaled) {
- gettimeofday(&now, NULL);
+ clock_gettime(CLOCK_MONOTONIC, &now);
wait.tv_sec = now.tv_sec + 2;
- wait.tv_nsec = now.tv_usec * 1000;
+ wait.tv_nsec = now.tv_nsec;
status = pthread_cond_timedwait(&mt->cond, &mt->mutex, &wait); if (status && status != ETIMEDOUT)
fatal(status);
@@ -1296,7 +1296,7 @@ int handle_packet_missing_direct(struct autofs_point *ap, autofs_packet_missing_
char buf[MAX_ERR_BUF];
int status = 0;
struct timespec wait;
- struct timeval now;
+ struct timespec now;
int ioctlfd, len, state;
unsigned int kver_major = get_kver_major();
unsigned int kver_minor = get_kver_minor();
@@ -1478,9 +1478,9 @@ int handle_packet_missing_direct(struct autofs_point *ap, autofs_packet_missing_
mt->signaled = 0;
while (!mt->signaled) {
- gettimeofday(&now, NULL);
+ clock_gettime(CLOCK_MONOTONIC, &now);
wait.tv_sec = now.tv_sec + 2;
- wait.tv_nsec = now.tv_usec * 1000;
+ wait.tv_nsec = now.tv_nsec;
status = pthread_cond_timedwait(&mt->cond, &mt->mutex, &wait); if (status && status != ETIMEDOUT)
fatal(status);
daemon/indirect.c +0 -0
@@ -636,7 +636,7 @@ int handle_packet_expire_indirect(struct
autofs_point *ap, autofs_packet_expire_
char buf[MAX_ERR_BUF];
pthread_t thid;
struct timespec wait;
- struct timeval now;
+ struct timespec now;
int status, state;
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &state);
@@ -691,9 +691,9 @@ int handle_packet_expire_indirect(struct autofs_point *ap, autofs_packet_expire_
mt->signaled = 0;
while (!mt->signaled) {
- gettimeofday(&now, NULL);
+ clock_gettime(CLOCK_MONOTONIC, &now);
wait.tv_sec = now.tv_sec + 2;
- wait.tv_nsec = now.tv_usec * 1000;
+ wait.tv_nsec = now.tv_nsec;
status = pthread_cond_timedwait(&mt->cond, &mt->mutex, &wait); if (status && status != ETIMEDOUT)
fatal(status);
@@ -795,7 +795,7 @@ int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missin
char buf[MAX_ERR_BUF];
struct pending_args *mt;
struct timespec wait;
- struct timeval now;
+ struct timespec now;
struct mapent *me;
int status, state;
@@ -884,9 +884,9 @@ int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missin
mt->signaled = 0;
while (!mt->signaled) {
- gettimeofday(&now, NULL);
+ clock_gettime(CLOCK_MONOTONIC, &now);
wait.tv_sec = now.tv_sec + 2;
- wait.tv_nsec = now.tv_usec * 1000;
+ wait.tv_nsec = now.tv_nsec;
status = pthread_cond_timedwait(&mt->cond, &mt->mutex, &wait); if (status && status != ETIMEDOUT)
fatal(status);
include/rpc_subs.h +0 -0
@@ -71,6 +71,7 @@ int rpc_portmap_getport(struct conn_info *, struct
pmap *, unsigned short *);
int rpc_ping_proto(struct conn_info *);
int rpc_ping(const char *, long, long, unsigned int); double elapsed(struct timeval, struct timeval);
+double monotonic_elapsed(struct timespec, struct timespec);
int rpc_time(const char *, unsigned int, unsigned int, long, long,
unsigned int, double *);
const char *get_addr_string(struct sockaddr *, char *, socklen_t);
lib/alarm.c +3 -3
@@ -178,14 +178,14 @@ static void *alarm_handler(void *arg) now =time (NULL );if (first->time > now) { -struct timeval usecs; +struct timespec nsecs;/* * Wait for alarm to trigger or a new alarm * to be added. */ -gettimeofday (&usecs,NULL ); +clock_gettime (CLOCK_MONOTONIC , &nsecs); expire.tv_sec = first->time; - expire.tv_nsec = usecs.tv_usec *1000 ; + expire.tv_nsec = nsecs.tv_nsec; status =pthread_cond_timedwait (&cond, &mutex, &expire);if (status && status !=ETIMEDOUT )
lib/rpc_subs.c +12 -5
@@ -1086,25 +1086,32 @@ double elapsed(struct timeval start, struct timeval end)return t2-t1; } +double monotonic_elapsed (struct timespec start,struct timespec end) +{ +double t1, t2; + t1 = (double )start.tv_sec + (double )start.tv_nsec/(1000 *1000 *1000 ); + t2 = (double )end.tv_sec + (double )end.tv_nsec/(1000 *1000 *1000 ); +return t2-t1; +} +int rpc_time (const char *host,unsigned int ping_vers,unsigned int ping_proto,long seconds,long micros,unsigned int option,double *result) {int status;double taken; -struct timeval start, end; -struct timezone tz; +struct timespec start, end;int proto = (ping_proto &RPC_PING_UDP ) ?IPPROTO_UDP :IPPROTO_TCP ;unsigned long vers = ping_vers; -gettimeofday (&start, &tz); +clock_gettime (CLOCK_MONOTONIC , &start); status =__rpc_ping (host, vers, proto, seconds, micros, option); -gettimeofday (&end, &tz); +clock_gettime (CLOCK_MONOTONIC , &end);if (status ==RPC_PING_FAIL || status <0 )return status; - taken =elapsed (start, end); + taken =monotonic_elapsed (start, end);if (result !=NULL ) *result = taken;
modules/replicated.c +0 -0
@@ -231,8 +231,7 @@ static unsigned int get_nfs_info(unsigned logopt,
struct host *host,
socklen_t len = INET6_ADDRSTRLEN;
char buf[len + 1];
struct pmap parms;
- struct timeval start, end;
- struct timezone tz;
+ struct timespec start, end;
unsigned int supported = 0;
double taken = 0;
int status, count = 0;
@@ -292,9 +291,9 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host,
supported = status;
goto done_ver;
} else if (!status) {
- gettimeofday(&start, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &start);
status = rpc_ping_proto(rpc_info);
- gettimeofday(&end, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &end);
if (status == -ETIMEDOUT) {
supported = status;
goto done_ver;
@@ -306,7 +305,7 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host,
debug(logopt,
"nfs v4 random selection time: %f", reply);
} else {
- reply = elapsed(start, end);
+ reply = monotonic_elapsed(start, end); debug(logopt, "nfs v4 rpc ping time: %f", reply); }
taken += reply;
@@ -351,9 +350,9 @@ v3_ver:
supported = status;
goto done_ver;
} else if (!status) {
- gettimeofday(&start, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &start); status = rpc_ping_proto(rpc_info);
- gettimeofday(&end, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &end);
if (status == -ETIMEDOUT) {
supported = status;
goto done_ver;
@@ -365,7 +364,7 @@ v3_ver:
debug(logopt,
"nfs v3 random selection time: %f", reply);
} else {
- reply = elapsed(start, end);
+ reply = monotonic_elapsed(start, end); debug(logopt, "nfs v3 rpc ping time: %f", reply); }
taken += reply;
@@ -407,9 +406,9 @@ v2_ver:
supported = status;
goto done_ver;
} else if (!status) {
- gettimeofday(&start, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &start); status = rpc_ping_proto(rpc_info);
- gettimeofday(&end, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &end);
if (status == -ETIMEDOUT)
supported = status;
else if (status > 0) {
@@ -420,7 +419,7 @@ v2_ver:
debug(logopt,
"nfs v2 random selection time: %f", reply);
} else {
- reply = elapsed(start, end);;
+ reply = monotonic_elapsed(start, end);;
debug(logopt, "nfs v2 rpc ping time: %f", reply);
}
taken += reply;
@@ -523,8 +522,7 @@ static int get_supported_ver_and_cost(unsigned logopt, struct host *host,
struct conn_info pm_info, rpc_info;
int proto;
unsigned int vers;
- struct timeval start, end;
- struct timezone tz;
+ struct timespec start, end;
double taken = 0;
time_t timeout = RPC_TIMEOUT;
int status = 0;
@@ -610,16 +608,16 @@ static int get_supported_ver_and_cost(unsigned logopt, struct host *host,
if (status == -EHOSTUNREACH)
goto done;
else if (!status) {
- gettimeofday(&start, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &start);
status = rpc_ping_proto(&rpc_info);
- gettimeofday(&end, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &end);
if (status > 0) {
if (random_selection) {
/* Random value between 0 and 1 */
taken = ((float) random())/((float) RAND_MAX+1); debug(logopt, "random selection time %f", taken);
} else {
- taken = elapsed(start, end);
+ taken = monotonic_elapsed(start, end);
debug(logopt, "rpc ping time %f", taken);
}
}
Signature · 3 lines
1.9.1 -- To unsubscribe from this list: send the line "unsubscribe autofs" in
From 72434f142926540ec63e8ee772936172731dec72 Mon Sep 17 00:00:00 2001
From: Yu Ning <[email protected]>
Date: Wed, 16 Sep 2015 18:12:50 +0800
Subject: [PATCH 2/3] Use monotonic clock for pthread cond timed wait.
The default PTHREAD_COND_INITIALIZER initializer uses realtime clock, we need to switch to use the monotic clock.
--- lib/alarm.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
lib/alarm.c +12 -1
@@ -23,7 +23,7 @@ struct alarm { };static pthread_mutex_t mutex =PTHREAD_MUTEX_INITIALIZER ; -static pthread_cond_t cond =PTHREAD_COND_INITIALIZER ; +static pthread_cond_t cond;static LIST_HEAD (alarms);#define alarm_lock () \
@@ -212,6 +212,7 @@ int alarm_start_handler(void)pthread_t thid;pthread_attr_t attrs;pthread_attr_t *pattrs = &attrs; +pthread_condattr_t condattrs;int status; status =pthread_attr_init (pattrs);
@@ -224,8 +225,18 @@ int alarm_start_handler(void)#endif } + status =pthread_condattr_init (&condattrs); +if (status) +fatal (status); + +pthread_condattr_setclock (&condattrs,CLOCK_MONOTONIC ); +pthread_cond_init (&cond, &condattrs); + status =pthread_create (&thid, pattrs, alarm_handler,NULL ); +pthread_condattr_destroy (&condattrs); +pthread_condattr_destroy (&cond); +if (pattrs)pthread_attr_destroy (pattrs);
Signature · 3 lines
1.9.1 -- To unsubscribe from this list: send the line "unsubscribe autofs" in
From aef6d0ff19eb65634a0cd2928b97c22b25451471 Mon Sep 17 00:00:00 2001
From: Yu Ning <[email protected]>
Date: Wed, 16 Sep 2015 18:22:51 +0800
Subject: [PATCH 3/3] Use monotonic clock instead of time().
A new function monotonic_time() is introduced in automount.h as a monotonic version of time(), all the calls to time() have been switched to use this new function.
--- daemon/automount.c | 4 ++-- daemon/direct.c | 4 ++-- daemon/indirect.c | 4 ++-- daemon/lookup.c | 6 +++--- daemon/state.c | 2 +- include/automount.h | 9 +++++++++ lib/alarm.c | 4 ++-- lib/cache.c | 2 +- lib/master.c | 4 ++-- modules/dclist.c | 2 +- modules/lookup_file.c | 8 ++++---- modules/lookup_hesiod.c | 6 +++--- modules/lookup_hosts.c | 4 ++-- modules/lookup_ldap.c | 10 +++++----- modules/lookup_nisplus.c | 10 +++++----- modules/lookup_program.c | 10 +++++----- modules/lookup_sss.c | 6 +++--- modules/lookup_userhome.c | 2 +- modules/lookup_yp.c | 8 ++++---- modules/mount_autofs.c | 2 +- modules/parse_amd.c | 2 +- modules/replicated.c | 4 ++-- 22 files changed, 61 insertions(+), 52 deletions(-)
daemon/automount.c +2 -2
@@ -1454,7 +1454,7 @@ static void *statemachine(void *arg)break ;case SIGHUP : -do_hup_signal (master_list,time (NULL )); +do_hup_signal (master_list,monotonic_time (NULL ));break ;default :
@@ -2004,7 +2004,7 @@ int main(int argc, char *argv[])unsigned ghost, logging, daemon_check;unsigned dumpmaps, foreground, have_global_options;time_t timeout; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );struct rlimit rlim;const char *options ="+hp:t:vmdD:fVrO:l:n:CF" ;static const struct option long_options[] = {
daemon/direct.c +1 -1
@@ -464,7 +464,7 @@ int mount_autofs_direct(struct autofs_point *ap)struct mapent_cache *nc, *mc;struct mapent *me, *ne, *nested;struct mnt_list *mnts; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );if (strcmp (ap->path,"/-" )) {error (ap->logopt,"expected direct map, exiting" );
@@ -1388,7 +1388,7 @@ int handle_packet_missing_direct(struct
autofs_point *ap, autofs_packet_missing_
}
/* Check if we recorded a mount fail for this key */
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) { ops->send_fail(ap->logopt,
ioctlfd, pkt->wait_queue_token, -ENOENT);
ops->close(ap->logopt, ioctlfd);
daemon/indirect.c +1 -1
@@ -197,7 +197,7 @@ out_err:int mount_autofs_indirect (struct autofs_point *ap,const char *root) { -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );int status;int map;
@@ -818,7 +818,7 @@ int handle_packet_missing_indirect(struct
autofs_point *ap, autofs_packet_missin
/* Check if we recorded a mount fail for this key anywhere */ me = lookup_source_mapent(ap, pkt->name, LKP_DISTINCT); if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) { ops->send_fail(ap->logopt, ap->ioctlfd,
pkt->wait_queue_token, -ENOENT);
cache_unlock(me->mc);
daemon/lookup.c +0 -0
@@ -875,7 +875,7 @@ static int lookup_name_file_source_instance(struct
autofs_point *ap, struct map_
struct map_source *instance;
char src_file[] = "file";
char src_prog[] = "program";
- time_t age = time(NULL);
+ time_t age = monotonic_time(NULL);
struct stat st;
char *type, *format;
@@ -915,7 +915,7 @@ static int lookup_name_source_instance(struct autofs_point *ap, struct map_sourc
{
struct map_source *instance;
const char *format;
- time_t age = time(NULL);
+ time_t age = monotonic_time(NULL);
if (*name == '/' && map->flags & MAP_FLAG_FORMAT_AMD) return lookup_amd_instance(ap, map, name, name_len);
@@ -1079,7 +1079,7 @@ static void update_negative_cache(struct autofs_point *ap, struct map_source *so
else
map = entry->maps;
if (map) {
- time_t now = time(NULL);
+ time_t now = monotonic_time(NULL);
int rv = CHE_FAIL;
cache_writelock(map->mc);
daemon/state.c +1 -1
@@ -553,7 +553,7 @@ static unsigned int st_readmap(struct autofs_point *ap)pthread_t thid;struct readmap_args *ra;int status; -int now =time (NULL ); +int now =monotonic_time (NULL );debug (ap->logopt,"state %d path %s" , ap->state, ap->path);
include/automount.h +9 -0
@@ -565,6 +565,15 @@ do { \fatal (_m_unlock); \ }while (0 ) +static inline time_t monotonic_time(time_t *t) +{ +struct timespec ts; +clock_gettime (CLOCK_MONOTONIC , &ts); +if (t) + *t = (time_t ) ts.tv_sec; +return (time_t ) ts.tv_sec; +} +/* Expire alarm handling routines */ int alarm_start_handler (void );int alarm_add (struct autofs_point *ap,time_t seconds);
lib/alarm.c +2 -2
@@ -46,7 +46,7 @@ int alarm_add(struct autofs_point *ap, time_t seconds)struct list_head *head;struct list_head *p;struct alarm *new; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t next_alarm =0 ;unsigned int empty =1 ;int status;
@@ -175,7 +175,7 @@ static void *alarm_handler(void *arg) first = list_entry(head->next, struct alarm, list); - now =time (NULL ); + now =monotonic_time (NULL );if (first->time > now) {struct timespec nsecs;
lib/cache.c +1 -1
@@ -775,7 +775,7 @@ void cache_update_negative(struct mapent_cache *mc, struct map_source *ms, const char *key, time_t timeout) { - time_t now = time(NULL); + time_t now = monotonic_time(NULL);struct mapent *me;int rv =CHE_OK ;
lib/master.c +0 -0
@@ -1483,7 +1483,7 @@ int dump_map(struct master *master, const char
*type, const char *name)
struct map_source *source;
struct master_mapent *this;
struct autofs_point *ap;
- time_t now = time(NULL);
+ time_t now = monotonic_time(NULL);
this = list_entry(p, struct master_mapent, list);
p = p->next;
@@ -1601,7 +1601,7 @@ int master_show_mounts(struct master *master)
struct map_source *source;
struct master_mapent *this;
struct autofs_point *ap;
- time_t now = time(NULL);
+ time_t now = monotonic_time(NULL);
unsigned int count = 0;
this = list_entry(p, struct master_mapent, list);
modules/dclist.c +0 -0
@@ -568,7 +568,7 @@ struct dclist *get_dc_list(unsigned int logopt,
const char *uri)
if (!list)
goto out_error;
- dclist->expire = time(NULL) + min_ttl;
+ dclist->expire = monotonic_time(NULL) + min_ttl; dclist->uri = list;
return dclist;
modules/lookup_file.c +3 -3
@@ -743,7 +743,7 @@ static int match_key(struct autofs_point *ap, {char buf[MAX_ERR_BUF ];struct mapent_cache *mc; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char *lkp_key;char *prefix;size_t map_key_len;
@@ -808,7 +808,7 @@ static int lookup_one(struct autofs_point *ap,struct mapent_cache *mc = source->mc;char mkey[KEY_MAX_LEN +1 ];char mapent[MAPENT_MAX_LEN +1 ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );FILE *f;unsigned int k_len, m_len;int entry, ret;
@@ -914,7 +914,7 @@ static int lookup_wild(struct autofs_point *ap,struct mapent_cache *mc;char mkey[KEY_MAX_LEN +1 ];char mapent[MAPENT_MAX_LEN +1 ]; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );FILE *f;unsigned int k_len, m_len;int entry, ret;
@@ -1118,7 +1118,7 @@ int lookup_mount(struct autofs_point *ap, const
char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me = lookup_source_mapent(ap, key, LKP_DISTINCT); if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) { cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
modules/lookup_hesiod.c +2 -2
@@ -163,7 +163,7 @@ static int lookup_one(struct autofs_point *ap, }cache_writelock (mc); - ret =cache_update (mc, source, key, best_record,time (NULL )); + ret =cache_update (mc, source, key, best_record,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {hesiod_free_list (ctxt->hesiod_context, hes_result);
@@ -228,7 +228,7 @@ static int lookup_one_amd(struct autofs_point *ap, }cache_writelock (mc); - ret =cache_update (mc, source, lkp_key, *hes_result,time (NULL )); + ret =cache_update (mc, source, lkp_key, *hes_result,monotonic_time (NULL ));cache_unlock (mc);if (hes_result)
@@ -339,7 +339,7 @@ int lookup_mount(struct autofs_point *ap, const
char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me = lookup_source_mapent(ap, name, LKP_DISTINCT); if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) { cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
modules/lookup_hosts.c +0 -0
@@ -284,7 +284,7 @@ int lookup_mount(struct autofs_point *ap, const
char *name, int name_len, void *
struct mapent *me;
char *mapent = NULL;
int mapent_len;
- time_t now = time(NULL);
+ time_t now = monotonic_time(NULL);
int ret;
source = ap->entry->current;
@@ -296,7 +296,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me = lookup_source_mapent(ap, name, LKP_DISTINCT);
if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) { cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
modules/lookup_ldap.c +0 -0
@@ -944,7 +944,7 @@ static LDAP *do_reconnect(unsigned logopt, struct
lookup_context *ctxt)
uris_mutex_lock(ctxt);
if (ctxt->dclist) {
- if (!ldap || ctxt->dclist->expire < time(NULL)) {
+ if (!ldap || ctxt->dclist->expire < monotonic_time(NULL)) { free_dclist(ctxt->dclist);
ctxt->dclist = NULL;
}
@@ -2851,7 +2851,7 @@ static int lookup_one(struct autofs_point *ap, struct map_source *source,
struct mapent_cache *mc;
int rv, i, l, ql, count;
char buf[MAX_ERR_BUF];
- time_t age = time(NULL);
+ time_t age = monotonic_time(NULL);
char *query;
LDAPMessage *result = NULL, *e;
char *class, *info, *entry;
@@ -3214,7 +3214,7 @@ static int lookup_one_amd(struct autofs_point *ap,
struct berval **bvKey;
struct berval **bvValues;
char buf[MAX_ERR_BUF];
- time_t age = time(NULL);
+ time_t age = monotonic_time(NULL);
int rv, l, ql, count;
int ret = CHE_MISSING;
@@ -3417,7 +3417,7 @@ static int check_map_indirect(struct autofs_point *ap,
unsigned int is_amd_format = source->flags & MAP_FLAG_FORMAT_AMD; struct mapent_cache *mc;
struct mapent *me;
- time_t now = time(NULL);
+ time_t now = monotonic_time(NULL);
time_t t_last_read;
int ret, cur_state;
int status;
@@ -3555,7 +3555,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me = lookup_source_mapent(ap, key, LKP_DISTINCT);
if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) { cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
modules/lookup_nisplus.c +4 -4
@@ -288,7 +288,7 @@ static int lookup_one(struct autofs_point *ap,nis_result *result;nis_object *this;char *mapent; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret, cur_state;char buf[MAX_ERR_BUF ];
@@ -400,7 +400,7 @@ static int lookup_wild(struct autofs_point *ap,nis_result *result;nis_object *this;char *mapent; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret, cur_state;char buf[MAX_ERR_BUF ];
@@ -487,7 +487,7 @@ static int lookup_amd_defaults(struct autofs_point *ap, mapent =ENTRY_VAL (this,1 );cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , mapent,time (NULL )); + ret =cache_update (mc, source,"/defaults" , mapent,monotonic_time (NULL ));cache_unlock (mc);nis_freeresult (result);
@@ -505,7 +505,7 @@ static int check_map_indirect(struct autofs_point *ap,unsigned int is_amd_format = source->flags &MAP_FLAG_FORMAT_AMD ;struct mapent_cache *mc;struct mapent *me, *exists; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret =0 ;
@@ -650,7 +650,7 @@ int lookup_mount(struct autofs_point *ap, const
char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me = lookup_source_mapent(ap, key, LKP_DISTINCT); if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) { cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
modules/lookup_program.c +3 -3
@@ -369,7 +369,7 @@ static int lookup_amd_defaults(struct autofs_point *ap,while (isblank (*start)) start++;cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , start,time (NULL )); + ret =cache_update (mc, source,"/defaults" , start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (ment);
@@ -438,7 +438,7 @@ static int match_key(struct autofs_point *ap, start++; }cache_writelock (mc); - ret =cache_update (mc, source, lkp_key, start,time (NULL )); + ret =cache_update (mc, source, lkp_key, start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (ment);
@@ -491,7 +491,7 @@ static int match_key(struct autofs_point *ap,while (isblank (*start)) start++;cache_writelock (mc); - ret =cache_update (mc, source, match, start,time (NULL )); + ret =cache_update (mc, source, match, start,monotonic_time (NULL ));cache_unlock (mc);if (ret ==CHE_FAIL ) {free (match);
@@ -537,7 +537,7 @@ int lookup_mount(struct autofs_point *ap, const
char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me = lookup_source_mapent(ap, name, LKP_DISTINCT);
if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) { cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
@@ -586,7 +586,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
* proceed with the program map lookup.
*/
if (strchr(name, '/') ||
- me->age + ap->negative_timeout > time(NULL)) {
+ me->age + ap->negative_timeout > monotonic_time(NULL)) {
char *ent = NULL;
if (me->mapent) {
modules/lookup_sss.c +2 -2
@@ -374,7 +374,7 @@ static int lookup_one(struct autofs_point *ap,struct mapent_cache *mc;struct mapent *we;void *sss_ctxt =NULL ; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );char buf[MAX_ERR_BUF ];char *value =NULL ;char *s_key;
@@ -491,7 +491,7 @@ static int check_map_indirect(struct autofs_point *ap,struct map_source *source;struct mapent_cache *mc;struct mapent *me; -time_t now =time (NULL ); +time_t now =monotonic_time (NULL );time_t t_last_read;int ret, cur_state;
@@ -585,7 +585,7 @@ int lookup_mount(struct autofs_point *ap, const
char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me = lookup_source_mapent(ap, key, LKP_DISTINCT); if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) { cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
modules/lookup_userhome.c +0 -0
@@ -77,7 +77,7 @@ int lookup_mount(struct autofs_point *ap, const char
*name, int name_len, void *
}
cache_writelock(mc);
- ret = cache_update(mc, source, name, NULL, time(NULL));
+ ret = cache_update(mc, source, name, NULL, monotonic_time(NULL)); cache_unlock(mc);
if (ret == CHE_FAIL) {
modules/lookup_yp.c +3 -3
@@ -405,7 +405,7 @@ static int lookup_one(struct autofs_point *ap,char *mapname;char *mapent;int mapent_len; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret; mc = source->mc;
@@ -517,7 +517,7 @@ static int lookup_wild(struct autofs_point *ap,char *mapname;char *mapent;int mapent_len; -time_t age =time (NULL ); +time_t age =monotonic_time (NULL );int ret; mc = source->mc;
@@ -598,7 +598,7 @@ static int lookup_amd_defaults(struct autofs_point *ap,return CHE_FAIL ;cache_writelock (mc); - ret =cache_update (mc, source,"/defaults" , mapent,time (NULL )); + ret =cache_update (mc, source,"/defaults" , mapent,monotonic_time (NULL ));cache_unlock (mc);return ret;
@@ -753,7 +753,7 @@ int lookup_mount(struct autofs_point *ap, const
char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */ me = lookup_source_mapent(ap, key, LKP_DISTINCT); if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) { cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
modules/mount_autofs.c +0 -0
@@ -242,7 +242,7 @@ int mount_mount(struct autofs_point *ap, const
char *root, const char *name,
source = master_add_map_source(entry,
info->type, info->format,
- time(NULL), argc, argv);
+ monotonic_time(NULL), argc, argv);
if (!source) {
error(ap->logopt,
MODPREFIX "failed to add map source to entry");
modules/parse_amd.c +0 -0
@@ -1181,7 +1181,7 @@ static int do_host_mount(struct autofs_point
*ap, const char *name,
"hosts", "sun", argc, pargv);
if (!instance) {
instance = master_add_source_instance(source,
- "hosts", "sun", time(NULL), argc, pargv);
+ "hosts", "sun", monotonic_time(NULL), argc, pargv); if (!instance) {
error(ap->logopt, MODPREFIX
"failed to create source instance for hosts map");
modules/replicated.c +2 -2
@@ -69,14 +69,14 @@ void seed_random(void) fd =open_fd ("/dev/urandom" ,O_RDONLY );if (fd <0 ) { -srandom (time (NULL )); +srandom (monotonic_time (NULL ));return ; }if (read (fd, &seed,sizeof (seed)) !=-1 )srandom (seed);else -srandom (time (NULL )); +srandom (monotonic_time (NULL ));close (fd);
Signature · 3 lines
1.9.1 -- To unsubscribe from this list: send the line "unsubscribe autofs" in