diff -r ae3103c9ee50 -r 88ac4b927923 model/dce-dirent.cc

--- a/model/dce-dirent.cc	Fri Apr 27 19:40:18 2012 +0900

+++ b/model/dce-dirent.cc	Fri May 11 17:03:08 2012 +0900

@@ -247,7 +247,7 @@

   std::string vPath = UtilsGetRealFilePath (std::string (dirp));

   struct dirent **nl = 0;

-  int ret = scandir ( vPath.c_str () , &nl, filter, compar);

+  int ret = scandir ( vPath.c_str () , &nl, filter, (int (*)(const void*, const void*))compar);

   if ( (ret > 0) && nl )

     {

diff -r ae3103c9ee50 -r 88ac4b927923 model/dce-stdlib.h

--- a/model/dce-stdlib.h	Fri Apr 27 19:40:18 2012 +0900

+++ b/model/dce-stdlib.h	Fri May 11 17:03:08 2012 +0900

@@ -23,6 +23,7 @@

 int dce_unsetenv (const char *name);

 int dce_clearenv (void);

+

 #ifdef __cplusplus

 }

 #endif

diff -r ae3103c9ee50 -r 88ac4b927923 model/libc-dce.c

--- a/model/libc-dce.c	Fri Apr 27 19:40:18 2012 +0900

+++ b/model/libc-dce.c	Fri May 11 17:03:08 2012 +0900

@@ -32,7 +32,9 @@

 #include "dce-cxa.h"

 #include "dce-string.h"

 #include "dce-global-variables.h"

+#ifdef HAVE_SYS_TIMER_H

 #include "sys/dce-timerfd.h"

+#endif

 #include "dce-random.h"

 #include "net/dce-if.h"

 #include "dce-umask.h"

diff -r ae3103c9ee50 -r 88ac4b927923 model/libc-dce.cc

--- a/model/libc-dce.cc	Fri Apr 27 19:40:18 2012 +0900

+++ b/model/libc-dce.cc	Fri May 11 17:03:08 2012 +0900

@@ -12,7 +12,9 @@

 #include "sys/dce-mman.h"

 #include "sys/dce-stat.h"

 #include "sys/dce-select.h"

+#ifdef HAVE_SYS_TIMER_H

 #include "sys/dce-timerfd.h"

+#endif

 #include "dce-unistd.h"

 #include "dce-netdb.h"

 #include "dce-pthread.h"

@@ -67,7 +69,9 @@

 #include <sys/ioctl.h>

 #include <sys/io.h>

 #include <sys/mman.h>

+#ifdef HAVE_SYS_TIMER_H

 #include <sys/timerfd.h>

+#endif

 #include <sys/time.h>

 #include <sys/types.h>

 #include <sys/resource.h>

@@ -150,6 +154,7 @@

 #define NATIVE_EXPLICIT(name, type)				\

   (*libc)->name ## _fn = (func_t)((type)name);

+(*libc)->memcpy_fn = memcpy;

 #include "libc-ns3.h"

 }

 } // extern "C"

diff -r ae3103c9ee50 -r 88ac4b927923 model/libc-ns3.h

--- a/model/libc-ns3.h	Fri Apr 27 19:40:18 2012 +0900

+++ b/model/libc-ns3.h	Fri May 11 17:03:08 2012 +0900

@@ -82,7 +82,6 @@

 DCE    (write)

 DCE    (writev)

 NATIVE (memset)

-NATIVE (memcpy)

 NATIVE (__memcpy_chk)

 NATIVE (bcopy)

 NATIVE (memcmp)

@@ -400,10 +399,13 @@

 NATIVE (toupper)

 NATIVE (tolower)

+NATIVE (_tolower)

+#ifdef HAVE_SYS_TIMER_H

 DCE    (timerfd_create)

 DCE    (timerfd_settime)

 DCE    (timerfd_gettime)

+#endif

 DCE    (if_nametoindex)

 DCE    (if_indextoname)

@@ -435,7 +437,8 @@

 NATIVE (__xpg_basename)

 DCE    (truncate)

-DCE    (ftruncate)

+//DCE    (ftruncate)

+DCE_WITH_ALIAS2 (ftruncate,ftruncate64)

 // pwd.h

 NATIVE (getpwnam)

diff -r ae3103c9ee50 -r 88ac4b927923 model/libc.cc

--- a/model/libc.cc	Fri Apr 27 19:40:18 2012 +0900

+++ b/model/libc.cc	Fri May 11 17:03:08 2012 +0900

@@ -57,6 +57,12 @@

 #include "libc-ns3.h" // do the work

+void *memcpy(void *dest, const void *src, size_t n)

+{

+  return g_libc.memcpy_fn (dest, src, n);

+}

+

+

 // weak_alias (strtol, __strtol_internal);

 // weak_alias (wctype_l, __wctype_l);

 // weak_alias (strdup, __strdup);

diff -r ae3103c9ee50 -r 88ac4b927923 model/libc.h

--- a/model/libc.h	Fri Apr 27 19:40:18 2012 +0900

+++ b/model/libc.h	Fri May 11 17:03:08 2012 +0900

@@ -1,6 +1,7 @@

 #ifndef LIBC_H

 #define LIBC_H

+typedef unsigned int size_t;

 struct Libc

 {

@@ -9,6 +10,7 @@

 #define DCET(rtype, name) DCE(name)

 #include "libc-ns3.h"

+void *(*memcpy_fn)(void *dest, const void *src, size_t n);

 };

diff -r ae3103c9ee50 -r 88ac4b927923 ns3waf/__init__.py

--- a/ns3waf/__init__.py	Fri Apr 27 19:40:18 2012 +0900

+++ b/ns3waf/__init__.py	Fri May 11 17:03:08 2012 +0900

@@ -446,7 +446,7 @@

 }

 """)

         os.close(handle)

-        kw['source'] = kw['source'] + [os.path.relpath(filename, self._bld.bldnode.abspath())]

+        kw['source'] = kw['source'] + [os.path.join(filename, self._bld.bldnode.abspath())]

         self.add_test(needed, **kw)

     def add_test(self, needed = [], **kw):

@@ -464,7 +464,7 @@

         kw['includes'] = kw.get('includes', []) + self._source_dirs

-        tmp = self._bld.path.relpath_gen(self._bld.srcnode)

+        tmp = self._bld.path(self._bld.srcnode)

         objects = []

         for src in kw['source'][0:-1]:

             src_target = '%s_object' % src

diff -r ae3103c9ee50 -r 88ac4b927923 test/test-poll.cc

--- a/test/test-poll.cc	Fri Apr 27 19:40:18 2012 +0900

+++ b/test/test-poll.cc	Fri May 11 17:03:08 2012 +0900

@@ -1,7 +1,6 @@

 #include <stdlib.h>

 #include <sys/time.h>

 #include <sys/types.h>

-#include <sys/timerfd.h>

 #include <unistd.h>

 #include <pthread.h>

 #include <stdio.h>

diff -r ae3103c9ee50 -r 88ac4b927923 test/test-select.cc

--- a/test/test-select.cc	Fri Apr 27 19:40:18 2012 +0900

+++ b/test/test-select.cc	Fri May 11 17:03:08 2012 +0900

@@ -2,7 +2,9 @@

 #include <sys/time.h>

 #include <sys/types.h>

 #include <sys/select.h>

+#ifdef HAVE_SYS_TIMER_H

 #include <sys/timerfd.h>

+#endif

 #include <unistd.h>

 #include <pthread.h>

 #include <stdio.h>

@@ -18,6 +20,7 @@

 #include "test-macros.h"

 // test, that select () with timeout={0,0} exits immediately

+#ifdef HAVE_SYS_TIMER_H

 static void

 test_select_null_null (void)

 {

@@ -58,6 +61,7 @@

   close (timerfd);

 }

+#endif

 static bool

 test_select_read (int fd, int timeOutSec, bool needSuccess)

@@ -771,6 +775,7 @@

   TEST_ASSERT (FD_ISSET (sockfd, &wfds));

 }

+#ifdef HAVE_SYS_TIMER_H

 // test, that select () returns correctly if there is two fds for reading and only one available

 // solved with else mustWait=false

 static void test_select_rfds (void)

@@ -804,6 +809,7 @@

   // no fds must be ready and select() should complete without errors

   TEST_ASSERT_EQUAL (nfds, 1);

 }

+#endif

 int

 main (int argc, char *argv[])

@@ -815,10 +821,14 @@

     {

       test_select_stdin ();

       test_select_stdout_stdin ();

+#ifdef HAVE_SYS_TIMER_H

       test_select_null_null ();

+#endif

       test_select_stdout ();

       test_select_rfds_wfds ();

+#ifdef HAVE_SYS_TIMER_H

       test_select_rfds ();

+#endif

       launch (client1, server1);

       launch (client2, server2);

       launch (client3, server3);

diff -r ae3103c9ee50 -r 88ac4b927923 wscript

--- a/wscript	Fri Apr 27 19:40:18 2012 +0900

+++ b/wscript	Fri May 11 17:03:08 2012 +0900

@@ -34,6 +34,7 @@

     conf.check(header_name='sys/types.h', define_name='HAVE_SYS_TYPES_H', mandatory=False)

     conf.check(header_name='sys/stat.h', define_name='HAVE_SYS_STAT_H', mandatory=False)

     conf.check(header_name='dirent.h', define_name='HAVE_DIRENT_H', mandatory=False)

+    conf.check(header_name='sys/timerfd.h', define_name='HAVE_SYS_TIMER_H', mandatory=False)

     conf.env.prepend_value('LINKFLAGS', '-Wl,--no-as-needed')

     conf.env.append_value('LINKFLAGS', '-pthread')

@@ -88,7 +89,8 @@

     if Options.options.kernel_stack is not None and os.path.isdir(Options.options.kernel_stack):

         conf.check(header_name='sim.h',

-                   includes=os.path.join(Options.options.kernel_stack, 'sim/include'))

+                   includes=[os.path.join(Options.options.kernel_stack, 'sim/include'),

+			    os.path.join(Options.options.kernel_stack, 'net-next-2.6/include')])

       #  conf.check()

         conf.env['KERNEL_STACK'] = Options.options.kernel_stack

@@ -161,7 +163,6 @@

              ['test-netdb', []],

              ['test-env', []],

              ['test-cond', ['PTHREAD']],

-             ['test-timer-fd', []],

              ['test-stdlib', []],

              ['test-select', ['PTHREAD']],

              ['test-random', []],

@@ -181,6 +182,10 @@

              ['test-socket', []],

              ['test-bug-multi-select', []],

              ]

+

+    if module._bld.env['HAVE_SYS_TIMER_H']:

+        tests = tests + ['test-timer-fd', []],

+

     for name,uselib in tests:

         module.add_test(**dce_kw(target='bin_dce/' + name, source = ['test/' + name + '.cc'],

                                  use = uselib + ['lib/test']))

@@ -188,7 +193,6 @@

 def build_dce_examples(module):

     dce_examples = [['udp-server', []],

                     ['udp-client', []],

-                    ['udp-perf', ['m']],

                     ['tcp-server', []],

                     ['tcp-client', []],

                     ['tcp-loopback', []],

@@ -198,6 +202,9 @@

                     ['udp-echo-client', []],

 #                    ['little-cout', []],

                     ]

+    if module._bld.env['HAVE_SYS_TIMER_H']:

+        dce_examples = dce_examples + ['udp-perf', ['m']],

+

     for name,lib in dce_examples:

         module.add_example(**dce_kw(target = 'bin_dce/' + name, 

                                     source = ['example/' + name + '.cc'],

@@ -350,7 +357,6 @@

         'model/dce-string.cc',

         'model/dce-env.cc',

         'model/dce-pthread-cond.cc',

-        'model/dce-timerfd.cc',

         'model/dce-time.cc',

         'model/dce-stat.cc',

         'model/dce-syslog.cc',

@@ -411,6 +417,10 @@

         'helper/ccn-client-helper.h',

         'helper/ipv4-dce-routing-helper.h',

         ]

+

+    if bld.env['HAVE_SYS_TIMER_H']:

+        module_source = module+source + 'model/dce-timerfd.cc',

+

     module_source = module_source + kernel_source

     module_headers = module_headers + kernel_headers

     uselib = ns3waf.modules_uselib(bld, ['core', 'network', 'internet', 'netlink'])