Changeset 8730

Timestamp:

07/26/12 21:41:28 (10 months ago)

Author:

cristy

Message:

 

Location:

WizardsToolkit/trunk

Files:

• Makefile.in (modified) (1 diff)
• config/config.h.in (modified) (1 diff)
• config/configure.xml (modified) (1 diff)
• configure (modified) (3 diffs)
• configure.ac (modified) (4 diffs)
• m4/ax_lang_compiler_ms.m4 (deleted)
• windows/wizard/wizard-config.h (modified) (1 diff)
• wizard/memory.c (modified) (3 diffs)
• wizard/version.h (modified) (1 diff)

WizardsToolkit/trunk/Makefile.in

@@ -177 +177 @@
         $(top_srcdir)/m4/ax_gcc_archflag.m4 \
         $(top_srcdir)/m4/ax_gcc_x86_cpuid.m4 \
-        $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \
         $(top_srcdir)/m4/ax_prefix_config_h.m4 \
         $(top_srcdir)/m4/ax_pthread.m4 \

WizardsToolkit/trunk/config/config.h.in

@@ -438 +438 @@
 /* Define to 1 if you have the <xlocale.h> header file. */
 #undef HAVE_XLOCALE_H
+
+/* Define to 1 if you have the `_aligned_malloc' function. */
+#undef HAVE__ALIGNED_MALLOC
 
 /* Define to 1 if the system has the type `_Bool'. */

WizardsToolkit/trunk/config/configure.xml

@@ -6 +6 @@
   <configure name="LIB_VERSION" value="0x108" />
   <configure name="LIB_VERSION_NUMBER" value="1,0,8,10" />
-  <configure name="RELEASE_DATE" value="2012-07-18" />
+  <configure name="RELEASE_DATE" value="2012-07-26" />
   <configure name="CONFIGURE" value="./configure " />
   <configure name="PREFIX" value="/usr/local" />

WizardsToolkit/trunk/configure

@@ -6780 +6780 @@
 esac
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler vendor" >&5
+$as_echo_n "checking for C compiler vendor... " >&6; }
+if ${ax_cv_c_compiler_vendor+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # note: don't check for gcc first since some other compilers define __GNUC__
+  vendors="intel:     __ICC,__ECC,__INTEL_COMPILER
+           ibm:       __xlc__,__xlC__,__IBMC__,__IBMCPP__
+           pathscale: __PATHCC__,__PATHSCALE__
+           clang:     __clang__
+           gnu:       __GNUC__
+           sun:       __SUNPRO_C,__SUNPRO_CC
+           hp:        __HP_cc,__HP_aCC
+           dec:       __DECC,__DECCXX,__DECC_VER,__DECCXX_VER
+           borland:   __BORLANDC__,__TURBOC__
+           comeau:    __COMO__
+           cray:      _CRAYC
+           kai:       __KCC
+           lcc:       __LCC__
+           sgi:       __sgi,sgi
+           microsoft: _MSC_VER
+           metrowerks: __MWERKS__
+           watcom:    __WATCOMC__
+           portland:  __PGI
+           unknown:   UNKNOWN"
+  for ventest in $vendors; do
+    case $ventest in
+      *:) vendor=$ventest; continue ;;
+      *)  vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")" ;;
+    esac
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+      #if !($vencpp)
+        thisisanerror;
+      #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+  ax_cv_c_compiler_vendor=`echo $vendor | cut -d: -f1`
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_c_compiler_vendor" >&5
+$as_echo "$ax_cv_c_compiler_vendor" >&6; }
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
@@ -7509 +7565 @@
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Microsoft C compiler" >&5
-$as_echo_n "checking whether we are using the Microsoft C compiler... " >&6; }
-if ${ax_cv_c_compiler_ms+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef _MSC_VER
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_compiler_ms=yes
-else
-  ax_compiler_ms=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ax_cv_c_compiler_ms=$ax_compiler_ms
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_c_compiler_ms" >&5
-$as_echo "$ax_cv_c_compiler_ms" >&6; }
 
 GDI32_LIBS=''
@@ -22807 +22833 @@
 fi
 
-for ac_func in atexit clock fchmod fprintf_l ftime getcwd getexecname getdtablesize getpid getpagesize getrusage gettimeofday gmtime_r isascii isnan localtime_r lstat madvise memmove memset mkdir munmap mkstemp newloacle _NSGetExecutablePath pclose poll popen posix_fallocate posix_memalign pow pread pwrite raise readdir_r readlink realpath sbrk select strtod_l setvbuf sysconf sigemptyset sigaction spawnvp strlcat strlcpy strcasecmp strncasecmp setlocale strchr strcspn strdup strrchr strspn strstr strtol strtoul times uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l _wfopen
+for ac_func in _aligned_malloc atexit clock fchmod fprintf_l ftime getcwd getexecname getdtablesize getpid getpagesize getrusage gettimeofday gmtime_r isascii isnan localtime_r lstat madvise memmove memset mkdir munmap mkstemp newloacle _NSGetExecutablePath pclose poll popen posix_fallocate posix_memalign pow pread pwrite raise readdir_r readlink realpath sbrk select strtod_l setvbuf sysconf sigemptyset sigaction spawnvp strlcat strlcpy strcasecmp strncasecmp setlocale strchr strcspn strdup strrchr strspn strstr strtol strtoul times uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l _wfopen
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

WizardsToolkit/trunk/configure.ac

@@ -13 +13 @@
 #  limitations under the License.
 #
-#  Configure script for building the Wizard Toolkit.
+#  Copying and distribution of this file, with or without modification,
+#  are permitted in any medium without royalty provided the copyright
+#  notice and this notice are preserved.
 
 AC_PREREQ(2.67)
@@ -225 +227 @@
 AM_PROG_CC_C_O
 AX_CFLAGS_WARN_ALL
+AX_COMPILER_VENDOR
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
@@ -239 +242 @@
 AC_EXEEXT
 AC_OBJEXT
-AX_LANG_COMPILER_MS
 
 GDI32_LIBS=''
@@ -890 +892 @@
 AC_FUNC_STAT
 AC_FUNC_STRERROR_R
-AC_CHECK_FUNCS([atexit clock fchmod fprintf_l ftime getcwd getexecname getdtablesize getpid getpagesize getrusage gettimeofday gmtime_r isascii isnan localtime_r lstat madvise memmove memset mkdir munmap mkstemp newloacle _NSGetExecutablePath pclose poll popen posix_fallocate posix_memalign pow pread pwrite raise readdir_r readlink realpath sbrk select strtod_l setvbuf sysconf sigemptyset sigaction spawnvp strlcat strlcpy strcasecmp strncasecmp setlocale strchr strcspn strdup strrchr strspn strstr strtol strtoul times uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l _wfopen])
+AC_CHECK_FUNCS([_aligned_malloc atexit clock fchmod fprintf_l ftime getcwd getexecname getdtablesize getpid getpagesize getrusage gettimeofday gmtime_r isascii isnan localtime_r lstat madvise memmove memset mkdir munmap mkstemp newloacle _NSGetExecutablePath pclose poll popen posix_fallocate posix_memalign pow pread pwrite raise readdir_r readlink realpath sbrk select strtod_l setvbuf sysconf sigemptyset sigaction spawnvp strlcat strlcpy strcasecmp strncasecmp setlocale strchr strcspn strdup strrchr strspn strstr strtol strtoul times uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l _wfopen])
 
 #

WizardsToolkit/trunk/windows/wizard/wizard-config.h

@@ -143 +143 @@
 #define WIZARDSTOOLKIT_HAVE__WFOPEN   1
 
+#define WIZARDSTOOLKIT_HAVE__ALIGNED_MALLOC 1
 #define WIZARDSTOOLKIT_HAVE_VSNPRINTF  1
 #define WIZARDSTOOLKIT_HAVE_GETTIMEOFDAY  1 

WizardsToolkit/trunk/wizard/memory.c

@@ -189 +189 @@
 {
   size_t
+    alignment,
+    extent,
     size;
+
+  void
+    *memory;
 
   size=count*quantum;
@@ -197 +202 @@
       return((void *) NULL);
     }
+  memory=NULL;
+  alignment=CACHE_LINE_SIZE;
+  extent=(size+alignment-1)+sizeof(void *);
+  if ((size == 0) || (alignment < sizeof(void *)) || (extent <= size))
+    return((void *) NULL);
 #if defined(WIZARDSTOOLKIT_HAVE_POSIX_MEMALIGN)
+  if (posix_memalign(&memory,alignment,size) != 0)
+    memory=NULL;
+#elif defined(WIZARDSTOOLKIT_HAVE__ALIGNED_MALLOC)
+  memory=_aligned_malloc(size,alignment);
+#else
   {
     void
-      *memory;
-
-    if (posix_memalign(&memory,CACHE_LINE_SIZE,CacheAlign(size)) == 0)
-      return(memory);
+      *p;
+
+    p=malloc(extent);
+    if (p != NULL)
+      {
+        memory=(void *) (((size_t) p+sizeof(void *)+alignment-1) &
+          ~(alignment-1));
+        *((void **) memory-1)=p;
+      }
   }
 #endif
-  return(malloc(CacheAlign(size)));
+  return(memory);
 }
 
@@ -711 +731 @@
   if (memory == (void *) NULL)
     return((void *) NULL);
+#if defined(WIZARDSTOOLKIT_HAVE_POSIX_MEMALIGN)
   free(memory);
-  return((void *) NULL);
+#elif defined(WIZARDSTOOLKIT_HAVE__ALIGNED_MALLOC)
+  _aligned_free(memory);
+#else
+  free(*((void **) memory-1));
+#endif
+  return(NULL);
 }
 

WizardsToolkit/trunk/wizard/version.h

@@ -35 +35 @@
 #define WizardLibInterface  1
 #define WizardLibMinInterface  1
-#define WizardReleaseDate  "2012-07-18"
+#define WizardReleaseDate  "2012-07-26"
 #define WizardChangeDate   "20110224"
 #define WizardAuthoritativeURL  "http://www.wizards-toolkit.org"