Changeset 7103

Timestamp:

Nov 12, 2008, 4:40:04 AM (12 years ago)

Author:

charles

Message:

1.4x: backport the fixes for #1447 (tracker request failed, status code 0), #1450 (warnings during build), and #1458 (--disable-wx)

Location:

branches/1.4x

Files:

• configure.ac (modified) (3 diffs)
• libtransmission/Makefile.am (modified) (2 diffs)
• libtransmission/fdlimit.c (modified) (4 diffs)

branches/1.4x/configure.ac

@@ -4 +4 @@
 dnl         "0" for stable, supported releases
 dnl these should be the only two lines you need to change
-m4_define([user_agent_prefix],1.40)
-m4_define([peer_id_prefix],-TR1400-)
+m4_define([user_agent_prefix],1.40+)
+m4_define([peer_id_prefix],-TR140Z-)
 
 AC_INIT([transmission],[user_agent_prefix],[http://trac.transmissionbt.com/newticket])
@@ -50 +50 @@
 AC_HEADER_STDC
 AC_HEADER_TIME
-AC_CHECK_FUNCS([lrintf strlcpy daemon dirname basename daemon strcasecmp localtime_r fallocate posix_fallocate])
+
+AC_MSG_CHECKING([for fallocate])
+AC_TRY_LINK([#include <linux/falloc.h>],
+            [return fallocate(-1,0,0,0);],
+            [AC_DEFINE([HAVE_FALLOCATE],[1],[Defined if fallocate() exists])
+             AC_MSG_RESULT([yes])],
+            [AC_MSG_RESULT([no])])
+AC_CHECK_FUNCS([lrintf strlcpy daemon dirname basename daemon strcasecmp localtime_r posix_fallocate])
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
@@ -181 +188 @@
 dnl  wxWidgets detection for the wxWidgets client
 
-AM_OPTIONS_WXCONFIG
-AM_PATH_WXCONFIG($WX_MINIMUM,[have_wx=yes],[have_wx=no])
+build_wx=no
 AC_ARG_ENABLE([wx],
               AC_HELP_STRING([--enable-wx],[build wxWidgets client]),
               [want_wx=${enableval}],
-              [want_wx=no])
-build_wx=no
-if test "x$want_wx" = "xyes" ; then
+              [want_wx=maybe])
+if test "x$want_wx" != "xno"; then
+    AM_OPTIONS_WXCONFIG
+    AM_PATH_WXCONFIG($WX_MINIMUM,[have_wx=yes],[have_wx=no])
     if test "x$have_wx" = "xyes"; then
-      build_wx=yes
-    else
-      AC_MSG_ERROR("wxWidgets not found!")
+        build_wx=yes
+    elif test "x$want_wx" = "xyes"; then 
+        AC_MSG_ERROR("wxWidgets not found!")
     fi
 fi

branches/1.4x/libtransmission/Makefile.am

@@ -113 +113 @@
 noinst_PROGRAMS = $(TESTS)
 
-APPS_LDFLAGS = \
+apps_ldflags = \
     $(ZLIB_LDFLAGS)
 
-APPS_LDADD = \
+apps_ldadd = \
     ./libtransmission.a  \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
@@ -129 +129 @@
 
 bencode_test_SOURCES = bencode-test.c
-bencode_test_LDADD = $(APPS_LDADD)
+bencode_test_LDADD = ${apps_ldadd}
+bencode_test_LDFLAGS = ${apps_ldflags}
+
 blocklist_test_SOURCES = blocklist-test.c
-blocklist_test_LDADD = $(APPS_LDADD)
+blocklist_test_LDADD = ${apps_ldadd}
+blocklist_test_LDFLAGS = ${apps_ldflags}
+
 clients_test_SOURCES = clients-test.c
-clients_test_LDADD = $(APPS_LDADD)
+clients_test_LDADD = ${apps_ldadd}
+clients_test_LDFLAGS = ${apps_ldflags}
+
 json_test_SOURCES = json-test.c
-json_test_LDADD = $(APPS_LDADD)
+json_test_LDADD = ${apps_ldadd}
+json_test_LDFLAGS = ${apps_ldflags}
+
 rpc_test_SOURCES = rpc-test.c
-rpc_test_LDADD = $(APPS_LDADD)
+rpc_test_LDADD = ${apps_ldadd}
+rpc_test_LDFLAGS = ${apps_ldflags}
+
 test_fastset_SOURCES = test-fastset.c
-test_fastset_LDADD = $(APPS_LDADD)
+test_fastset_LDADD = ${apps_ldadd}
+test_fastset_LDFLAGS = ${apps_ldflags}
+
 test_peer_id_SOURCES = test-peer-id.c
-test_peer_id_LDADD = $(APPS_LDADD)
+test_peer_id_LDADD = ${apps_ldadd}
+test_peer_id_LDFLAGS = ${apps_ldflags}
+
 utils_test_SOURCES = utils-test.c
-utils_test_LDADD = $(APPS_LDADD)
+utils_test_LDADD = ${apps_ldadd}
+utils_test_LDFLAGS = ${apps_ldflags}
+
 
 

branches/1.4x/libtransmission/fdlimit.c

@@ -23 +23 @@
  *****************************************************************************/
 
-#ifndef WIN32
- #define HAVE_GETRLIMIT
-#endif
-
 #include <assert.h>
 #include <errno.h>
@@ -37 +33 @@
 #endif
 
+#ifdef HAVE_FALLOCATE
+ #include <linux/falloc.h>
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef HAVE_GETRLIMIT
- #include <sys/time.h> /* getrlimit */
- #include <sys/resource.h> /* getrlimit */
-#endif
 #include <unistd.h>
 #include <fcntl.h> /* O_LARGEFILE */
@@ -105 +101 @@
 #ifdef HAVE_FALLOCATE
 
-    return fallocate( fd, 0, offset, length );
+    return fallocate( fd, FALLOC_FL_KEEP_SIZE, 0, length );
 
 #elif defined(HAVE_POSIX_FALLOCATE)
@@ -505 +501 @@
     gFd = tr_new0( struct tr_fd_s, 1 );
     gFd->lock = tr_lockNew( );
-
-#ifdef HAVE_GETRLIMIT
-    {
-        struct rlimit rlim;
-        getrlimit( RLIMIT_NOFILE, &rlim );
-        rlim.rlim_cur = MIN( rlim.rlim_max,
-                            (rlim_t)( globalPeerLimit + NOFILE_BUFFER ) );
-        setrlimit( RLIMIT_NOFILE, &rlim );
-        gFd->socketMax = rlim.rlim_cur - NOFILE_BUFFER;
-        tr_dbg( "setrlimit( RLIMIT_NOFILE, %d )", (int)rlim.rlim_cur );
-    }
-#else
     gFd->socketMax = globalPeerLimit;
-#endif
     tr_dbg( "%d usable file descriptors", globalPeerLimit );