From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jun 25 18:30:09 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E840B10656DF for ; Wed, 25 Jun 2008 18:30:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 93DF38FC19 for ; Wed, 25 Jun 2008 18:30:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m5PIU9Wv011770 for ; Wed, 25 Jun 2008 18:30:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m5PIU9O2011767; Wed, 25 Jun 2008 18:30:09 GMT (envelope-from gnats) Resent-Date: Wed, 25 Jun 2008 18:30:09 GMT Resent-Message-Id: <200806251830.m5PIU9O2011767@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Pietro Cerutti" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 14965106567A for ; Wed, 25 Jun 2008 18:21:39 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from cpanel03.rubas-s03.net (cpanel03.rubas-s03.net [195.182.222.73]) by mx1.freebsd.org (Postfix) with ESMTP id A230C8FC19 for ; Wed, 25 Jun 2008 18:21:38 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from [213.142.183.219] (helo=gahrtop.localhost) by cpanel03.rubas-s03.net with esmtpa (Exim 4.68) (envelope-from ) id 1KBZcX-0000EI-HO for FreeBSD-gnats-submit@freebsd.org; Wed, 25 Jun 2008 20:21:29 +0200 Received: from gahrtop.localhost (localhost [127.0.0.1]) by gahrtop.localhost (Postfix) with ESMTP id B4A3150840 for ; Wed, 25 Jun 2008 18:21:33 +0000 (UTC) Message-Id: <1214418093.2743@gahrtop.localhost> Date: Wed, 25 Jun 2008 18:21:33 -0000 From: "Pietro Cerutti" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.9 Cc: Subject: ports/124985: [patch] devel/dmucs unbreak on 64bits archs X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jun 2008 18:30:10 -0000 >Number: 124985 >Category: ports >Synopsis: [patch] devel/dmucs unbreak on 64bits archs >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Jun 25 18:30:09 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Pietro Cerutti >Release: FreeBSD 8.0-CURRENT i386 >Organization: The FreeBSD Project >Environment: System: FreeBSD 8.0-CURRENT #2: Tue Jun 24 08:15:41 CEST 2008 root@gahrtop.localhost:/usr/obj/usr/src/sys/MSI1034 >Description: >How-To-Repeat: >Fix: --- dmucs.diff begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/devel/dmucs/Makefile,v retrieving revision 1.2 diff -u -u -r1.2 Makefile --- Makefile 20 Apr 2008 22:26:59 -0000 1.2 +++ Makefile 25 Jun 2008 18:05:54 -0000 @@ -19,10 +19,4 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} PLIST_FILES= bin/dmucs bin/gethost bin/loadavg bin/monitor bin/remhost -.include - -.if ${OSVERSION} >= 700042 && ${ARCH} == "amd64" -BROKEN= does not compile -.endif - -.include +.include Index: files/patch-dmucs_db.cc =================================================================== RCS file: files/patch-dmucs_db.cc diff -N files/patch-dmucs_db.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-dmucs_db.cc 25 Jun 2008 18:05:13 -0000 @@ -0,0 +1,20 @@ +--- dmucs_db.cc.orig 2008-06-25 17:58:38.000000000 +0000 ++++ dmucs_db.cc 2008-06-25 17:59:29.000000000 +0000 +@@ -61,7 +61,7 @@ + + + void +-DmucsDb::assignCpuToClient(const unsigned int clientIp, ++DmucsDb::assignCpuToClient(const size_t clientIp, + const DmucsDprop dprop, + const unsigned int sock) + { +@@ -145,7 +145,7 @@ + + + void +-DmucsDpropDb::assignCpuToClient(const unsigned int hostIp, ++DmucsDpropDb::assignCpuToClient(const size_t hostIp, + const unsigned int sock) + { + struct in_addr t2; Index: files/patch-dmucs_db.h =================================================================== RCS file: files/patch-dmucs_db.h diff -N files/patch-dmucs_db.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-dmucs_db.h 25 Jun 2008 18:05:18 -0000 @@ -0,0 +1,20 @@ +--- dmucs_db.h.orig 2008-06-25 17:55:51.000000000 +0000 ++++ dmucs_db.h 2008-06-25 17:56:11.000000000 +0000 +@@ -97,7 +97,7 @@ + DmucsHost * getHost(const struct in_addr &ipAddr); + bool haveHost(const struct in_addr &ipAddr); + unsigned int getBestAvailCpu(); +- void assignCpuToClient(const unsigned int clientIp, ++ void assignCpuToClient(const size_t clientIp, + const unsigned int cpuIp); + void moveCpus(DmucsHost *host, int oldTier, int newTier); + int delCpusFromTier(int tier, unsigned int ipAddr); +@@ -195,7 +195,7 @@ + } + return itr->second.getBestAvailCpu(); + } +- void assignCpuToClient(const unsigned int clientIp, ++ void assignCpuToClient(const size_t clientIp, + const DmucsDprop dprop, + const unsigned int sock); + void moveCpus(DmucsHost *host, int oldTier, int newTier) { Index: files/patch-dmucs_msg.cc =================================================================== RCS file: files/patch-dmucs_msg.cc diff -N files/patch-dmucs_msg.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-dmucs_msg.cc 25 Jun 2008 18:05:24 -0000 @@ -0,0 +1,11 @@ +--- dmucs_msg.cc.orig 2008-06-25 18:00:55.000000000 +0000 ++++ dmucs_msg.cc 2008-06-25 18:02:13.000000000 +0000 +@@ -130,7 +130,7 @@ + + fprintf(stderr, "Giving out %s\n", resolved_name.c_str()); + +- db->assignCpuToClient(cpuIpAddr, dprop_, (unsigned int) sock); ++ db->assignCpuToClient(cpuIpAddr, dprop_, (size_t) sock); + #if 0 + fprintf(stderr, "The databases are now:\n"); + db->dump(); Index: files/patch-main.cc =================================================================== RCS file: files/patch-main.cc diff -N files/patch-main.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-main.cc 25 Jun 2008 18:05:30 -0000 @@ -0,0 +1,11 @@ +--- main.cc.orig 2008-06-25 18:02:16.000000000 +0000 ++++ main.cc 2008-06-25 18:02:38.000000000 +0000 +@@ -286,7 +286,7 @@ + + if (Sgets(buf, BUFSIZE, sock_req) == NULL) { + DMUCS_DEBUG((stderr, "Socket closed: %s\n", peer2buf(sock_req, buf))); +- db->releaseCpu((unsigned int)sock_req); ++ db->releaseCpu((size_t )sock_req); + removeFd(sock_req); + return; + } --- dmucs.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: