X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/0a7de7458d150b5d4dffc935ba399be265ef0a1a..c3c9b80d004dbbfdf763edeb97968c6997e3b45b:/bsd/sys/mcache.h?ds=sidebyside

diff --git a/bsd/sys/mcache.h b/bsd/sys/mcache.h
index 0c5aa5255..4fd209c37 100644
--- a/bsd/sys/mcache.h
+++ b/bsd/sys/mcache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2017 Apple Inc. All rights reserved.
+ * Copyright (c) 2006-2019 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
@@ -246,6 +246,7 @@ typedef struct mcache_obj {
 
 typedef struct mcache_bkt {
 	void            *bkt_next;      /* next bucket in list */
+	struct mcache_bkttype *bkt_type; /* bucket type */
 	void            *bkt_obj[1];    /* one or more objects */
 } mcache_bkt_t;
 
@@ -305,23 +306,17 @@ typedef struct mcache {
 	u_int32_t       mc_nwretry_cnt; /* # of no-wait retry attempts */
 	u_int32_t       mc_nwfail_cnt;  /* # of no-wait retries that failed */
 	decl_lck_mtx_data(, mc_sync_lock); /* protects purges and reenables */
-	lck_attr_t      *mc_sync_lock_attr;
 	lck_grp_t       *mc_sync_lock_grp;
-	lck_grp_attr_t  *mc_sync_lock_grp_attr;
 	/*
 	 * Keep CPU and buckets layers lock statistics separate.
 	 */
-	lck_attr_t      *mc_cpu_lock_attr;
 	lck_grp_t       *mc_cpu_lock_grp;
-	lck_grp_attr_t  *mc_cpu_lock_grp_attr;
 
 	/*
 	 * Bucket layer common to all CPUs
 	 */
 	decl_lck_mtx_data(, mc_bkt_lock);
-	lck_attr_t      *mc_bkt_lock_attr;
 	lck_grp_t       *mc_bkt_lock_grp;
-	lck_grp_attr_t  *mc_bkt_lock_grp_attr;
 	mcache_bkttype_t *cache_bkttype;        /* bucket type */
 	mcache_bktlist_t mc_full;               /* full buckets */
 	mcache_bktlist_t mc_empty;              /* empty buckets */
@@ -356,6 +351,8 @@ typedef struct mcache {
 
 #define MCA_TRN_MAX     2               /* Number of transactions to record */
 
+#define DUMP_MCA_BUF_SIZE       512
+
 typedef struct mcache_audit {
 	struct mcache_audit *mca_next;  /* next audit struct */
 	void            *mca_addr;      /* address of buffer */
@@ -373,7 +370,7 @@ typedef struct mcache_audit {
 	} mca_trns[MCA_TRN_MAX];
 } mcache_audit_t;
 
-__private_extern__ int assfail(const char *, const char *, int);
+__private_extern__ int assfail(const char *, const char *, int) __abortlike;
 __private_extern__ void mcache_init(void);
 __private_extern__ unsigned int mcache_getflags(void);
 __private_extern__ unsigned int mcache_cache_line_size(void);
@@ -399,15 +396,13 @@ __private_extern__ void mcache_buffer_log(mcache_audit_t *, void *, mcache_t *,
     struct timeval *);
 __private_extern__ void mcache_set_pattern(u_int64_t, void *, size_t);
 __private_extern__ void *mcache_verify_pattern(u_int64_t, void *, size_t);
-__private_extern__ void *mcache_verify_set_pattern(u_int64_t, u_int64_t,
-    void *, size_t);
 __private_extern__ void mcache_audit_free_verify(mcache_audit_t *,
     void *, size_t, size_t);
 __private_extern__ void mcache_audit_free_verify_set(mcache_audit_t *,
     void *, size_t, size_t);
-__private_extern__ char *mcache_dump_mca(mcache_audit_t *);
+__private_extern__ char *mcache_dump_mca(char buf[DUMP_MCA_BUF_SIZE], mcache_audit_t *);
 __private_extern__ void mcache_audit_panic(mcache_audit_t *, void *, size_t,
-    int64_t, int64_t);
+    int64_t, int64_t) __abortlike;
 
 extern int32_t total_sbmb_cnt;
 extern int32_t total_sbmb_cnt_floor;