xnu-7195.101.1.tar.gz

[apple/xnu.git] / bsd / dev / dtrace / fasttrap.c

diff --git a/bsd/dev/dtrace/fasttrap.c b/bsd/dev/dtrace/fasttrap.c
index e95eb2e1fe259150f33bf06544937f9ff5f7b2e6..7129aca09fb458657a8936e0d441362959f94725 100644 (file)
--- a/bsd/dev/dtrace/fasttrap.c
+++ b/bsd/dev/dtrace/fasttrap.c
@@ -145,7 +145,10 @@ static dtrace_meta_provider_id_t fasttrap_meta_id;
 
 static thread_t fasttrap_cleanup_thread;
 
 
 static thread_t fasttrap_cleanup_thread;
 

-static lck_mtx_t fasttrap_cleanup_mtx;
+static LCK_GRP_DECLARE(fasttrap_lck_grp, "fasttrap");
+static LCK_ATTR_DECLARE(fasttrap_lck_attr, 0, 0);
+static LCK_MTX_DECLARE_ATTR(fasttrap_cleanup_mtx,
+    &fasttrap_lck_grp, &fasttrap_lck_attr);

 
 
 #define FASTTRAP_CLEANUP_PROVIDER 0x1
 
 
 #define FASTTRAP_CLEANUP_PROVIDER 0x1


@@ -179,7 +182,8 @@ static fasttrap_hash_t              fasttrap_provs;
 static fasttrap_hash_t         fasttrap_procs;
 
 static uint64_t                        fasttrap_pid_count;     /* pid ref count */
 static fasttrap_hash_t         fasttrap_procs;
 
 static uint64_t                        fasttrap_pid_count;     /* pid ref count */

-static lck_mtx_t                       fasttrap_count_mtx;     /* lock on ref count */
+static LCK_MTX_DECLARE_ATTR(fasttrap_count_mtx,        /* lock on ref count */
+    &fasttrap_lck_grp, &fasttrap_lck_attr);

 
 #define        FASTTRAP_ENABLE_FAIL    1
 #define        FASTTRAP_ENABLE_PARTIAL 2
 
 #define        FASTTRAP_ENABLE_FAIL    1
 #define        FASTTRAP_ENABLE_PARTIAL 2


@@ -226,13 +230,6 @@ static const char *fasttrap_probe_t_zone_names[FASTTRAP_PROBE_T_ZONE_MAX_TRACEPO
        "dtrace.fasttrap_probe_t[3]"
 };
 
        "dtrace.fasttrap_probe_t[3]"
 };
 

-/*
- * APPLE NOTE:  We have to manage locks explicitly
- */
-lck_grp_t*                     fasttrap_lck_grp;
-lck_grp_attr_t*                        fasttrap_lck_grp_attr;
-lck_attr_t*                    fasttrap_lck_attr;
-

 static int
 fasttrap_highbit(ulong_t i)
 {
 static int
 fasttrap_highbit(ulong_t i)
 {


@@ -406,7 +403,8 @@ typedef struct fasttrap_tracepoint_spec {
 
 static fasttrap_tracepoint_spec_t *fasttrap_retired_spec;
 static size_t fasttrap_cur_retired = 0, fasttrap_retired_size;
 
 static fasttrap_tracepoint_spec_t *fasttrap_retired_spec;
 static size_t fasttrap_cur_retired = 0, fasttrap_retired_size;

-static lck_mtx_t fasttrap_retired_mtx;
+static LCK_MTX_DECLARE_ATTR(fasttrap_retired_mtx,
+    &fasttrap_lck_grp, &fasttrap_lck_attr);

 
 #define DEFAULT_RETIRED_SIZE 256
 
 
 #define DEFAULT_RETIRED_SIZE 256
 


@@ -598,7 +596,7 @@ fasttrap_setdebug(proc_t *p)
                        sprunlock(p);
                        p = PROC_NULL;
 
                        sprunlock(p);
                        p = PROC_NULL;
 

-                       mac_proc_check_get_task(state->dts_cred.dcr_cred, &pident);
+                       (void) mac_proc_check_get_task(state->dts_cred.dcr_cred, &pident, TASK_FLAVOR_CONTROL);

 
                        p = sprlock(pident.p_pid);
                        if (p == PROC_NULL) {
 
                        p = sprlock(pident.p_pid);
                        if (p == PROC_NULL) {


@@ -1521,7 +1519,7 @@ fasttrap_proc_lookup(pid_t pid)
        /*
         * APPLE NOTE: We have to initialize all locks explicitly
         */
        /*
         * APPLE NOTE: We have to initialize all locks explicitly
         */

-       lck_mtx_init(&new_fprc->ftpc_mtx, fasttrap_lck_grp, fasttrap_lck_attr);
+       lck_mtx_init(&new_fprc->ftpc_mtx, &fasttrap_lck_grp, &fasttrap_lck_attr);

 
        new_fprc->ftpc_next = bucket->ftb_data;
        bucket->ftb_data = new_fprc;
 
        new_fprc->ftpc_next = bucket->ftb_data;
        bucket->ftb_data = new_fprc;


@@ -1580,7 +1578,7 @@ fasttrap_proc_release(fasttrap_proc_t *proc)
         * APPLE NOTE: explicit lock management. Not 100% certain we need this, the
         * memory is freed even without the destroy. Maybe accounting cleanup?
         */
         * APPLE NOTE: explicit lock management. Not 100% certain we need this, the
         * memory is freed even without the destroy. Maybe accounting cleanup?
         */

-       lck_mtx_destroy(&fprc->ftpc_mtx, fasttrap_lck_grp);
+       lck_mtx_destroy(&fprc->ftpc_mtx, &fasttrap_lck_grp);

 
        kmem_free(fprc, sizeof (fasttrap_proc_t));
 }
 
        kmem_free(fprc, sizeof (fasttrap_proc_t));
 }


@@ -1663,8 +1661,8 @@ fasttrap_provider_lookup(proc_t *p, fasttrap_provider_type_t provider_type, cons
        /*
         * APPLE NOTE:  locks require explicit init
         */
        /*
         * APPLE NOTE:  locks require explicit init
         */

-       lck_mtx_init(&new_fp->ftp_mtx, fasttrap_lck_grp, fasttrap_lck_attr);
-       lck_mtx_init(&new_fp->ftp_cmtx, fasttrap_lck_grp, fasttrap_lck_attr);
+       lck_mtx_init(&new_fp->ftp_mtx, &fasttrap_lck_grp, &fasttrap_lck_attr);
+       lck_mtx_init(&new_fp->ftp_cmtx, &fasttrap_lck_grp, &fasttrap_lck_attr);

 
        ASSERT(new_fp->ftp_proc != NULL);
 
 
        ASSERT(new_fp->ftp_proc != NULL);
 


@@ -1747,8 +1745,8 @@ fasttrap_provider_free(fasttrap_provider_t *provider)
         * APPLE NOTE:  explicit lock management. Not 100% certain we need this, the
         * memory is freed even without the destroy. Maybe accounting cleanup?
         */
         * APPLE NOTE:  explicit lock management. Not 100% certain we need this, the
         * memory is freed even without the destroy. Maybe accounting cleanup?
         */

-       lck_mtx_destroy(&provider->ftp_mtx, fasttrap_lck_grp);
-       lck_mtx_destroy(&provider->ftp_cmtx, fasttrap_lck_grp);
+       lck_mtx_destroy(&provider->ftp_mtx, &fasttrap_lck_grp);
+       lck_mtx_destroy(&provider->ftp_cmtx, &fasttrap_lck_grp);

 
        kmem_free(provider, sizeof (fasttrap_provider_t));
 
 
        kmem_free(provider, sizeof (fasttrap_provider_t));
 


@@ -2652,7 +2650,8 @@ fasttrap_attach(void)
        ASSERT(fasttrap_tpoints.fth_table != NULL);
 
        for (i = 0; i < fasttrap_tpoints.fth_nent; i++) {
        ASSERT(fasttrap_tpoints.fth_table != NULL);
 
        for (i = 0; i < fasttrap_tpoints.fth_nent; i++) {

-               lck_mtx_init(&fasttrap_tpoints.fth_table[i].ftb_mtx, fasttrap_lck_grp, fasttrap_lck_attr);
+               lck_mtx_init(&fasttrap_tpoints.fth_table[i].ftb_mtx, &fasttrap_lck_grp,
+                   &fasttrap_lck_attr);

        }
 
        /*
        }
 
        /*


@@ -2670,7 +2669,8 @@ fasttrap_attach(void)
        ASSERT(fasttrap_provs.fth_table != NULL);
 
        for (i = 0; i < fasttrap_provs.fth_nent; i++) {
        ASSERT(fasttrap_provs.fth_table != NULL);
 
        for (i = 0; i < fasttrap_provs.fth_nent; i++) {

-               lck_mtx_init(&fasttrap_provs.fth_table[i].ftb_mtx, fasttrap_lck_grp, fasttrap_lck_attr);
+               lck_mtx_init(&fasttrap_provs.fth_table[i].ftb_mtx, &fasttrap_lck_grp,
+                   &fasttrap_lck_attr);

        }
 
        /*
        }
 
        /*


@@ -2689,7 +2689,8 @@ fasttrap_attach(void)
 
 #ifndef illumos
        for (i = 0; i < fasttrap_procs.fth_nent; i++) {
 
 #ifndef illumos
        for (i = 0; i < fasttrap_procs.fth_nent; i++) {

-               lck_mtx_init(&fasttrap_procs.fth_table[i].ftb_mtx, fasttrap_lck_grp, fasttrap_lck_attr);
+               lck_mtx_init(&fasttrap_procs.fth_table[i].ftb_mtx, &fasttrap_lck_grp,
+                   &fasttrap_lck_attr);

        }
 #endif
 
        }
 #endif
 


@@ -2786,19 +2787,6 @@ fasttrap_init( void )
                }
 
 
                }
 
 

-               /*
-                * Create the fasttrap lock group. Must be done before fasttrap_attach()!
-                */
-               fasttrap_lck_attr = lck_attr_alloc_init();
-               fasttrap_lck_grp_attr= lck_grp_attr_alloc_init();
-               fasttrap_lck_grp = lck_grp_alloc_init("fasttrap",  fasttrap_lck_grp_attr);
-
-               /*
-                * Initialize global locks
-                */
-               lck_mtx_init(&fasttrap_cleanup_mtx, fasttrap_lck_grp, fasttrap_lck_attr);
-               lck_mtx_init(&fasttrap_count_mtx, fasttrap_lck_grp, fasttrap_lck_attr);
-

                fasttrap_attach();
 
                /*
                fasttrap_attach();
 
                /*


@@ -2813,7 +2801,6 @@ fasttrap_init( void )
                fasttrap_retired_size = DEFAULT_RETIRED_SIZE;
                fasttrap_retired_spec = kmem_zalloc(fasttrap_retired_size * sizeof(*fasttrap_retired_spec),
                                        KM_SLEEP);
                fasttrap_retired_size = DEFAULT_RETIRED_SIZE;
                fasttrap_retired_spec = kmem_zalloc(fasttrap_retired_size * sizeof(*fasttrap_retired_spec),
                                        KM_SLEEP);

-               lck_mtx_init(&fasttrap_retired_mtx, fasttrap_lck_grp, fasttrap_lck_attr);

 
                fasttrap_inited = 1;
        }
 
                fasttrap_inited = 1;
        }