From owner-p4-projects@FreeBSD.ORG  Wed Jul  4 11:10:38 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3ACD416A469; Wed,  4 Jul 2007 11:10:38 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0030F16A421
	for <perforce@FreeBSD.org>; Wed,  4 Jul 2007 11:10:37 +0000 (UTC)
	(envelope-from zhouzhouyi@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id E4D1013C457
	for <perforce@FreeBSD.org>; Wed,  4 Jul 2007 11:10:37 +0000 (UTC)
	(envelope-from zhouzhouyi@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l64BAbnt049151
	for <perforce@FreeBSD.org>; Wed, 4 Jul 2007 11:10:37 GMT
	(envelope-from zhouzhouyi@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l64BAbsK049148
	for perforce@freebsd.org; Wed, 4 Jul 2007 11:10:37 GMT
	(envelope-from zhouzhouyi@FreeBSD.org)
Date: Wed, 4 Jul 2007 11:10:37 GMT
Message-Id: <200707041110.l64BAbsK049148@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zhouzhouyi@FreeBSD.org using -f
From: Zhouyi ZHOU <zhouzhouyi@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 122849 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Jul 2007 11:10:38 -0000

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

Change 122849 by zhouzhouyi@zhouzhouyi_mactest on 2007/07/04 11:10:10

	Wait until all the record is stored to the disk

Affected files ...

.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_log.c#3 edit

Differences ...

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_log.c#3 (text+ko) ====

@@ -71,7 +71,9 @@
 static int mac_test_can_log = 0;
 static struct mtx mac_test_log_mtx;
 static struct mtx mac_test_submit_mtx;
+static struct mtx mac_test_wait_close;
 struct cv  mac_test_worker_cv;
+struct cv  mac_test_wait_for_empty;
 
 struct mac_test_log_entry {
 	void				*mte_record;
@@ -140,6 +142,12 @@
 	mac_test_log_isopen = 0;
 	mac_test_can_log = 0;
 	mtx_unlock(&mac_test_log_mtx);
+	mtx_lock(&mac_test_wait_close);
+	while(!TAILQ_EMPTY(&mac_test_log_list)){
+			cv_wait(&mac_test_wait_for_empty, &mac_test_wait_close);
+                        continue;
+	}
+	mtx_unlock(&mac_test_wait_close);
 	vn_close(logvnode, O_CREAT|O_TRUNC|FWRITE, curthread->td_ucred,
                              curthread);
 	return (0);
@@ -211,6 +219,8 @@
 		VFS_UNLOCK_GIANT(vfslocked);
 		free(mte->mte_record, M_MAC_TEST_LOG);
 		free(mte, M_MAC_TEST_LOG);
+		if (TAILQ_EMPTY(&mac_test_log_list))
+			cv_signal(&mac_test_wait_for_empty);
 		mtx_lock(&mac_test_submit_mtx);
 	}
 }
@@ -223,7 +233,9 @@
 	/* Create the special device file. */
 	mtx_init(&mac_test_log_mtx, "mac_test_log_mtx", NULL, MTX_DEF);
 	mtx_init(&mac_test_submit_mtx, "mac_test_submit_mtx", NULL, MTX_DEF);
+	mtx_init(&mac_test_wait_close, "mac_test_wait_close", NULL, MTX_DEF);
 	cv_init(&mac_test_worker_cv, "mac_test_worker_cv");
+	cv_init(&mac_test_wait_for_empty, "mac_test_wait_for_empty");
 	TAILQ_INIT(&mac_test_log_list);
 	mac_test_log_dev = make_dev(&mac_test_cdevsw, 0, UID_ROOT, GID_KMEM, 0600,
 	    MAC_TEST_LOG_FILENAME);