Merge pull request #11 from sy-c/master

options

Author: sy-c

arch/linux_x86_uio/dma_buffer_inc.c

@@ -864,10 +864,15 @@ DMABuffer_free
 
             if(munlock(buffer->map, buffer->length) != 0)
             {
-	    // report, but continue with release procedure even if unlock fails
-	    //ERROR_EXIT( errno, exit, "Buffer unlocking failed!\n" ); 
-	    ERROR( errno, "Buffer unlocking failed!\n" );
-	    }
+                #ifdef PDA_SKIP_UNLOCK_FAILURE
+		    #pragma message "*** Compiling with PDA_SKIP_UNLOCK_FAILURE"
+                    // report, but continue with release procedure even if unlock fails
+                    ERROR( errno, "Buffer unlocking failed! (but releasing)\n" );
+		    if(0) { goto exit; } // fake use of exit label to avoid compiler warning
+                #else
+                    ERROR_EXIT( errno, exit, "Buffer unlocking failed!\n" );
+                #endif
+            }
 
             buffer->map = MAP_FAILED;
             persistant  = PDA_DELETE;

configure

@@ -62,6 +62,7 @@ MODPROBE_MODE="#define MODPROBE_MODE"
 PREFIX="/usr"
 DEBUG=""
 NUMA="true"
+EXTRA_DEFINES=""
 
 
 help()
@@ -73,6 +74,7 @@ help()
     echo "    --debug=<true|false>"
     echo "    --numa=<true|false>"
     echo "    --modprobe=<true|false>"
+    echo "    --extra=<additional defines, comma separated>"
 }
 
 
@@ -120,6 +122,11 @@ do
             continue
 	;;
 
+        "--extra" )
+	    EXTRA_DEFINES=$VALUE
+            continue
+        ;;
+
         *          )
             echo "Unknown parameter $PARAMETER!"
             exit -1
@@ -233,6 +240,12 @@ gen_config()
     echo "$KMOD_AVAIL"                         >> $BUILD_PATH/src/config.h
     echo "$NUMA_AVAIL"                         >> $BUILD_PATH/src/config.h
     echo "$MODPROBE_MODE"                      >> $BUILD_PATH/src/config.h
+
+    for DEF in ${EXTRA_DEFINES//,/ }
+    do
+      echo "#define $DEF"                      >> $BUILD_PATH/src/config.h
+    done
+
     echo "#endif  /* CONFIG_H */"              >> $BUILD_PATH/src/config.h
 }