xnu-7195.81.3.tar.gz

[apple/xnu.git] / osfmk / kern / ecc_logging.c

diff --git a/osfmk/kern/ecc_logging.c b/osfmk/kern/ecc_logging.c
index d62ab817c13d411b121548c720b40d082b354548..35d258372340dee0099445e49cc744cf92875c45 100644 (file)
--- a/osfmk/kern/ecc_logging.c
+++ b/osfmk/kern/ecc_logging.c
@@ -1,30 +1,30 @@
 /*
-* Copyright (c) 2013 Apple Inc. All rights reserved.
-*
-* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
-* 
-* This file contains Original Code and/or Modifications of Original Code
-* as defined in and that are subject to the Apple Public Source License
-* Version 2.0 (the 'License'). You may not use this file except in
-* compliance with the License. The rights granted to you under the License
-* may not be used to create, or enable the creation or redistribution of,
-* unlawful or unlicensed copies of an Apple operating system, or to
-* circumvent, violate, or enable the circumvention or violation of, any
-* terms of an Apple operating system software license agreement.
-* 
-* Please obtain a copy of the License at
-* http://www.opensource.apple.com/apsl/ and read it before using this file.
-* 
-* The Original Code and all software distributed under the License are
-* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
-* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
-* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
-* Please see the License for the specific language governing rights and
-* limitations under the License.
-* 
-* @APPLE_OSREFERENCE_LICENSE_HEADER_END@
-*/
+ * Copyright (c) 2013 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
 #include <mach/mach_types.h>
 #include <mach/host_info.h>
 #include <kern/locks.h>
@@ -39,22 +39,14 @@
  *
  * Circular buffer of events.  When we fill up, drop data.
  */
-#define ECC_EVENT_BUFFER_COUNT 5
-struct ecc_event               ecc_data[ECC_EVENT_BUFFER_COUNT];
-static uint32_t                        ecc_data_next_read; 
-static uint32_t                        ecc_data_next_write; 
-static boolean_t               ecc_data_empty = TRUE; // next read == next write : empty or full?
-static lck_grp_t               *ecc_data_lock_group;
-static lck_spin_t              ecc_data_lock;
-static uint32_t                        ecc_correction_count;
-
-void
-ecc_log_init()
-{
-       ecc_data_lock_group = lck_grp_alloc_init("ecc-data", NULL);
-       lck_spin_init(&ecc_data_lock, ecc_data_lock_group, NULL);
-       OSMemoryBarrier();
-}
+#define ECC_EVENT_BUFFER_COUNT  5
+struct ecc_event                ecc_data[ECC_EVENT_BUFFER_COUNT];
+static uint32_t                 ecc_data_next_read;
+static uint32_t                 ecc_data_next_write;
+static boolean_t                ecc_data_empty = TRUE; // next read == next write : empty or full?
+static LCK_GRP_DECLARE(ecc_data_lock_group, "ecc-data");
+static LCK_SPIN_DECLARE(ecc_data_lock, &ecc_data_lock_group);
+static uint32_t                 ecc_correction_count;
 
 uint32_t
 ecc_log_get_correction_count()
@@ -76,7 +68,7 @@ ecc_log_record_event(const struct ecc_event *ev)
 
        ecc_correction_count++;
 
-       if (ecc_data_next_read == ecc_data_next_write && !ecc_data_empty)  {
+       if (ecc_data_next_read == ecc_data_next_write && !ecc_data_empty) {
                lck_spin_unlock(&ecc_data_lock);
                splx(x);
                return KERN_FAILURE;
@@ -102,7 +94,7 @@ ecc_log_get_next_event(struct ecc_event *ev)
        x = splhigh();
        lck_spin_lock(&ecc_data_lock);
 
-       if (ecc_data_empty)  {
+       if (ecc_data_empty) {
                assert(ecc_data_next_write == ecc_data_next_read);
 
                lck_spin_unlock(&ecc_data_lock);