From owner-p4-projects@FreeBSD.ORG  Sat Jul 21 19:19:14 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C58D216A46E; Sat, 21 Jul 2007 19:19:14 +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 8AE1B16A41F
	for <perforce@FreeBSD.org>; Sat, 21 Jul 2007 19:19:14 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7AA2D13C468
	for <perforce@FreeBSD.org>; Sat, 21 Jul 2007 19:19:14 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6LJJEUT010766
	for <perforce@FreeBSD.org>; Sat, 21 Jul 2007 19:19:14 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6LJJE5t010763
	for perforce@freebsd.org; Sat, 21 Jul 2007 19:19:14 GMT
	(envelope-from fli@FreeBSD.org)
Date: Sat, 21 Jul 2007 19:19:14 GMT
Message-Id: <200707211919.l6LJJE5t010763@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 123857 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: Sat, 21 Jul 2007 19:19:15 -0000

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

Change 123857 by fli@fli_nexus on 2007/07/21 19:19:03

	Add several new object types used by the query system and by
	the unix pipe server.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/objalloc.c#2 edit
.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/objalloc.h#2 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/objalloc.c#2 (text+ko) ====

@@ -31,10 +31,12 @@
 
 #include "debug.h"
 #include "dbrec.h"
+#include "clisrv.h"
 #include "log.h"
 #include "mdns.h"
 #include "objalloc.h"
 #include "output.h"
+#include "queries.h"
 #include "threads.h"
 #include "stack_mdns.h"
 
@@ -71,7 +73,15 @@
 	/* Probe/Announce context */
 	{ .os_sz = sizeof(struct dbr_pac) },
 	/* Output queue entry */
-	{ .os_sz = sizeof(struct oq_entry) }
+	{ .os_sz = sizeof(struct oq_entry) },
+	/* UNIX pipe client */
+	{ .os_sz = sizeof(struct cs_client) },
+	/* Query consumer */
+	{ .os_sz = sizeof(struct query_cons) },
+	/* Query type */ 
+	{ .os_sz = sizeof(struct query_type) },
+	/* Outstanding UNIX pipe client query */
+	{ .os_sz = sizeof(struct csc_query) }
 };
 static int obj_table_size = sizeof(obj_table) / sizeof(struct objs);
 

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/objalloc.h#2 (text+ko) ====

@@ -31,8 +31,12 @@
 #define OBJ_PKG			1 /* struct mdns_packet {} */ 
 #define OBJ_PKGRES		2 /* struct mdns_pkg_res {} */
 #define OBJ_PAC			3 /* struct dbr_pac {} */
-#define OBJ_OQE			4 /* stuct oq_entry {} */
-#define _OBJ_MAX		OBJ_OQE
+#define OBJ_OQE			4 /* struct oq_entry {} */
+#define OBJ_CSC			5 /* struct cs_client {} */
+#define OBJ_QCONS		6 /* struct query_cons {} */
+#define OBJ_QTYPE		7 /* struct query_type {} */
+#define OBJ_CSCQ		8 /* struct csc_query {} */
+#define _OBJ_MAX		8
 
 void obj_init(void);
 void * obj_alloc(int);