[Commit-gnuradio] r9479 - in gnuradio/branches/developers/michaelld/memalign: . gnuradio-core/src/lib/filter gnuradio-core/src/lib/runtime

[michaelld]

Author: michaelld
Date: 2008-09-01 16:55:27 -0600 (Mon, 01 Sep 2008)
New Revision: 9479

Added:
   
gnuradio/branches/developers/michaelld/memalign/gnuradio-core/src/lib/runtime/gr_posix_memalign.h
Modified:
   gnuradio/branches/developers/michaelld/memalign/configure.ac
   
gnuradio/branches/developers/michaelld/memalign/gnuradio-core/src/lib/filter/gr_fir_fff_altivec.cc
   
gnuradio/branches/developers/michaelld/memalign/gnuradio-core/src/lib/runtime/Makefile.am
Log:
AC check for posix_memalign and valloc.

Created gr_posix_memalign, which uses posix_memalign if available and
otherwise emulates posix_memalign -- to some degree -- by checking the
alignment argument for correctness but then using valloc if available
and if the alignment argument is <= gr_pagesize ().



Modified: gnuradio/branches/developers/michaelld/memalign/configure.ac
===================================================================
--- gnuradio/branches/developers/michaelld/memalign/configure.ac        
2008-09-01 19:26:54 UTC (rev 9478)
+++ gnuradio/branches/developers/michaelld/memalign/configure.ac        
2008-09-01 22:55:27 UTC (rev 9479)
@@ -146,7 +146,7 @@
 AC_CHECK_FUNCS([mmap select socket strcspn strerror strspn getpagesize 
sysconf])
 AC_CHECK_FUNCS([snprintf gettimeofday nanosleep sched_setscheduler])
 AC_CHECK_FUNCS([modf sqrt sigaction sigprocmask pthread_sigmask])
-AC_CHECK_FUNCS([sched_setaffinity])
+AC_CHECK_FUNCS([sched_setaffinity posix_memalign valloc])
 
 AC_CHECK_LIB(m, sincos, [AC_DEFINE([HAVE_SINCOS],[1],[Define to 1 if your 
system has `sincos'.])])
 AC_CHECK_LIB(m, sincosf,[AC_DEFINE([HAVE_SINCOSF],[1],[Define to 1 if your 
system has `sincosf'.])])

Modified: 
gnuradio/branches/developers/michaelld/memalign/gnuradio-core/src/lib/filter/gr_fir_fff_altivec.cc
===================================================================
--- 
gnuradio/branches/developers/michaelld/memalign/gnuradio-core/src/lib/filter/gr_fir_fff_altivec.cc
  2008-09-01 19:26:54 UTC (rev 9478)
+++ 
gnuradio/branches/developers/michaelld/memalign/gnuradio-core/src/lib/filter/gr_fir_fff_altivec.cc
  2008-09-01 22:55:27 UTC (rev 9479)
@@ -23,11 +23,11 @@
 #include <config.h>
 #endif
 #include <gr_fir_fff_altivec.h>
-#include <stdlib.h>
 #include <stdexcept>
 #include <assert.h>
 #include <gr_math.h>
 #include <gr_altivec.h>
+#include <gr_posix_memalign.h>
 #include <dotprod_fff_altivec.h>
 
 gr_fir_fff_altivec::gr_fir_fff_altivec()
@@ -61,12 +61,20 @@
     free(d_aligned_taps);
     d_aligned_taps = 0;
   }
+#if 1
   void *p;
-  int r = posix_memalign(&p,  sizeof(vec_float4), d_naligned_taps * 
sizeof(d_aligned_taps[0]));
+  int r = gr_posix_memalign(&p,  sizeof(vec_float4), d_naligned_taps * 
sizeof(d_aligned_taps[0]));
   if (r != 0){
     throw std::bad_alloc();
   }
   d_aligned_taps = (float *) p;
+#else
+  d_aligned_taps = (float *) valloc (d_naligned_taps * 
sizeof(d_aligned_taps[0]));
+  if (d_aligned_taps == 0){
+    throw std::bad_alloc();
+  }
+#endif
+
   memcpy(d_aligned_taps, &d_taps[0], ntaps() * sizeof(d_aligned_taps[0]));
   for (size_t i = ntaps(); i < d_naligned_taps; i++)
     d_aligned_taps[i] = 0.0;

Modified: 
gnuradio/branches/developers/michaelld/memalign/gnuradio-core/src/lib/runtime/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/memalign/gnuradio-core/src/lib/runtime/Makefile.am
   2008-09-01 19:26:54 UTC (rev 9478)
+++ 
gnuradio/branches/developers/michaelld/memalign/gnuradio-core/src/lib/runtime/Makefile.am
   2008-09-01 22:55:27 UTC (rev 9479)
@@ -99,6 +99,7 @@
        gr_msg_handler.h                        \
        gr_msg_queue.h                          \
        gr_pagesize.h                           \
+       gr_posix_memalign.h                     \
        gr_preferences.h                        \
        gr_realtime.h                           \
        gr_runtime_types.h                      \

Added: 
gnuradio/branches/developers/michaelld/memalign/gnuradio-core/src/lib/runtime/gr_posix_memalign.h
===================================================================
--- 
gnuradio/branches/developers/michaelld/memalign/gnuradio-core/src/lib/runtime/gr_posix_memalign.h
                           (rev 0)
+++ 
gnuradio/branches/developers/michaelld/memalign/gnuradio-core/src/lib/runtime/gr_posix_memalign.h
   2008-09-01 22:55:27 UTC (rev 9479)
@@ -0,0 +1,83 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_POSIX_MEMALIGN_H
+#define INCLUDED_GR_POSIX_MEMALIGN_H
+
+#include <stdlib.h>
+#include <errno.h>
+#include <gr_pagesize.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static inline int
+gr_posix_memalign
+(void **memptr, size_t alignment, size_t size)
+{
+#if defined (HAVE_POSIX_MEMALIGN)
+
+  return (posix_memalign (memptr, alignment, size));
+
+#else
+  /* emulate posix_memalign functionality, to some degree */
+
+  /* make sure the return handle is valid; return "bad address" if not valid */
+  if (memptr == 0)
+    return (EFAULT);
+
+  /* make sure the alignment is a power of 2 multiple of sizeof (void*) */
+
+  /* make sure the alignment is divisiable by sizeof (void*) */
+  if (alignment % sizeof (void*) != 0)
+    return (EINVAL);
+  size_t a2 = alignment / sizeof (void*);
+  /* make sure remainder is a power of 2 */
+  if (a2 & (a2 - 1) != 0)
+    return (EINVAL);
+  /* good alignment */
+
+#if defined (HAVE_VALLOC)
+  /* cheap and easy way to make sure alignment is met, so long as it
+   * is <= pagesize () */
+  if (alignment > (size_t) gr_pagesize ())
+    return (EINVAL);
+  *memptr = valloc (size);
+#else
+  /* no posix_memalign or valloc; no idea what to do. */
+#error gr_posix_memalign: Cannot find a way to alloc aligned memory.
+
+#endif /* HAVE_VALLOC */
+
+  if (*memptr == 0)
+    return (ENOMEM);
+  else
+    return (0);
+#endif /* HAVE_POSIX_MEMALIGN */
+};
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif /* INCLUDED_GR_POSIX_MEMALIGN_H */