[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r5801 - in flightrecorder: . src/include src/libflightrecor
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r5801 - in flightrecorder: . src/include src/libflightrecorder |
|
Date: |
Wed, 5 Dec 2007 15:52:59 -0700 (MST) |
Author: durner
Date: 2007-12-05 15:52:59 -0700 (Wed, 05 Dec 2007)
New Revision: 5801
Modified:
flightrecorder/acinclude.m4
flightrecorder/configure.in
flightrecorder/src/include/flightrecorder.h
flightrecorder/src/libflightrecorder/main.c
flightrecorder/src/libflightrecorder/private.h
flightrecorder/src/libflightrecorder/stack_trace.c
Log:
fixes
Modified: flightrecorder/acinclude.m4
===================================================================
--- flightrecorder/acinclude.m4 2007-12-05 22:06:18 UTC (rev 5800)
+++ flightrecorder/acinclude.m4 2007-12-05 22:52:59 UTC (rev 5801)
@@ -38,3 +38,68 @@
Some systems have utime.h but don't declare the struct anywhere. ])
fi
])
+
+# See: http://gcc.gnu.org/ml/gcc/2000-05/msg01141.html
+AC_DEFUN([CHECK_PTHREAD],
+[
+ AC_CHECK_LIB(pthread,pthread_create,
+ [
+ PTHREAD_CPPFLAGS=
+ PTHREAD_LDFLAGS=
+ PTHREAD_LIBS=-lpthread
+ AC_DEFINE(HAVE_PTHREADS, 1, [Define if your system has
pthreads])
+ ],[
+ AC_MSG_CHECKING(if compiler supports -pthread)
+ save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -pthread"
+ AC_TRY_LINK(
+ [
+ #include <pthread.h>
+ ],[
+ pthread_create(0,0,0,0);
+ ],[
+ AC_MSG_RESULT(yes)
+ PTHREAD_CPPFLAGS=-pthread
+ PTHREAD_LDFLAGS=-pthread
+ PTHREAD_LIBS=
+ AC_DEFINE(HAVE_PTHREADS, 1, [Define if your system has
pthreads])
+ ],[
+ AC_MSG_RESULT(no)
+ AC_MSG_CHECKING(if compiler supports -pthreads)
+ save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$save_CPPFLAGS -pthreads"
+ AC_TRY_LINK(
+ [
+ #include <pthread.h>
+ ],[
+ pthread_create(0,0,0,0);
+ ],[
+ AC_MSG_RESULT(yes)
+ PTHREAD_CPPFLAGS=-pthreads
+ PTHREAD_LDFLAGS=-pthreads
+ PTHREAD_LIBS=
+ AC_DEFINE(HAVE_PTHREADS, 1, [Define if your
system has pthreads])
+ ],[
+ AC_MSG_RESULT(no)
+ AC_MSG_CHECKING(if compiler supports -threads)
+ save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$save_CPPFLAGS -threads"
+ AC_TRY_LINK(
+ [
+ #include <pthread.h>
+ ],[
+ pthread_create(0,0,0,0);
+ ],[
+ AC_MSG_RESULT(yes)
+ PTHREAD_CPPFLAGS=-threads
+ PTHREAD_LDFLAGS=-threads
+ PTHREAD_LIBS=
+ AC_DEFINE(HAVE_PTHREADS, 1, [Define if
your system has pthreads])
+ ],[
+ AC_MSG_ERROR([Your system is not
supporting pthreads!])
+ ])
+ ])
+ ])
+ CPPFLAGS="$save_CPPFLAGS"
+ ])
+])
Modified: flightrecorder/configure.in
===================================================================
--- flightrecorder/configure.in 2007-12-05 22:06:18 UTC (rev 5800)
+++ flightrecorder/configure.in 2007-12-05 22:52:59 UTC (rev 5801)
@@ -35,6 +35,11 @@
AC_CHECK_FUNC(mknod)
AC_PROG_LIBTOOL
+CHECK_PTHREAD
+LIBS="$PTHREAD_LIBS $LIBS"
+LDFLAGS="$PTHREAD_LDFLAGS $LDFLAGS"
+CPPFLAGS="$PTHREAD_CPPFLAGS $LDFLAGS"
+
dnl Checks for typedefs, structures, and compiler characteristics.
dnl Checks for library functions.
Modified: flightrecorder/src/include/flightrecorder.h
===================================================================
--- flightrecorder/src/include/flightrecorder.h 2007-12-05 22:06:18 UTC (rev
5800)
+++ flightrecorder/src/include/flightrecorder.h 2007-12-05 22:52:59 UTC (rev
5801)
@@ -23,6 +23,8 @@
#ifndef FLIGHTRECORDER_H_
#define FLIGHTRECORDER_H_
+#include <sys/types.h>
+
typedef struct
{
char *file;
@@ -41,7 +43,7 @@
void *fr_malloc (size_t n);
void *fr_calloc (size_t n, size_t s);
-void *fr_realloc (VOID *p, size_t n);
+void *fr_realloc (void *p, size_t n);
char *fr_strdup (char *p);
Modified: flightrecorder/src/libflightrecorder/main.c
===================================================================
--- flightrecorder/src/libflightrecorder/main.c 2007-12-05 22:06:18 UTC (rev
5800)
+++ flightrecorder/src/libflightrecorder/main.c 2007-12-05 22:52:59 UTC (rev
5801)
@@ -20,6 +20,9 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
*/
+#include <stddef.h>
+#include "flightrecorder.h"
+
typedef struct
{
unsigned int sock;
@@ -44,11 +47,11 @@
{
if (!sessions)
{
- sessions = fr_malloc(sizeof(Session));
+ sessions = (Session *) fr_malloc(sizeof(Session));
session_count = 1;
}
else
- sessions = fr_realloc(++session_count * sizeof(Session));
+ sessions = (Session *) fr_realloc(sessions, ++session_count *
sizeof(Session));
if (! sessions)
return 0;
Modified: flightrecorder/src/libflightrecorder/private.h
===================================================================
--- flightrecorder/src/libflightrecorder/private.h 2007-12-05 22:06:18 UTC
(rev 5800)
+++ flightrecorder/src/libflightrecorder/private.h 2007-12-05 22:52:59 UTC
(rev 5801)
@@ -23,6 +23,8 @@
#ifndef PRIVATE_H_
#define PRIVATE_H_
+#include "config.h"
+
#ifdef WINDOWS
#include <windows.h>
Modified: flightrecorder/src/libflightrecorder/stack_trace.c
===================================================================
--- flightrecorder/src/libflightrecorder/stack_trace.c 2007-12-05 22:06:18 UTC
(rev 5800)
+++ flightrecorder/src/libflightrecorder/stack_trace.c 2007-12-05 22:52:59 UTC
(rev 5801)
@@ -20,6 +20,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
*/
+#include <stddef.h>
#include "flightrecorder.h"
#include "private.h"
@@ -53,7 +54,7 @@
if (!traces)
return NULL;
- trace = traces[threads-1];
+ trace = traces + threads - 1;
trace->tid = tid;
trace->depth = 0;
trace->entries = NULL
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r5801 - in flightrecorder: . src/include src/libflightrecorder,
gnunet <=