Date: Wed, 6 Mar 2013 06:06:23 +0000 (UTC) From: Maho Nakata <maho@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313501 - head/math/spooles/files Message-ID: <201303060606.r2666Nwe093587@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: maho Date: Wed Mar 6 06:06:22 2013 New Revision: 313501 URL: http://svnweb.freebsd.org/changeset/ports/313501 Log: Unify files/patch-I2Ohash-large-input and files/patch-I2Ohash+src+util.c. Deleted: head/math/spooles/files/patch-I2Ohash+src+util.c Modified: head/math/spooles/files/patch-I2Ohash-large-input Modified: head/math/spooles/files/patch-I2Ohash-large-input ============================================================================== --- head/math/spooles/files/patch-I2Ohash-large-input Wed Mar 6 05:53:37 2013 (r313500) +++ head/math/spooles/files/patch-I2Ohash-large-input Wed Mar 6 06:06:22 2013 (r313501) @@ -1,92 +1,29 @@ $FreeBSD$ ---- I2Ohash/src/util.c.orig 2013-03-04 21:21:54.000000000 -0500 -+++ I2Ohash/src/util.c 2012-10-06 08:28:37.000000000 -0500 -@@ -39,8 +39,9 @@ +--- I2Ohash/src/util.c 1998-05-31 07:45:12.000000000 +0900 ++++ I2Ohash/src/util.c 2013-03-06 14:59:43.000000000 +0900 +@@ -39,7 +39,9 @@ */ loc1 = (key1 + 1) % hashtable->nlist ; loc2 = (key2 + 1) % hashtable->nlist ; --long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; --loc =(int) loc3; +-loc = (loc1*loc2) % hashtable->nlist ; +/*loc = (loc1*loc2) % hashtable->nlist ;*/ +long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; +loc=(int)loc3; #if MYDEBUG > 0 fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ; fflush(stdout) ; -@@ -51,7 +52,7 @@ - -------------------------------------------------------- - */ - #if MYDEBUG > 0 --fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ; -+fprintf(stdout, "\n hashtable->freeI2OP = %p", hashtable->freeI2OP) ; - fflush(stdout) ; - #endif - if ( (i2op = hashtable->freeI2OP) == NULL ) { -@@ -159,10 +160,11 @@ +@@ -158,7 +160,9 @@ #endif loc1 = (key1 + 1) % hashtable->nlist ; loc2 = (key2 + 1) % hashtable->nlist ; --long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; --loc =(int) loc3; -+/*loc = (loc1*loc2) % hashtable->nlist ;*/ -+long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; -+loc=(int)loc3; - #if MYDEBUG > 0 --fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ; -+fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ; - fflush(stdout) ; - #endif - /* -@@ -231,7 +233,9 @@ - } - loc1 = (key1 + 1) % hashtable->nlist ; - loc2 = (key2 + 1) % hashtable->nlist ; -loc = (loc1*loc2) % hashtable->nlist ; +/*loc = (loc1*loc2) % hashtable->nlist ;*/ +long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; +loc=(int)loc3; - /* - --------------------------------------------------- - find the location of the first (key1,key2,*) triple ---- I2Ohash/src/util.c.orig 2013-03-04 21:21:54.000000000 -0500 -+++ I2Ohash/src/util.c 2012-10-06 08:28:37.000000000 -0500 -@@ -39,8 +39,9 @@ - */ - loc1 = (key1 + 1) % hashtable->nlist ; - loc2 = (key2 + 1) % hashtable->nlist ; --long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; --loc =(int) loc3; -+/*loc = (loc1*loc2) % hashtable->nlist ;*/ -+long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; -+loc=(int)loc3; #if MYDEBUG > 0 fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ; fflush(stdout) ; -@@ -51,7 +52,7 @@ - -------------------------------------------------------- - */ - #if MYDEBUG > 0 --fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ; -+fprintf(stdout, "\n hashtable->freeI2OP = %p", hashtable->freeI2OP) ; - fflush(stdout) ; - #endif - if ( (i2op = hashtable->freeI2OP) == NULL ) { -@@ -159,10 +160,11 @@ - #endif - loc1 = (key1 + 1) % hashtable->nlist ; - loc2 = (key2 + 1) % hashtable->nlist ; --long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; --loc =(int) loc3; -+/*loc = (loc1*loc2) % hashtable->nlist ;*/ -+long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; -+loc=(int)loc3; - #if MYDEBUG > 0 --fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ; -+fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ; - fflush(stdout) ; - #endif - /* -@@ -231,7 +233,9 @@ +@@ -229,7 +233,9 @@ } loc1 = (key1 + 1) % hashtable->nlist ; loc2 = (key2 + 1) % hashtable->nlist ;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303060606.r2666Nwe093587>