rpms/xulrunner/devel mozilla-fsync.patch, NONE, 1.1 mozilla-sqlite.patch, 1.2, 1.3 xulrunner.spec, 1.125, 1.126

[Christopher Aillon (caillon)]

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3266

Modified Files:
	mozilla-sqlite.patch xulrunner.spec 
Added Files:
	mozilla-fsync.patch 
Log Message:
* Mon May 19 2008 Christopher Aillon <caillon at redhat.com> 1.0-0.64
- Upstream patch to fsync() less


mozilla-fsync.patch:

--- NEW FILE mozilla-fsync.patch ---
https://bugzilla.mozilla.org/show_bug.cgi?id=421482

diff --git a/storage/src/mozStorageConnection.cpp b/storage/src/mozStorageConnection.cpp
--- a/storage/src/mozStorageConnection.cpp
+++ b/storage/src/mozStorageConnection.cpp
@@ -48,6 +48,8 @@
 #include "nsAutoPtr.h"
 #include "nsIFile.h"
 #include "nsIVariant.h"
+#include "nsIPrefService.h"
+#include "nsIPrefBranch.h"
 
 #include "mozIStorageAggregateFunction.h"
 #include "mozIStorageFunction.h"
@@ -65,6 +67,8 @@
 #ifdef PR_LOGGING
 PRLogModuleInfo* gStorageLog = nsnull;
 #endif
+
+#define PREF_TS_SYNCHRONOUS "toolkit.storage.synchronous"
 
 NS_IMPL_ISUPPORTS1(mozStorageConnection, mozIStorageConnection)
 
@@ -155,6 +159,28 @@ mozStorageConnection::Initialize(nsIFile
         mDBConn = nsnull;
 
         return ConvertResultCode(srv);
+    }
+
+    // Set the synchronous PRAGMA, according to the pref
+    nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
+    PRInt32 synchronous = 1; // Default to NORMAL if pref not set
+    if (pref)
+        (void)pref->GetIntPref(PREF_TS_SYNCHRONOUS, &synchronous);
+    
+    switch (synchronous) {
+        case 2:
+            (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+                "PRAGMA synchronous = FULL;"));
+            break;
+        case 0:
+            (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+                "PRAGMA synchronous = OFF;"));
+            break;
+        case 1:
+        default:
+            (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+                "PRAGMA synchronous = NORMAL;"));
+            break;
     }
 
     return NS_OK;
diff --git a/storage/test/unit/test_storage_connection.js b/storage/test/unit/test_storage_connection.js
--- a/storage/test/unit/test_storage_connection.js
+++ b/storage/test/unit/test_storage_connection.js
@@ -197,6 +197,20 @@ function test_createTable(){
   }
 }
 
+function test_defaultSynchronousAtNormal()
+{
+  var msc = getOpenedDatabase();
+  var stmt = createStatement("PRAGMA synchronous;");
+  try {
+    stmt.executeStep();
+    do_check_eq(1, stmt.getInt32(0));
+  }
+  finally {
+    stmt.reset();
+    stmt.finalize();
+  }
+}
+
 var tests = [
   test_connectionReady_open,
   test_connectionReady_closed,
@@ -216,6 +230,7 @@ var tests = [
   test_set_schemaVersion_same,
   test_set_schemaVersion_negative,
   test_createTable,
+  test_defaultSynchronousAtNormal,
 ];
 
 function run_test()

mozilla-sqlite.patch:

Index: mozilla-sqlite.patch
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/mozilla-sqlite.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mozilla-sqlite.patch	17 May 2008 04:19:11 -0000	1.2
+++ mozilla-sqlite.patch	19 May 2008 16:47:29 -0000	1.3
@@ -7,7 +7,7 @@
 diff -d -u -p -r1.1992 configure.in
 --- mozilla/configure.in	5 May 2008 21:08:14 -0000	1.1992
 +++ mozilla/configure.in	17 May 2008 02:26:32 -0000
-@@ -5958,7 +5958,18 @@ then
+@@ -5958,7 +5958,19 @@ then
      SQLITE_CFLAGS=
      SQLITE_LIBS='$(call EXPAND_LIBNAME_PATH,sqlite3,$(DIST)/lib)'
  else
@@ -23,7 +23,8 @@
 +    if test "$res" != "yes"; then
 +        AC_MSG_ERROR([sqlite version $SQLITE_VERSION or higher required])
 +    fi
-+    PKG_CHECK_MODULES(SQLITE, sqlite3)
++    SQLITE_CFLAGS=`$PKG_CONFIG --cflags sqlite3`
++    SQLITE_LIBS=`$PKG_CONFIG --libs sqlite3`
  fi
  
  AC_SUBST(MOZ_NATIVE_SQLITE)


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- xulrunner.spec	17 May 2008 03:46:09 -0000	1.125
+++ xulrunner.spec	19 May 2008 16:47:29 -0000	1.126
@@ -14,7 +14,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
-Release:        0.63%{?nightly}%{?dist}
+Release:        0.64%{?nightly}%{?dist}
 URL:            http://www.mozilla.org/projects/xulrunner/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -42,6 +42,7 @@
 # font system fixes
 
 # Other
+Patch100:       mozilla-fsync.patch
 Patch107:       mozilla-pkgconfig.patch
 
 # ---------------------------------------------------
@@ -108,7 +109,7 @@
 %patch4   -p1
 %patch5   -p1
 %patch6   -p1 -b .ver
-
+%patch100 -p1 -b .fsync
 %patch107 -p1 -b .pk
 
 %{__rm} -f .mozconfig
@@ -394,6 +395,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon May 19 2008 Christopher Aillon <caillon at redhat.com> 1.0-0.64
+- Upstream patch to fsync() less
+
 * Thu May 16 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.63
 - Update to latest trunk (2008-05-16)