/*
- * Copyright (c) 1998-2013 Apple Inc. All rights reserved.
+ * Copyright (c) 1998-2018 Apple Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
#include <sys/queue.h>
#include <net/dlil.h>
+#include <net/nwk_wq.h>
#include <mach/boolean.h>
#include <pexpert/pexpert.h>
+/* Eventhandler context for protocol events */
+struct eventhandler_lists_ctxt protoctl_evhdlr_ctxt;
+
static void pr_init_old(struct protosw *, struct domain *);
static void init_proto(struct protosw *, struct domain *);
static void attach_proto(struct protosw *, struct domain *);
static struct protosw *pffindprotonotype_locked(int, int, int);
static struct domain *pffinddomain_locked(int);
-static boolean_t domain_timeout_run; /* domain timer is scheduled to run */
+static boolean_t domain_timeout_run; /* domain timer is scheduled to run */
static boolean_t domain_draining;
static void domain_sched_timeout(void);
static void domain_timeout(void *);
-lck_grp_t *domain_proto_mtx_grp;
-lck_attr_t *domain_proto_mtx_attr;
-static lck_grp_attr_t *domain_proto_mtx_grp_attr;
-decl_lck_mtx_data(static, domain_proto_mtx);
-decl_lck_mtx_data(static, domain_timeout_mtx);
+static LCK_GRP_DECLARE(domain_proto_mtx_grp, "domain");
+static LCK_ATTR_DECLARE(domain_proto_mtx_attr, 0, 0);
+static LCK_MTX_DECLARE_ATTR(domain_proto_mtx,
+ &domain_proto_mtx_grp, &domain_proto_mtx_attr);
+static LCK_MTX_DECLARE_ATTR(domain_timeout_mtx,
+ &domain_proto_mtx_grp, &domain_proto_mtx_attr);
-static u_int64_t _net_uptime;
+u_int64_t _net_uptime;
+u_int64_t _net_uptime_ms;
#if (DEVELOPMENT || DEBUG)
static int sysctl_do_drain_domains SYSCTL_HANDLER_ARGS;
SYSCTL_PROC(_kern_ipc, OID_AUTO, do_drain_domains,
- CTLTYPE_INT|CTLFLAG_RW|CTLFLAG_LOCKED,
- 0, 0,
- sysctl_do_drain_domains, "I", "force manual drain domains");
+ CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
+ 0, 0,
+ sysctl_do_drain_domains, "I", "force manual drain domains");
#endif /* DEVELOPMENT || DEBUG */
VERIFY(pp->pr_flags & PR_OLD);
VERIFY(pp->pr_old != NULL);
- if (pp->pr_old->pr_init != NULL)
+ if (pp->pr_old->pr_init != NULL) {
pp->pr_old->pr_init();
+ }
}
static void
if (!(pp->pr_flags & PR_INITIALIZED)) {
TAILQ_INIT(&pp->pr_filter_head);
- if (pp->pr_init != NULL)
+ if (pp->pr_init != NULL) {
pp->pr_init(pp, dp);
+ }
pp->pr_flags |= PR_INITIALIZED;
}
}
VERIFY(dp->dom_flags & DOM_OLD);
VERIFY(dp->dom_old != NULL);
- if (dp->dom_old->dom_init != NULL)
+ if (dp->dom_old->dom_init != NULL) {
dp->dom_old->dom_init();
+ }
}
static void
VERIFY(dp->dom_flags & DOM_ATTACHED);
if (!(dp->dom_flags & DOM_INITIALIZED)) {
- lck_mtx_init(&dp->dom_mtx_s, domain_proto_mtx_grp,
- domain_proto_mtx_attr);
+ lck_mtx_init(&dp->dom_mtx_s, &domain_proto_mtx_grp,
+ &domain_proto_mtx_attr);
dp->dom_mtx = &dp->dom_mtx_s;
TAILQ_INIT(&dp->dom_protosw);
- if (dp->dom_init != NULL)
+ if (dp->dom_init != NULL) {
dp->dom_init(dp);
+ }
dp->dom_flags |= DOM_INITIALIZED;
}
/* Recompute for new protocol */
- if (_max_linkhdr < 16) /* XXX - Sheesh; everything's ether? */
+ if (_max_linkhdr < 16) { /* XXX - Sheesh; everything's ether? */
_max_linkhdr = 16;
- _max_linkhdr = max_linkhdr; /* round it up */
+ }
+ _max_linkhdr = max_linkhdr; /* round it up */
- if (dp->dom_protohdrlen > _max_protohdr)
+ if (dp->dom_protohdrlen > _max_protohdr) {
_max_protohdr = dp->dom_protohdrlen;
- _max_protohdr = max_protohdr; /* round it up */
+ }
+ _max_protohdr = max_protohdr; /* round it up */
max_hdr = max_linkhdr + max_protohdr;
max_datalen = MHLEN - max_hdr;
/* NOTREACHED */
}
- dp = _MALLOC(sizeof (*dp), M_TEMP, M_WAITOK | M_ZERO);
+ dp = kheap_alloc(KHEAP_DEFAULT, sizeof(struct domain), Z_WAITOK | Z_ZERO);
if (dp == NULL) {
/*
* There is really nothing better than to panic here,
}
/* Copy everything but dom_init, dom_mtx, dom_next and dom_refs */
- dp->dom_family = odp->dom_family;
- dp->dom_flags = (odp->dom_flags & DOMF_USERFLAGS) | DOM_OLD;
- dp->dom_name = odp->dom_name;
- dp->dom_init = dom_init_old;
- dp->dom_externalize = odp->dom_externalize;
- dp->dom_dispose = odp->dom_dispose;
- dp->dom_rtattach = odp->dom_rtattach;
- dp->dom_rtoffset = odp->dom_rtoffset;
- dp->dom_maxrtkey = odp->dom_maxrtkey;
- dp->dom_protohdrlen = odp->dom_protohdrlen;
- dp->dom_old = odp;
+ dp->dom_family = odp->dom_family;
+ dp->dom_flags = (odp->dom_flags & DOMF_USERFLAGS) | DOM_OLD;
+ dp->dom_name = odp->dom_name;
+ dp->dom_init = dom_init_old;
+ dp->dom_externalize = odp->dom_externalize;
+ dp->dom_dispose = odp->dom_dispose;
+ dp->dom_rtattach = odp->dom_rtattach;
+ dp->dom_rtoffset = odp->dom_rtoffset;
+ dp->dom_maxrtkey = odp->dom_maxrtkey;
+ dp->dom_protohdrlen = odp->dom_protohdrlen;
+ dp->dom_old = odp;
attach_domain(dp);
init_domain(dp);
/* Point the mutex back to the internal structure's */
- odp->dom_mtx = dp->dom_mtx;
+ odp->dom_mtx = dp->dom_mtx;
domain_guard_release(guard);
}
}
TAILQ_FOREACH_SAFE(dp1, &domains, dom_entry, dp2) {
- if (!(dp1->dom_flags & DOM_OLD))
+ if (!(dp1->dom_flags & DOM_OLD)) {
continue;
+ }
VERIFY(dp1->dom_old != NULL);
- if (odp == dp1->dom_old)
+ if (odp == dp1->dom_old) {
break;
+ }
}
if (dp1 != NULL) {
struct protosw *pp1, *pp2;
/* Remove all protocols attached to this domain */
TAILQ_FOREACH_SAFE(pp1, &dp1->dom_protosw, pr_entry, pp2) {
detach_proto(pp1, dp1);
- if (pp1->pr_usrreqs->pru_flags & PRUF_OLD)
- FREE(pp1->pr_usrreqs, M_TEMP);
- if (pp1->pr_flags & PR_OLD)
- FREE(pp1, M_TEMP);
+ if (pp1->pr_usrreqs->pru_flags & PRUF_OLD) {
+ kheap_free(KHEAP_DEFAULT, pp1->pr_usrreqs, sizeof(struct pr_usrreqs));
+ }
+ if (pp1->pr_flags & PR_OLD) {
+ kheap_free(KHEAP_DEFAULT, pp1, sizeof(struct protosw));
+ }
}
detach_domain(dp1);
- FREE(dp1, M_TEMP);
+ kheap_free(KHEAP_DEFAULT, dp1, sizeof(struct domain));
} else {
error = EPFNOSUPPORT;
}
done:
domain_guard_release(guard);
- return (error);
+ return error;
}
/*
TAILQ_FOREACH(pp1, &dp->dom_protosw, pr_entry) {
if (pp1->pr_type == pp->pr_type &&
- pp1->pr_protocol == pp->pr_protocol)
- return (EEXIST);
+ pp1->pr_protocol == pp->pr_protocol) {
+ return EEXIST;
+ }
}
attach_proto(pp, dp);
- if (doinit)
+ if (doinit) {
net_init_proto(pp, dp);
+ }
- return (0);
+ return 0;
}
void
/* Make sure the domain has been added via net_add_domain */
TAILQ_FOREACH(dp, &domains, dom_entry) {
- if (!(dp->dom_flags & DOM_OLD))
+ if (!(dp->dom_flags & DOM_OLD)) {
continue;
- if (dp->dom_old == odp)
+ }
+ if (dp->dom_old == odp) {
break;
+ }
}
if (dp == NULL) {
error = EINVAL;
/* NOTREACHED */
}
- pru = _MALLOC(sizeof (*pru), M_TEMP, M_WAITOK | M_ZERO);
+ pru = kheap_alloc(KHEAP_DEFAULT, sizeof(struct pr_usrreqs),
+ Z_WAITOK | Z_ZERO);
if (pru == NULL) {
error = ENOMEM;
goto done;
}
- pru->pru_flags = PRUF_OLD;
- pru->pru_abort = opru->pru_abort;
- pru->pru_accept = opru->pru_accept;
- pru->pru_attach = opru->pru_attach;
- pru->pru_bind = opru->pru_bind;
- pru->pru_connect = opru->pru_connect;
- pru->pru_connect2 = opru->pru_connect2;
- pru->pru_control = opru->pru_control;
- pru->pru_detach = opru->pru_detach;
- pru->pru_disconnect = opru->pru_disconnect;
- pru->pru_listen = opru->pru_listen;
- pru->pru_peeraddr = opru->pru_peeraddr;
- pru->pru_rcvd = opru->pru_rcvd;
- pru->pru_rcvoob = opru->pru_rcvoob;
- pru->pru_send = opru->pru_send;
- pru->pru_sense = opru->pru_sense;
- pru->pru_shutdown = opru->pru_shutdown;
- pru->pru_sockaddr = opru->pru_sockaddr;
- pru->pru_sosend = opru->pru_sosend;
- pru->pru_soreceive = opru->pru_soreceive;
- pru->pru_sopoll = opru->pru_sopoll;
-
- pp = _MALLOC(sizeof (*pp), M_TEMP, M_WAITOK | M_ZERO);
+ pru->pru_flags = PRUF_OLD;
+ pru->pru_abort = opru->pru_abort;
+ pru->pru_accept = opru->pru_accept;
+ pru->pru_attach = opru->pru_attach;
+ pru->pru_bind = opru->pru_bind;
+ pru->pru_connect = opru->pru_connect;
+ pru->pru_connect2 = opru->pru_connect2;
+ pru->pru_control = opru->pru_control;
+ pru->pru_detach = opru->pru_detach;
+ pru->pru_disconnect = opru->pru_disconnect;
+ pru->pru_listen = opru->pru_listen;
+ pru->pru_peeraddr = opru->pru_peeraddr;
+ pru->pru_rcvd = opru->pru_rcvd;
+ pru->pru_rcvoob = opru->pru_rcvoob;
+ pru->pru_send = opru->pru_send;
+ pru->pru_sense = opru->pru_sense;
+ pru->pru_shutdown = opru->pru_shutdown;
+ pru->pru_sockaddr = opru->pru_sockaddr;
+ pru->pru_sosend = opru->pru_sosend;
+ pru->pru_soreceive = opru->pru_soreceive;
+ pru->pru_sopoll = opru->pru_sopoll;
+
+ pp = kheap_alloc(KHEAP_DEFAULT, sizeof(struct protosw), Z_WAITOK | Z_ZERO);
if (pp == NULL) {
error = ENOMEM;
goto done;
}
/* Copy everything but pr_init, pr_next, pr_domain, pr_protosw */
- pp->pr_type = opp->pr_type;
- pp->pr_protocol = opp->pr_protocol;
- pp->pr_flags = (opp->pr_flags & PRF_USERFLAGS) | PR_OLD;
- pp->pr_input = opp->pr_input;
- pp->pr_output = opp->pr_output;
- pp->pr_ctlinput = opp->pr_ctlinput;
- pp->pr_ctloutput = opp->pr_ctloutput;
- pp->pr_usrreqs = pru;
- pp->pr_init = pr_init_old;
- pp->pr_drain = opp->pr_drain;
- pp->pr_sysctl = opp->pr_sysctl;
- pp->pr_lock = opp->pr_lock;
- pp->pr_unlock = opp->pr_unlock;
- pp->pr_getlock = opp->pr_getlock;
- pp->pr_old = opp;
+ pp->pr_type = opp->pr_type;
+ pp->pr_protocol = opp->pr_protocol;
+ pp->pr_flags = (opp->pr_flags & PRF_USERFLAGS) | PR_OLD;
+ pp->pr_input = opp->pr_input;
+ pp->pr_output = opp->pr_output;
+ pp->pr_ctlinput = opp->pr_ctlinput;
+ pp->pr_ctloutput = opp->pr_ctloutput;
+ pp->pr_usrreqs = pru;
+ pp->pr_init = pr_init_old;
+ pp->pr_drain = opp->pr_drain;
+ pp->pr_sysctl = opp->pr_sysctl;
+ pp->pr_lock = opp->pr_lock;
+ pp->pr_unlock = opp->pr_unlock;
+ pp->pr_getlock = opp->pr_getlock;
+ pp->pr_old = opp;
/* attach as well as initialize */
attach_proto(pp, dp);
"error %d\n", __func__, odp->dom_family,
odp->dom_name, opp->pr_protocol, error);
- if (pru != NULL)
- FREE(pru, M_TEMP);
- if (pp != NULL)
- FREE(pp, M_TEMP);
+ kheap_free(KHEAP_DEFAULT, pru, sizeof(struct pr_usrreqs));
+ kheap_free(KHEAP_DEFAULT, pp, sizeof(struct protosw));
}
domain_guard_release(guard);
- return (error);
+ return error;
}
/*
domain_proto_mtx_lock_assert_held();
TAILQ_FOREACH(pp, &dp->dom_protosw, pr_entry) {
- if (pp->pr_type == type && pp->pr_protocol == protocol)
+ if (pp->pr_type == type && pp->pr_protocol == protocol) {
break;
+ }
+ }
+ if (pp == NULL) {
+ return ENXIO;
}
- if (pp == NULL)
- return (ENXIO);
detach_proto(pp, dp);
- if (pp->pr_usrreqs->pru_flags & PRUF_OLD)
- FREE(pp->pr_usrreqs, M_TEMP);
- if (pp->pr_flags & PR_OLD)
- FREE(pp, M_TEMP);
+ if (pp->pr_usrreqs->pru_flags & PRUF_OLD) {
+ kheap_free(KHEAP_DEFAULT, pp->pr_usrreqs, sizeof(struct pr_usrreqs));
+ }
+ if (pp->pr_flags & PR_OLD) {
+ kheap_free(KHEAP_DEFAULT, pp, sizeof(struct protosw));
+ }
- return (0);
+ return 0;
}
/*
/* Make sure the domain has been added via net_add_domain */
TAILQ_FOREACH(dp, &domains, dom_entry) {
- if (!(dp->dom_flags & DOM_OLD))
+ if (!(dp->dom_flags & DOM_OLD)) {
continue;
- if (dp->dom_old == odp)
+ }
+ if (dp->dom_old == odp) {
break;
+ }
}
if (dp == NULL) {
error = ENXIO;
}
TAILQ_FOREACH(pp, &dp->dom_protosw, pr_entry) {
- if (pp->pr_type == type && pp->pr_protocol == protocol)
+ if (pp->pr_type == type && pp->pr_protocol == protocol) {
break;
+ }
}
if (pp == NULL) {
error = ENXIO;
goto done;
}
detach_proto(pp, dp);
- if (pp->pr_usrreqs->pru_flags & PRUF_OLD)
- FREE(pp->pr_usrreqs, M_TEMP);
- if (pp->pr_flags & PR_OLD)
- FREE(pp, M_TEMP);
+ if (pp->pr_usrreqs->pru_flags & PRUF_OLD) {
+ kheap_free(KHEAP_DEFAULT, pp->pr_usrreqs, sizeof(struct pr_usrreqs));
+ }
+ if (pp->pr_flags & PR_OLD) {
+ kheap_free(KHEAP_DEFAULT, pp, sizeof(struct protosw));
+ }
done:
domain_guard_release(guard);
- return (error);
+ return error;
}
static void
domain_sched_timeout(void)
{
- lck_mtx_assert(&domain_timeout_mtx, LCK_MTX_ASSERT_OWNED);
+ LCK_MTX_ASSERT(&domain_timeout_mtx, LCK_MTX_ASSERT_OWNED);
if (!domain_timeout_run && domain_draining) {
domain_timeout_run = TRUE;
lck_mtx_unlock(&domain_timeout_mtx);
}
-#if INET6
extern struct domain inet6domain_s;
-#endif
#if IPSEC
extern struct domain keydomain_s;
#endif
extern struct domain routedomain_s, ndrvdomain_s, inetdomain_s;
extern struct domain systemdomain_s, localdomain_s;
+extern struct domain vsockdomain_s;
#if MULTIPATH
extern struct domain mpdomain_s;
guard = domain_guard_deploy();
TAILQ_FOREACH(dp, &domains, dom_entry) {
TAILQ_FOREACH(pp, &dp->dom_protosw, pr_entry) {
- if (pp->pr_drain != NULL)
+ if (pp->pr_drain != NULL) {
(*pp->pr_drain)();
+ }
}
}
domain_guard_release(guard);
struct domain *dp;
domain_guard_t guard;
- /*
- * allocate lock group attribute and group for domain mutexes
- */
- domain_proto_mtx_grp_attr = lck_grp_attr_alloc_init();
-
- domain_proto_mtx_grp = lck_grp_alloc_init("domain",
- domain_proto_mtx_grp_attr);
-
- /*
- * allocate the lock attribute for per domain mutexes
- */
- domain_proto_mtx_attr = lck_attr_alloc_init();
-
- lck_mtx_init(&domain_proto_mtx, domain_proto_mtx_grp,
- domain_proto_mtx_attr);
- lck_mtx_init(&domain_timeout_mtx, domain_proto_mtx_grp,
- domain_proto_mtx_attr);
+ eventhandler_lists_ctxt_init(&protoctl_evhdlr_ctxt);
guard = domain_guard_deploy();
/*
* dom_rtattach() called on rt_tables[].
*/
attach_domain(&inetdomain_s);
-#if INET6
attach_domain(&inet6domain_s);
-#endif /* INET6 */
#if MULTIPATH
attach_domain(&mpdomain_s);
#endif /* MULTIPATH */
attach_domain(&keydomain_s);
#endif /* IPSEC */
attach_domain(&ndrvdomain_s);
- attach_domain(&routedomain_s); /* must be last domain */
+ attach_domain(&vsockdomain_s);
+ attach_domain(&routedomain_s); /* must be last domain */
/*
* Now ask them all to init (XXX including the routing domain,
* see above)
*/
TAILQ_FOREACH(dp, &domains, dom_entry)
- init_domain(dp);
+ init_domain(dp);
domain_guard_release(guard);
}
domain_proto_mtx_lock_assert_held();
TAILQ_FOREACH(dp, &domains, dom_entry) {
- if (dp->dom_family == pf)
+ if (dp->dom_family == pf) {
break;
+ }
}
- return (dp);
+ return dp;
}
struct protosw *
domain_guard_t guard;
guard = domain_guard_deploy();
- if ((dp = pffinddomain_locked(family)) == NULL)
+ if ((dp = pffinddomain_locked(family)) == NULL) {
goto done;
+ }
TAILQ_FOREACH(pp, &dp->dom_protosw, pr_entry) {
- if (pp->pr_type != 0 && pp->pr_type == type)
+ if (pp->pr_type != 0 && pp->pr_type == type) {
goto done;
+ }
}
done:
domain_guard_release(guard);
- return (pp);
+ return pp;
}
/*
guard = domain_guard_deploy();
dp = pffinddomain_locked(pf);
domain_guard_release(guard);
- return (dp);
+ return dp;
}
/*
domain_guard_t guard;
guard = domain_guard_deploy();
- if ((dp = pffinddomain_locked(pf)) != NULL && (dp->dom_flags & DOM_OLD))
+ if ((dp = pffinddomain_locked(pf)) != NULL && (dp->dom_flags & DOM_OLD)) {
odp = dp->dom_old;
+ }
domain_guard_release(guard);
- return (odp);
+ return odp;
}
/*
guard = domain_guard_deploy();
pp = pffindproto_locked(family, protocol, type);
domain_guard_release(guard);
- return (pp);
+ return pp;
}
struct protosw *
domain_proto_mtx_lock_assert_held();
- if (family == 0)
- return (0);
+ if (family == 0) {
+ return 0;
+ }
dp = pffinddomain_locked(family);
- if (dp == NULL)
- return (NULL);
+ if (dp == NULL) {
+ return NULL;
+ }
TAILQ_FOREACH(pp, &dp->dom_protosw, pr_entry) {
- if ((pp->pr_protocol == protocol) && (pp->pr_type == type))
- return (pp);
+ if ((pp->pr_protocol == protocol) && (pp->pr_type == type)) {
+ return pp;
+ }
if (type == SOCK_RAW && pp->pr_type == SOCK_RAW &&
- pp->pr_protocol == 0 && maybe == NULL)
+ pp->pr_protocol == 0 && maybe == NULL) {
maybe = pp;
+ }
}
- return (maybe);
+ return maybe;
}
/*
guard = domain_guard_deploy();
if ((pp = pffindproto_locked(family, protocol, type)) != NULL &&
- (pp->pr_flags & PR_OLD))
+ (pp->pr_flags & PR_OLD)) {
opr = pp->pr_old;
+ }
domain_guard_release(guard);
- return (opr);
+ return opr;
}
static struct protosw *
domain_proto_mtx_lock_assert_held();
- if (family == 0)
- return (0);
+ if (family == 0) {
+ return 0;
+ }
dp = pffinddomain_locked(family);
- if (dp == NULL)
- return (NULL);
+ if (dp == NULL) {
+ return NULL;
+ }
TAILQ_FOREACH(pp, &dp->dom_protosw, pr_entry) {
- if (pp->pr_protocol == protocol)
- return (pp);
+ if (pp->pr_protocol == protocol) {
+ return pp;
+ }
}
- return (NULL);
+ return NULL;
}
struct protosw *
struct protosw *pp;
domain_guard_t guard;
- if (protocol == 0)
- return (NULL);
+ if (protocol == 0) {
+ return NULL;
+ }
guard = domain_guard_deploy();
pp = pffindprotonotype_locked(family, protocol, 0);
domain_guard_release(guard);
- return (pp);
+ return pp;
}
void
struct protosw *pp;
domain_guard_t guard;
- if (sa == NULL)
+ if (sa == NULL) {
return;
+ }
guard = domain_guard_deploy();
TAILQ_FOREACH(dp, &domains, dom_entry) {
TAILQ_FOREACH(pp, &dp->dom_protosw, pr_entry) {
- if (pp->pr_ctlinput != NULL)
- (*pp->pr_ctlinput)(cmd, sa, ctlparam);
+ if (pp->pr_ctlinput != NULL) {
+ (*pp->pr_ctlinput)(cmd, sa, ctlparam, NULL);
+ }
}
}
domain_guard_release(guard);
}
void
-net_update_uptime(void)
+net_update_uptime_with_time(const struct timeval *tvp)
{
- struct timeval tv;
-
- microuptime(&tv);
- _net_uptime = tv.tv_sec;
+ _net_uptime = tvp->tv_sec;
/*
* Round up the timer to the nearest integer value because otherwise
* we might setup networking timers that are off by almost 1 second.
*/
- if (tv.tv_usec > 500000)
+ if (tvp->tv_usec > 500000) {
_net_uptime++;
+ }
+
+ /* update milliseconds variant */
+ _net_uptime_ms = (((u_int64_t)tvp->tv_sec * 1000) +
+ ((u_int64_t)tvp->tv_usec / 1000));
}
void
-net_update_uptime_secs(uint64_t secs)
+net_update_uptime(void)
{
- _net_uptime = secs;
+ struct timeval tv;
+
+ microuptime(&tv);
+
+ net_update_uptime_with_time(&tv);
}
/*
void
net_uptime2timeval(struct timeval *tv)
{
- if (tv == NULL)
+ if (tv == NULL) {
return;
+ }
tv->tv_usec = 0;
- tv->tv_sec = net_uptime();
+ tv->tv_sec = (time_t)net_uptime();
}
/*
u_int64_t
net_uptime(void)
{
- if (_net_uptime == 0)
+ if (_net_uptime == 0) {
+ net_update_uptime();
+ }
+
+ return _net_uptime;
+}
+
+u_int64_t
+net_uptime_ms(void)
+{
+ if (_net_uptime_ms == 0) {
net_update_uptime();
+ }
- return (_net_uptime);
+ return _net_uptime_ms;
}
void
domain_proto_mtx_lock_assert_held(void)
{
- lck_mtx_assert(&domain_proto_mtx, LCK_MTX_ASSERT_OWNED);
+ LCK_MTX_ASSERT(&domain_proto_mtx, LCK_MTX_ASSERT_OWNED);
}
void
domain_proto_mtx_lock_assert_notheld(void)
{
- lck_mtx_assert(&domain_proto_mtx, LCK_MTX_ASSERT_NOTOWNED);
+ LCK_MTX_ASSERT(&domain_proto_mtx, LCK_MTX_ASSERT_NOTOWNED);
}
domain_guard_t
marks = net_thread_marks_push(NET_THREAD_HELD_DOMAIN);
if (marks != net_thread_marks_none) {
- lck_mtx_assert(&domain_proto_mtx, LCK_MTX_ASSERT_NOTOWNED);
+ LCK_MTX_ASSERT(&domain_proto_mtx, LCK_MTX_ASSERT_NOTOWNED);
lck_mtx_lock(&domain_proto_mtx);
+ } else {
+ LCK_MTX_ASSERT(&domain_proto_mtx, LCK_MTX_ASSERT_OWNED);
}
- else
- lck_mtx_assert(&domain_proto_mtx, LCK_MTX_ASSERT_OWNED);
- return ((domain_guard_t)(const void*)marks);
+ return (domain_guard_t)(const void*)marks;
}
void
net_thread_marks_t marks = (net_thread_marks_t)(const void*)guard;
if (marks != net_thread_marks_none) {
- lck_mtx_assert(&domain_proto_mtx, LCK_MTX_ASSERT_OWNED);
+ LCK_MTX_ASSERT(&domain_proto_mtx, LCK_MTX_ASSERT_OWNED);
lck_mtx_unlock(&domain_proto_mtx);
net_thread_marks_pop(marks);
+ } else {
+ LCK_MTX_ASSERT(&domain_proto_mtx, LCK_MTX_ASSERT_NOTOWNED);
}
- else
- lck_mtx_assert(&domain_proto_mtx, LCK_MTX_ASSERT_NOTOWNED);
}
domain_unguard_t
marks = net_thread_unmarks_push(NET_THREAD_HELD_DOMAIN);
if (marks != net_thread_marks_none) {
- lck_mtx_assert(&domain_proto_mtx, LCK_MTX_ASSERT_OWNED);
+ LCK_MTX_ASSERT(&domain_proto_mtx, LCK_MTX_ASSERT_OWNED);
lck_mtx_unlock(&domain_proto_mtx);
+ } else {
+ LCK_MTX_ASSERT(&domain_proto_mtx, LCK_MTX_ASSERT_NOTOWNED);
}
- else
- lck_mtx_assert(&domain_proto_mtx, LCK_MTX_ASSERT_NOTOWNED);
- return ((domain_unguard_t)(const void*)marks);
+ return (domain_unguard_t)(const void*)marks;
}
void
net_thread_marks_t marks = (net_thread_marks_t)(const void*)unguard;
if (marks != net_thread_marks_none) {
- lck_mtx_assert(&domain_proto_mtx, LCK_MTX_ASSERT_NOTOWNED);
+ LCK_MTX_ASSERT(&domain_proto_mtx, LCK_MTX_ASSERT_NOTOWNED);
lck_mtx_lock(&domain_proto_mtx);
net_thread_unmarks_pop(marks);
+ } else {
+ LCK_MTX_ASSERT(&domain_proto_mtx, LCK_MTX_ASSERT_OWNED);
}
- else
- lck_mtx_assert(&domain_proto_mtx, LCK_MTX_ASSERT_OWNED);
}
+
#if (DEVELOPMENT || DEBUG)
-
+
static int
sysctl_do_drain_domains SYSCTL_HANDLER_ARGS
{
int error;
int dummy = 0;
- error = sysctl_handle_int(oidp, &dummy, 0, req);
- if (error || req->newptr == USER_ADDR_NULL)
- return (error);
+ error = sysctl_handle_int(oidp, &dummy, 0, req);
+ if (error || req->newptr == USER_ADDR_NULL) {
+ return error;
+ }
net_drain_domains();
- return (0);
+ return 0;
}
#endif /* DEVELOPMENT || DEBUG */
-
\ No newline at end of file
projects / apple / xnu.git / blobdiff