Merge branch 'dstipp-master'

.travis.yml

@@ -1,9 +1,23 @@
 language: c
 
+os:
+    - linux
+    - osx
+
 before_install:
-  - sudo add-apt-repository ppa:gqrx/releases -y
-  - sudo apt-get update -qq
-  - sudo apt-get install -y build-essential debhelper librtlsdr-dev libusb-1.0-0-dev pkg-config
+    - if [ `uname` = "Linux" ]; then
+          sudo add-apt-repository ppa:gqrx/releases -y;
+          sudo apt-get update -qq;
+          sudo apt-get install -y build-essential debhelper librtlsdr-dev libusb-1.0-0-dev pkg-config;
+      elif [ `uname` = "Darwin" ]; then
+          brew update;
+          brew install -v librtlsdr;
+      fi
 
 script:
-  - dpkg-buildpackage -b -us -uc
+    - if [ `uname` = "Linux" ]; then
+          dpkg-buildpackage -b -us -uc;
+      elif [ `uname` = "Darwin" ]; then
+          make;
+         make test;
+      fi

Makefile

@@ -16,10 +16,21 @@ endif
 
 CPPFLAGS+=-DMODES_DUMP1090_VERSION=\"$(DUMP1090_VERSION)\"
 CFLAGS+=-O2 -g -Wall -Werror -W
-LIBS=-lpthread -lm -lrt
+LIBS=-lpthread -lm
 LIBS_RTL=`pkg-config --libs librtlsdr`
 CC=gcc
 
+UNAME := $(shell uname)
+
+ifeq ($(UNAME), Linux)
+LIBS+=-lrt
+endif
+ifeq ($(UNAME), Darwin)
+# TODO: Putting GCC in C11 mode breaks things.
+CFLAGS+=-std=c11
+COMPAT+=compat/clock_gettime/clock_gettime.o compat/clock_nanosleep/clock_nanosleep.o
+endif
+
 all: dump1090 view1090
 
 %.o: %.c *.h
@@ -27,17 +38,17 @@ all: dump1090 view1090
 
 dump1090.o: CFLAGS += `pkg-config --cflags librtlsdr`
 
-dump1090: dump1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o crc.o demod_2000.o demod_2400.o stats.o cpr.o icao_filter.o track.o util.o convert.o
+dump1090: dump1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o crc.o demod_2000.o demod_2400.o stats.o cpr.o icao_filter.o track.o util.o convert.o $(COMPAT)
 	$(CC) -g -o $@ $^ $(LIBS) $(LIBS_RTL) $(LDFLAGS)
 
-view1090: view1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o crc.o stats.o cpr.o icao_filter.o track.o util.o
+view1090: view1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o crc.o stats.o cpr.o icao_filter.o track.o util.o $(COMPAT)
 	$(CC) -g -o $@ $^ $(LIBS) $(LDFLAGS)
 
-faup1090: faup1090.o anet.o mode_ac.o mode_s.o net_io.o crc.o stats.o cpr.o icao_filter.o track.o util.o
+faup1090: faup1090.o anet.o mode_ac.o mode_s.o net_io.o crc.o stats.o cpr.o icao_filter.o track.o util.o $(COMPAT)
 	$(CC) -g -o $@ $^ $(LIBS) $(LDFLAGS)
 
 clean:
-	rm -f *.o dump1090 view1090 faup1090 cprtests crctests
+	rm -f *.o compat/clock_gettime/*.o compat/clock_nanosleep/*.o dump1090 view1090 faup1090 cprtests crctests
 
 test: cprtests
 	./cprtests

compat/clock_gettime/LICENSE

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c), MM Weiss
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice,
+ *     this list of conditions and the following disclaimer in the documentation
+ *     and/or other materials provided with the distribution.
+ *
+ *     3. Neither the name of the MM Weiss nor the names of its contributors
+ *     may be used to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */

compat/clock_gettime/clock_gettime.c

@@ -0,0 +1,136 @@
+/*
+ * Copyright (c), MM Weiss
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice,
+ *     this list of conditions and the following disclaimer in the documentation
+ *     and/or other materials provided with the distribution.
+ *
+ *     3. Neither the name of the MM Weiss nor the names of its contributors
+ *     may be used to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ *  clock_gettime_stub.c
+ *  gcc -Wall -c clock_gettime_stub.c
+ *  posix realtime functions; MacOS user space glue
+ */
+
+/*  @comment
+ *  other possible implementation using intel builtin rdtsc
+ *  rdtsc-workaround: http://www.mcs.anl.gov/~kazutomo/rdtsc.html
+ *
+ *  we could get the ticks by doing this
+ *
+ *  __asm __volatile("mov %%ebx, %%esi\n\t"
+ *  		"cpuid\n\t"
+ *  		"xchg %%esi, %%ebx\n\t"
+ *  		"rdtsc"
+ *  		: "=a" (a),
+ *  		  "=d" (d)
+ * 	);
+ *  we could even replace our tricky sched_yield call by assembly code to get a better accurency,
+ *  anyway the following C stub will satisfy 99% of apps using posix clock_gettime call,
+ *  moreover, the setter version (clock_settime) could be easly written using mach primitives:
+ *  http://www.opensource.apple.com/source/xnu/xnu-${VERSION}/osfmk/man/ (clock_[set|get]_time)
+ *
+ *  hackers don't be crackers, don't you use a flush toilet?
+ *
+ *
+ *  @see draft: ./posix-realtime-stub/posix-realtime-stub.c
+ *
+ */
+
+
+#include "clock_gettime.h"
+#include <mach/clock.h>             // for clock_get_time
+#include <mach/clock_types.h>       // for mach_timespec_t, CALENDAR_CLOCK, etc
+#include <mach/kern_return.h>       // for KERN_SUCCESS, kern_return_t
+#include <mach/mach_host.h>         // for host_get_clock_service
+#include <mach/mach_init.h>         // for mach_host_self
+#include <mach/mach_types.h>        // for clock_serv_t
+#include <sched.h>                  // for sched_yield
+#include <errno.h>                  // for EINVAL, errno
+#include <unistd.h>                 // for getpid
+
+int clock_gettime(clockid_t clk_id, struct timespec *tp)
+{
+    kern_return_t   ret;
+    clock_serv_t    clk;
+    clock_id_t clk_serv_id;
+    mach_timespec_t tm;
+
+    uint64_t start, end, delta, nano;
+
+    /*
+    task_basic_info_data_t tinfo;
+    task_thread_times_info_data_t ttinfo;
+    mach_msg_type_number_t tflag;
+    */
+
+    int retval = -1;
+    switch (clk_id)
+    {
+    case CLOCK_REALTIME:
+    case CLOCK_MONOTONIC:
+        clk_serv_id = clk_id == CLOCK_REALTIME ? CALENDAR_CLOCK : SYSTEM_CLOCK;
+        if (KERN_SUCCESS == (ret = host_get_clock_service(mach_host_self(), clk_serv_id, &clk)))
+        {
+            if (KERN_SUCCESS == (ret = clock_get_time(clk, &tm)))
+            {
+                tp->tv_sec  = tm.tv_sec;
+                tp->tv_nsec = tm.tv_nsec;
+                retval = 0;
+            }
+        }
+        if (KERN_SUCCESS != ret)
+        {
+            errno = EINVAL;
+            retval = -1;
+        }
+        break;
+    case CLOCK_PROCESS_CPUTIME_ID:
+    case CLOCK_THREAD_CPUTIME_ID:
+        start = mach_absolute_time();
+        if (clk_id == CLOCK_PROCESS_CPUTIME_ID)
+        {
+            getpid();
+        }
+        else
+        {
+            sched_yield();
+        }
+        end = mach_absolute_time();
+        delta = end - start;
+        if (0 == __clock_gettime_inf.denom)
+        {
+            mach_timebase_info(&__clock_gettime_inf);
+        }
+        nano = delta * __clock_gettime_inf.numer / __clock_gettime_inf.denom;
+        tp->tv_sec = nano * 1e-9;
+        tp->tv_nsec = nano - (tp->tv_sec * 1e9);
+        retval = 0;
+        break;
+    default:
+        errno = EINVAL;
+        retval = -1;
+    }
+    return retval;
+}

compat/clock_gettime/clock_gettime.h

@@ -0,0 +1,23 @@
+#ifndef CLOCK_GETTIME_H
+#define CLOCK_GETTIME_H
+
+#include <mach/mach_time.h>
+
+#ifndef CLOCKID_T
+#define CLOCKID_T
+typedef enum
+{
+    CLOCK_REALTIME,
+    CLOCK_MONOTONIC,
+    CLOCK_PROCESS_CPUTIME_ID,
+    CLOCK_THREAD_CPUTIME_ID
+} clockid_t;
+#endif // CLOCKID_T
+
+struct timespec;
+
+static mach_timebase_info_data_t __clock_gettime_inf;
+
+int clock_gettime(clockid_t clk_id, struct timespec *tp);
+
+#endif // CLOCK_GETTIME_H

compat/clock_nanosleep/LICENSE

@@ -0,0 +1,16 @@
+/***********************************************************************
+ *  Copyright © 2006 Rémi Denis-Courmont.                              *
+ *  This program is free software; you can redistribute and/or modify  *
+ *  it under the terms of the GNU General Public License as published  *
+ *  by the Free Software Foundation; version 2 of the license, or (at  *
+ *  your option) any later version.                                    *
+ *                                                                     *
+ *  This program 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 this program; if not, you can get it from:              *
+ *  http://www.gnu.org/copyleft/gpl.html                               *
+ ***********************************************************************/

compat/clock_nanosleep/clock_nanosleep.c

@@ -0,0 +1,62 @@
+/*
+ * clock_nanosleep.c - clock_nanosleep() replacement
+ */
+
+/***********************************************************************
+ *  Copyright © 2006 Rémi Denis-Courmont.                              *
+ *  This program is free software; you can redistribute and/or modify  *
+ *  it under the terms of the GNU General Public License as published  *
+ *  by the Free Software Foundation; version 2 of the license, or (at  *
+ *  your option) any later version.                                    *
+ *                                                                     *
+ *  This program 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 this program; if not, you can get it from:              *
+ *  http://www.gnu.org/copyleft/gpl.html                               *
+ ***********************************************************************/
+
+#include "clock_nanosleep.h"
+#include <errno.h>                           // for errno, EINVAL
+#include <time.h>                            // for nanosleep, NULL
+#include "../clock_gettime/clock_gettime.h"  // for clock_gettime
+
+int clock_nanosleep(clockid_t id, int flags, const struct timespec *ts,
+                    struct timespec *ots) {
+    int ret;
+
+    if (id != CLOCK_REALTIME)
+        return EINVAL;
+
+    if (flags & TIMER_ABSTIME) {
+        struct timespec mine;
+
+        if (clock_gettime(id, &mine))
+            return errno;
+
+        if (mine.tv_sec > ts->tv_sec)
+            return 0; // behind schedule
+
+        if (mine.tv_nsec > ts->tv_nsec) {
+            if (mine.tv_sec == ts->tv_sec)
+                return 0; // behind schedule too
+
+            mine.tv_nsec = 1000000000 + ts->tv_nsec - mine.tv_nsec;
+            mine.tv_sec++;
+        }
+        else
+            mine.tv_nsec = ts->tv_nsec - mine.tv_nsec;
+
+        mine.tv_sec = ts->tv_sec - mine.tv_sec;
+
+        /* With TIMER_ABSTIME, clock_nanosleep ignores <ots> */
+        ret = nanosleep(&mine, NULL);
+    }
+    else
+        ret = nanosleep(ts, ots);
+
+    return ret ? errno : 0;
+}

compat/clock_nanosleep/clock_nanosleep.h

@@ -0,0 +1,24 @@
+#ifndef CLOCK_NANOSLEEP_H
+#define CLOCK_NANOSLEEP_H
+
+#ifndef CLOCKID_T
+#define CLOCKID_T
+typedef enum
+{
+    CLOCK_REALTIME,
+    CLOCK_MONOTONIC,
+    CLOCK_PROCESS_CPUTIME_ID,
+    CLOCK_THREAD_CPUTIME_ID
+} clockid_t;
+#endif // CLOCKID_T
+
+#ifndef TIMER_ABSTIME
+#define TIMER_ABSTIME 1
+#endif // TIMER_ABSTIME
+
+struct timespec;
+
+int clock_nanosleep (clockid_t id, int flags, const struct timespec *ts,
+                     struct timespec *ots);
+
+#endif //CLOCK_NANOSLEEP_H

compat/compat.h

@@ -0,0 +1,32 @@
+#ifndef COMPAT_UTIL_H
+#define COMPAT_UTIL_H
+
+/*
+ * Platform-specific bits
+ */
+
+#if defined(__APPLE__)
+
+/* implementations of clock_gettime, clock_nanosleep */
+
+#include "clock_gettime/clock_gettime.h"
+#include "clock_nanosleep/clock_nanosleep.h"
+
+/*
+ * Mach endian conversion
+ */
+# include <libkern/OSByteOrder.h>
+# define bswap_16 OSSwapInt16
+# define bswap_32 OSSwapInt32
+# define bswap_64 OSSwapInt64
+# include <machine/endian.h>
+# define le16toh(x) OSSwapLittleToHostInt16(x)
+# define le32toh(x) OSSwapLittleToHostInt32(x)
+
+#else // other platforms
+
+# include <endian.h>
+
+#endif
+
+#endif //COMPAT_UTIL_H

dump1090.c

@@ -52,7 +52,6 @@
 #include <rtl-sdr.h>
 
 #include <stdarg.h>
-#include <endian.h>
 
 static int verbose_device_search(char *s);
 

dump1090.h

@@ -82,6 +82,8 @@
     #include "winstubs.h" //Put everything Windows specific in here
 #endif
 
+#include "compat/compat.h"
+
 // Avoid a dependency on rtl-sdr except where it's really needed.
 typedef struct rtlsdr_dev rtlsdr_dev_t;
 

faup1090.c

@@ -50,7 +50,6 @@
 #include "dump1090.h"
 
 #include <stdarg.h>
-#include <endian.h>
 
 //
 // =============================== Initialization ===========================