PERFORCE change 167385 for review

[Ilias Marinos]

http://perforce.freebsd.org/chv.cgi?CH=167385

Change 167385 by marinosi at 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));