From owner-p4-projects@FreeBSD.ORG Sat Aug 15 22:32:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8BA2106568F; Sat, 15 Aug 2009 22:32:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7D525106568C for ; Sat, 15 Aug 2009 22:32:29 +0000 (UTC) (envelope-from marinosi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 533A28FC15 for ; Sat, 15 Aug 2009 22:32:29 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7FMWTxu039654 for ; Sat, 15 Aug 2009 22:32:29 GMT (envelope-from marinosi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7FMWS5w039652 for perforce@freebsd.org; Sat, 15 Aug 2009 22:32:28 GMT (envelope-from marinosi@FreeBSD.org) Date: Sat, 15 Aug 2009 22:32:28 GMT Message-Id: <200908152232.n7FMWS5w039652@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marinosi@FreeBSD.org using -f From: Ilias Marinos To: Perforce Change Reviews Cc: Subject: PERFORCE change 167385 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Aug 2009 22:32:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=167385 Change 167385 by marinosi@marinosi_redrum on 2009/08/15 22:31:30 Debugging code removed. Affected files ... .. //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit.c#26 edit .. //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit_worker.c#12 edit Differences ... ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit.c#26 (text) ==== @@ -884,14 +884,13 @@ */ /* Verify the record. */ if (bsm_rec_verify(rec) == 0) { - uprintf("Error in record!\n"); error = EINVAL; return (error); } /* * Allocate the appropriate memory for the record and fetch it. - * The record will be free'd by audit_record_dtor(). + * The allocated memory will be free'd by audit_record_dtor(). */ bsm = (void *) malloc(len, M_TEMP, M_WAITOK | M_ZERO); memmove(bsm, rec, len); @@ -964,7 +963,6 @@ as->audit_pre_q_len--; cv_signal(&(as->audit_worker_cv)); mtx_unlock(&(as->audit_mtx)); - uprintf("audit_slice_commit_rec(): Reached the end!\n"); return (0); } ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit_worker.c#12 (text) ==== @@ -113,7 +113,6 @@ if (as->audit_vp == NULL) return; - printf("audit_record_write(): as->audit_vp not NULL!\n"); mnt_stat = &as->audit_vp->v_mount->mnt_stat; vfslocked = VFS_LOCK_GIANT(as->audit_vp->v_mount); @@ -225,7 +224,6 @@ } } - printf("Ready to call vn_rdwr!\n"); error = vn_rdwr(UIO_WRITE, as->audit_vp, data, len, (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, as->audit_cred, NULL, NULL, curthread); if (error == ENOSPC) @@ -410,7 +408,6 @@ while (TAILQ_EMPTY(&(as->audit_q))) cv_wait(&(as->audit_worker_cv), &(as->audit_mtx)); - printf("audit_worker(): Record in the queue!\n"); /* * If there are records in the global audit record queue, * transfer them to a thread-local queue and process them @@ -432,9 +429,7 @@ mtx_unlock(&(as->audit_mtx)); while ((ar = TAILQ_FIRST(&ar_worklist))) { TAILQ_REMOVE(&ar_worklist, ar, k_q); - printf("audit_worker(): Calling audit_worker_process_record()!\n"); audit_worker_process_record(ar, as); - printf("audit_worker(): Returned from audit_worker_process_record()!\n"); audit_free(ar); } mtx_lock(&(as->audit_mtx));