Menu
▾
▴
firebird-checkins
|
From: <fir...@us...> - 2011-04-02 03:14:47
|
Revision: 52636
http://firebird.svn.sourceforge.net/firebird/?rev=52636&view=rev
Author: firebirds
Date: 2011-04-02 03:14:41 +0000 (Sat, 02 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-01 21:07:52 UTC (rev 52635)
+++ firebird/trunk/ChangeLog 2011-04-02 03:14:41 UTC (rev 52636)
@@ -1,3 +1,27 @@
+ 2011-04-01 19:39 asfernandes
+ M src/jrd/met.epp
+Fix related to change done for CORE-3418. It brokes insertion of permission in just created database.
+
+ 2011-04-01 18:39 asfernandes
+ M src/dsql/DdlNodes.epp
+ M src/dsql/DdlNodes.h
+ M src/dsql/parse.y
+Fixed problem with position handling (see CORE-2797).
+
+ 2011-04-01 15:28 hvlad
+ M src/jrd/cmp.cpp
+ M src/jrd/exe.cpp
+Avoid AV when system requests are released at database shutdown
+
+ 2011-04-01 05:26 dimitr
+ M src/dsql/DdlNodes.epp
+Apply Adriano's yesterday fix to functions as well.
+
+ 2011-04-01 04:03 robocop
+ M doc/README.fb_shutdown
+ M doc/sql.extensions/README.ddl_triggers.txt
+Misc.
+
2011-04-01 02:05 asfernandes
M src/auth/SecurityDatabase/LegacyServer.cpp
M src/common/classes/ImplementHelper.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-01 21:07:52 UTC (rev 52635)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-02 03:14:41 UTC (rev 52636)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29232
+ FORMAL BUILD NUMBER:29237
*/
-#define PRODUCT_VER_STRING "3.0.0.29232"
-#define FILE_VER_STRING "WI-T3.0.0.29232"
-#define LICENSE_VER_STRING "WI-T3.0.0.29232"
-#define FILE_VER_NUMBER 3, 0, 0, 29232
+#define PRODUCT_VER_STRING "3.0.0.29237"
+#define FILE_VER_STRING "WI-T3.0.0.29237"
+#define LICENSE_VER_STRING "WI-T3.0.0.29237"
+#define FILE_VER_NUMBER 3, 0, 0, 29237
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29232"
+#define FB_BUILD_NO "29237"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-01 21:07:52 UTC (rev 52635)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-02 03:14:41 UTC (rev 52636)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29232
+BuildNum=29237
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-03 03:15:28
|
Revision: 52659
http://firebird.svn.sourceforge.net/firebird/?rev=52659&view=rev
Author: firebirds
Date: 2011-04-03 03:15:22 +0000 (Sun, 03 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-03 03:03:23 UTC (rev 52658)
+++ firebird/trunk/ChangeLog 2011-04-03 03:15:22 UTC (rev 52659)
@@ -1,3 +1,135 @@
+ 2011-04-03 01:58 asfernandes
+ M src/yvalve/why.cpp
+Fix problems with commit/rollback-retaining seen by Claudio.
+
+ 2011-04-02 21:41 asfernandes
+ M src/include/ProviderInterface.h
+ M src/yvalve/why.cpp
+Remove CleanupCallback from the public header.
+
+ 2011-04-02 19:39 asfernandes
+ M src/dsql/sqlda.h
+ M src/yvalve/utly.cpp
+ M src/yvalve/utly_proto.h
+ M src/yvalve/why.cpp
+Rework on the SQLDA support.
+
+ 2011-04-02 19:38 asfernandes
+ M src/gpre/boot/gpre_meta_boot.cpp
+ M src/include/Interface.h
+ M src/include/ProviderInterface.h
+ M src/jrd/jrd.cpp
+ M src/jrd/tra.h
+ M src/remote/client/interface.cpp
+ M src/yvalve/MasterImplementation.cpp
+ M src/yvalve/MasterImplementation.h
+ M src/yvalve/why.cpp
+New YValve implementation.
+
+ 2011-04-02 17:57 asfernandes
+ M src/jrd/recsrc/AggregatedStream.cpp
+Correction.
+
+ 2011-04-02 04:57 robocop
+ M src/yvalve/PluginManager.cpp
+ M src/yvalve/utl.cpp
+ M src/yvalve/why.cpp
+Misc, style, etc.
+
+ 2011-04-02 04:55 robocop
+ M src/utilities/gsec/gsec.cpp
+ M src/utilities/gstat/dba.epp
+Misc, style, etc.
+
+ 2011-04-02 04:53 robocop
+ M src/remote/client/interface.cpp
+ M src/remote/os/win32/wnet.cpp
+ M src/remote/os/win32/xnet.cpp
+ M src/remote/remot_proto.h
+ M src/remote/server/os/win32/srvr_w32.cpp
+Misc, style, etc.
+
+ 2011-04-02 04:51 robocop
+ M src/dsql/StmtNodes.cpp
+ M src/dsql/pass1.cpp
+Misc, style, etc.
+
+ 2011-04-02 04:50 robocop
+ M src/common/isc_sync.cpp
+Misc, style, etc.
+
+ 2011-04-02 04:47 robocop
+ M src/jrd/jrd.cpp
+Misc, style, etc.
+
+ 2011-04-02 04:45 robocop
+ M src/jrd/Optimizer.cpp
+ M src/jrd/RecordSourceNodes.cpp
+ M src/jrd/UserManagement.cpp
+ M src/jrd/UserManagement.h
+ M src/jrd/ValueImpl.h
+ M src/jrd/extds/ExtDS.cpp
+ M src/jrd/extds/InternalDS.cpp
+ M src/jrd/lck.cpp
+ M src/jrd/pag.h
+ M src/jrd/recsrc/AggregatedStream.cpp
+ M src/jrd/trace/TraceManager.h
+ M src/jrd/vio.cpp
+Misc, style, etc.
+
+ 2011-04-02 04:27 robocop
+ M src/jrd/blob_filter.h
+ M src/jrd/cvt_proto.h
+ M src/jrd/dpm.epp
+ M src/jrd/exe.cpp
+ M src/jrd/flu.cpp
+ M src/jrd/flu.h
+ M src/jrd/inf.cpp
+Misc, style, etc.
+
+ 2011-04-02 04:24 robocop
+ M src/dsql/BoolNodes.cpp
+ M src/dsql/BoolNodes.h
+ M src/dsql/DsqlCompilerScratch.cpp
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/ExprNodes.h
+ M src/dsql/Nodes.h
+ M src/dsql/StmtNodes.h
+ M src/dsql/dsql.cpp
+ M src/dsql/gen.cpp
+Misc, style, etc.
+
+ 2011-04-02 04:16 robocop
+ M src/common/call_service.cpp
+ M src/common/classes/ImplementHelper.h
+ M src/common/classes/alloc.h
+ M src/common/classes/fb_string.h
+ M src/common/classes/locks.h
+ M src/common/fb_exception.cpp
+ M src/common/os/win32/isc_ipc.cpp
+ M src/common/thd.cpp
+Explicit and others.
+
+ 2011-04-02 04:13 robocop
+ M src/common/classes/alloc.cpp
+Fix legacy code.
+
+ 2011-04-02 04:11 robocop
+ M src/common/os/mod_loader.h
+Misc.
+
+ 2011-04-02 04:09 robocop
+ M builds/win32/msvc9/common.vcproj
+ M builds/win32/msvc9/engine.vcproj
+ M builds/win32/msvc9/fbserver.vcproj
+ M builds/win32/msvc9/gsec.vcproj
+Update project files as seen on VC8.
+
+ 2011-04-02 03:31 robocop
+ M builds/win32/msvc9/burp.vcproj
+ M builds/win32/msvc9/fbsvcmgr.vcproj
+Crap cleaning.
+
2011-04-01 19:39 asfernandes
M src/jrd/met.epp
Fix related to change done for CORE-3418. It brokes insertion of permission in just created database.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-03 03:03:23 UTC (rev 52658)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-03 03:15:22 UTC (rev 52659)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29237
+ FORMAL BUILD NUMBER:29256
*/
-#define PRODUCT_VER_STRING "3.0.0.29237"
-#define FILE_VER_STRING "WI-T3.0.0.29237"
-#define LICENSE_VER_STRING "WI-T3.0.0.29237"
-#define FILE_VER_NUMBER 3, 0, 0, 29237
+#define PRODUCT_VER_STRING "3.0.0.29256"
+#define FILE_VER_STRING "WI-T3.0.0.29256"
+#define LICENSE_VER_STRING "WI-T3.0.0.29256"
+#define FILE_VER_NUMBER 3, 0, 0, 29256
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29237"
+#define FB_BUILD_NO "29256"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-03 03:03:23 UTC (rev 52658)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-03 03:15:22 UTC (rev 52659)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29237
+BuildNum=29256
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-04 03:14:31
|
Revision: 52662
http://firebird.svn.sourceforge.net/firebird/?rev=52662&view=rev
Author: firebirds
Date: 2011-04-04 03:14:25 +0000 (Mon, 04 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-03 04:05:36 UTC (rev 52661)
+++ firebird/trunk/ChangeLog 2011-04-04 03:14:25 UTC (rev 52662)
@@ -1,3 +1,18 @@
+ 2011-04-03 04:05 robocop
+ M src/yvalve/why.cpp
+Solve compilation problem in Win32. Maybe better solution exists.
+
+ 2011-04-03 03:43 asfernandes
+ M src/yvalve/why.cpp
+Fix things seen by Claudio.
+
+ 2011-04-03 03:03 robocop
+ M src/jrd/recsrc/HashJoin.cpp
+ M src/jrd/recsrc/MergeJoin.cpp
+ M src/jrd/recsrc/NestedLoopJoin.cpp
+ M src/yvalve/utly.cpp
+Warnings.
+
2011-04-03 01:58 asfernandes
M src/yvalve/why.cpp
Fix problems with commit/rollback-retaining seen by Claudio.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-03 04:05:36 UTC (rev 52661)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-04 03:14:25 UTC (rev 52662)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29256
+ FORMAL BUILD NUMBER:29259
*/
-#define PRODUCT_VER_STRING "3.0.0.29256"
-#define FILE_VER_STRING "WI-T3.0.0.29256"
-#define LICENSE_VER_STRING "WI-T3.0.0.29256"
-#define FILE_VER_NUMBER 3, 0, 0, 29256
+#define PRODUCT_VER_STRING "3.0.0.29259"
+#define FILE_VER_STRING "WI-T3.0.0.29259"
+#define LICENSE_VER_STRING "WI-T3.0.0.29259"
+#define FILE_VER_NUMBER 3, 0, 0, 29259
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29256"
+#define FB_BUILD_NO "29259"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-03 04:05:36 UTC (rev 52661)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-04 03:14:25 UTC (rev 52662)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29256
+BuildNum=29259
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-05 03:15:57
|
Revision: 52667
http://firebird.svn.sourceforge.net/firebird/?rev=52667&view=rev
Author: firebirds
Date: 2011-04-05 03:15:51 +0000 (Tue, 05 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-05 00:31:58 UTC (rev 52666)
+++ firebird/trunk/ChangeLog 2011-04-05 03:15:51 UTC (rev 52667)
@@ -1,3 +1,29 @@
+ 2011-04-05 00:31 asfernandes
+ M src/dsql/dsql.cpp
+ M src/dsql/dsql.h
+ M src/dsql/gen.cpp
+Fixed CORE-2606 - Multibyte CHAR value requested as VARCHAR is returned with padded spaces.
+
+ 2011-04-04 14:55 asfernandes
+ M src/yvalve/why.cpp
+Hope this avoid some crashs in exit.
+
+ 2011-04-04 13:37 asfernandes
+ M src/common/classes/alloc.cpp
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/Nodes.h
+ M src/dsql/StmtNodes.cpp
+ M src/jrd/Optimizer.cpp
+ M src/jrd/dpm.epp
+ M src/jrd/jrd.cpp
+ M src/remote/client/interface.cpp
+ M src/yvalve/utl.cpp
+Misc
+
+ 2011-04-04 12:40 asfernandes
+ M src/yvalve/why.cpp
+Fix the problem reported by Dmitry Kovalenko.
+
2011-04-03 04:05 robocop
M src/yvalve/why.cpp
Solve compilation problem in Win32. Maybe better solution exists.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-05 00:31:58 UTC (rev 52666)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-05 03:15:51 UTC (rev 52667)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29259
+ FORMAL BUILD NUMBER:29263
*/
-#define PRODUCT_VER_STRING "3.0.0.29259"
-#define FILE_VER_STRING "WI-T3.0.0.29259"
-#define LICENSE_VER_STRING "WI-T3.0.0.29259"
-#define FILE_VER_NUMBER 3, 0, 0, 29259
+#define PRODUCT_VER_STRING "3.0.0.29263"
+#define FILE_VER_STRING "WI-T3.0.0.29263"
+#define LICENSE_VER_STRING "WI-T3.0.0.29263"
+#define FILE_VER_NUMBER 3, 0, 0, 29263
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29259"
+#define FB_BUILD_NO "29263"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-05 00:31:58 UTC (rev 52666)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-05 03:15:51 UTC (rev 52667)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29259
+BuildNum=29263
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-06 03:16:07
|
Revision: 52677
http://firebird.svn.sourceforge.net/firebird/?rev=52677&view=rev
Author: firebirds
Date: 2011-04-06 03:16:00 +0000 (Wed, 06 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-05 21:30:27 UTC (rev 52676)
+++ firebird/trunk/ChangeLog 2011-04-06 03:16:00 UTC (rev 52677)
@@ -1,3 +1,34 @@
+ 2011-04-05 21:30 asfernandes
+ M src/isql/isql.epp
+ M src/isql/isql.h
+Fixed CORE-3431 - ISQL pads UTF-8 data incorrectly.
+
+ 2011-04-05 18:02 asfernandes
+ M src/common/unicode_util.cpp
+Fixed CORE-3427 - Server crashing with UTF8 blobs.
+
+ 2011-04-05 14:23 dimitr
+ M src/dsql/pass1.cpp
+Fixed incorrect type evaluation for unions.
+Example:
+SELECT NULL AS PRICE FROM rdb$database
+union all
+SELECT 1.0 AS PRICE FROM rdb$database
+
+ 2011-04-05 05:49 dimitr
+ M src/dsql/StmtNodes.cpp
+One more part of the fix for CORE-3340.
+
+ 2011-04-05 05:47 dimitr
+ M src/jrd/tra.cpp
+Fixed the assertion caused by refcnt != 0.
+
+ 2011-04-05 05:36 dimitr
+ M src/jrd/lck.cpp
+ M src/jrd/pag.cpp
+ M src/jrd/vio.cpp
+Better locality of allocations. This also fixes a tiny memory leak in SuperServer.
+
2011-04-05 00:31 asfernandes
M src/dsql/dsql.cpp
M src/dsql/dsql.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-05 21:30:27 UTC (rev 52676)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-06 03:16:00 UTC (rev 52677)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29263
+ FORMAL BUILD NUMBER:29269
*/
-#define PRODUCT_VER_STRING "3.0.0.29263"
-#define FILE_VER_STRING "WI-T3.0.0.29263"
-#define LICENSE_VER_STRING "WI-T3.0.0.29263"
-#define FILE_VER_NUMBER 3, 0, 0, 29263
+#define PRODUCT_VER_STRING "3.0.0.29269"
+#define FILE_VER_STRING "WI-T3.0.0.29269"
+#define LICENSE_VER_STRING "WI-T3.0.0.29269"
+#define FILE_VER_NUMBER 3, 0, 0, 29269
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29263"
+#define FB_BUILD_NO "29269"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-05 21:30:27 UTC (rev 52676)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-06 03:16:00 UTC (rev 52677)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29263
+BuildNum=29269
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-07 03:15:20
|
Revision: 52683
http://firebird.svn.sourceforge.net/firebird/?rev=52683&view=rev
Author: firebirds
Date: 2011-04-07 03:15:13 +0000 (Thu, 07 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-06 17:50:21 UTC (rev 52682)
+++ firebird/trunk/ChangeLog 2011-04-07 03:15:13 UTC (rev 52683)
@@ -1,3 +1,15 @@
+ 2011-04-06 17:44 hvlad
+ M src/utilities/ntrace/TracePluginImpl.cpp
+Fixed potential buffer overflow. Thanks to Claudio.
+
+ 2011-04-06 12:07 hvlad
+ M builds/win32/msvc10/isql.vcxproj
+Add ICU's include folder to isql
+
+ 2011-04-06 12:06 hvlad
+ M src/yvalve/PluginManager.cpp
+Fix by Alex to prevent crash at exit time
+
2011-04-05 21:30 asfernandes
M src/isql/isql.epp
M src/isql/isql.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-06 17:50:21 UTC (rev 52682)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-07 03:15:13 UTC (rev 52683)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29269
+ FORMAL BUILD NUMBER:29272
*/
-#define PRODUCT_VER_STRING "3.0.0.29269"
-#define FILE_VER_STRING "WI-T3.0.0.29269"
-#define LICENSE_VER_STRING "WI-T3.0.0.29269"
-#define FILE_VER_NUMBER 3, 0, 0, 29269
+#define PRODUCT_VER_STRING "3.0.0.29272"
+#define FILE_VER_STRING "WI-T3.0.0.29272"
+#define LICENSE_VER_STRING "WI-T3.0.0.29272"
+#define FILE_VER_NUMBER 3, 0, 0, 29272
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29269"
+#define FB_BUILD_NO "29272"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-06 17:50:21 UTC (rev 52682)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-07 03:15:13 UTC (rev 52683)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29269
+BuildNum=29272
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-08 03:15:46
|
Revision: 52689
http://firebird.svn.sourceforge.net/firebird/?rev=52689&view=rev
Author: firebirds
Date: 2011-04-08 03:15:35 +0000 (Fri, 08 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-07 17:16:00 UTC (rev 52688)
+++ firebird/trunk/ChangeLog 2011-04-08 03:15:35 UTC (rev 52689)
@@ -1,3 +1,66 @@
+ 2011-04-07 17:16 alexpeshkoff
+ M src/auth/AuthDbg.cpp
+ M src/auth/AuthDbg.h
+ M src/auth/AuthInterface.h
+ M src/auth/SecurityDatabase/LegacyClient.cpp
+ M src/auth/SecurityDatabase/LegacyClient.h
+ M src/auth/SecurityDatabase/LegacyManagement.epp
+ M src/auth/SecurityDatabase/LegacyManagement.h
+ M src/auth/SecurityDatabase/LegacyServer.cpp
+ M src/auth/SecurityDatabase/LegacyServer.h
+ M src/auth/trusted/AuthSspi.cpp
+ M src/auth/trusted/AuthSspi.h
+ M src/common/Auth.h
+ M src/common/StatusHolder.h
+ M src/common/classes/GetPlugins.h
+ M src/common/classes/ImplementHelper.h
+ M src/common/fb_exception.cpp
+ M src/common/utils_proto.h
+ M src/dsql/dsql.h
+ M src/gpre/boot/gpre_meta_boot.cpp
+ M src/include/FirebirdExternalApi.h
+ M src/include/FirebirdPluginApi.h
+ M src/include/Interface.h
+ M src/include/ProviderInterface.h
+ M src/include/Timer.h
+ M src/include/fb_exception.h
+ M src/include/gen/msgs.h
+ M src/jrd/Attachment.h
+ M src/jrd/ExtEngineManager.cpp
+ M src/jrd/JrdStatement.h
+ M src/jrd/UserManagement.cpp
+ M src/jrd/UserManagement.h
+ M src/jrd/blb.h
+ M src/jrd/event.cpp
+ M src/jrd/event.h
+ M src/jrd/event_proto.h
+ M src/jrd/extds/ExtDS.cpp
+ M src/jrd/extds/ExtDS.h
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd.h
+ M src/jrd/jrd_proto.h
+ M src/jrd/ntrace.h
+ M src/jrd/tra.h
+ M src/jrd/trace/TraceManager.cpp
+ M src/jrd/trace/TraceManager.h
+ M src/msgs/messages2.sql
+ M src/plugins/udr_engine/UdrEngine.cpp
+ M src/remote/client/interface.cpp
+ M src/remote/client/interface.h
+ M src/remote/remot_proto.h
+ M src/remote/remote.cpp
+ M src/remote/remote.h
+ M src/remote/server/os/posix/inet_server.cpp
+ M src/remote/server/os/win32/srvr_w32.cpp
+ M src/utilities/ntrace/traceplugin.cpp
+ M src/yvalve/MasterImplementation.cpp
+ M src/yvalve/MasterImplementation.h
+ M src/yvalve/PluginManager.cpp
+ M src/yvalve/PluginManager.h
+ M src/yvalve/why.cpp
+ M src/yvalve/why_proto.h
+Use better names for a number of objects according to Vlad's suggestion
+
2011-04-06 17:44 hvlad
M src/utilities/ntrace/TracePluginImpl.cpp
Fixed potential buffer overflow. Thanks to Claudio.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-07 17:16:00 UTC (rev 52688)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-08 03:15:35 UTC (rev 52689)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29272
+ FORMAL BUILD NUMBER:29273
*/
-#define PRODUCT_VER_STRING "3.0.0.29272"
-#define FILE_VER_STRING "WI-T3.0.0.29272"
-#define LICENSE_VER_STRING "WI-T3.0.0.29272"
-#define FILE_VER_NUMBER 3, 0, 0, 29272
+#define PRODUCT_VER_STRING "3.0.0.29273"
+#define FILE_VER_STRING "WI-T3.0.0.29273"
+#define LICENSE_VER_STRING "WI-T3.0.0.29273"
+#define FILE_VER_NUMBER 3, 0, 0, 29273
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29272"
+#define FB_BUILD_NO "29273"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-07 17:16:00 UTC (rev 52688)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-08 03:15:35 UTC (rev 52689)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29272
+BuildNum=29273
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-09 03:16:33
|
Revision: 52694
http://firebird.svn.sourceforge.net/firebird/?rev=52694&view=rev
Author: firebirds
Date: 2011-04-09 03:16:26 +0000 (Sat, 09 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-08 16:43:05 UTC (rev 52693)
+++ firebird/trunk/ChangeLog 2011-04-09 03:16:26 UTC (rev 52694)
@@ -1,3 +1,72 @@
+ 2011-04-08 16:43 alexpeshkoff
+ M src/common/classes/ImplementHelper.h
+ M src/dsql/dsql.h
+ M src/include/ProviderInterface.h
+ M src/jrd/Attachment.h
+ M src/jrd/extds/InternalDS.cpp
+ M src/jrd/jrd.cpp
+ M src/remote/client/interface.cpp
+ M src/yvalve/why.cpp
+Use interface IBlrMessage instead passing C++ class pointer to API interface's functions
+
+ 2011-04-08 15:18 alexpeshkoff
+ M src/auth/AuthDbg.cpp
+ M src/auth/AuthDbg.h
+ M src/auth/AuthInterface.h
+ M src/auth/SecurityDatabase/LegacyClient.cpp
+ M src/auth/SecurityDatabase/LegacyClient.h
+ M src/auth/SecurityDatabase/LegacyManagement.epp
+ M src/auth/SecurityDatabase/LegacyManagement.h
+ M src/auth/SecurityDatabase/LegacyServer.cpp
+ M src/auth/SecurityDatabase/LegacyServer.h
+ M src/auth/trusted/AuthSspi.cpp
+ M src/auth/trusted/AuthSspi.h
+ M src/common/Auth.h
+ M src/common/StatusHolder.h
+ M src/common/call_service.cpp
+ M src/common/call_service.h
+ M src/common/classes/ImplementHelper.h
+ M src/common/config/config.h
+ M src/common/fb_exception.cpp
+ M src/common/security.cpp
+ M src/common/security.h
+ M src/dsql/dsql.h
+ M src/gpre/boot/gpre_meta_boot.cpp
+ M src/include/FirebirdPluginApi.h
+ M src/include/Interface.h
+ M src/include/ProviderInterface.h
+ M src/jrd/Attachment.h
+ M src/jrd/ExtEngineManager.cpp
+ M src/jrd/JrdStatement.h
+ M src/jrd/UserManagement.cpp
+ M src/jrd/UserManagement.h
+ M src/jrd/blb.h
+ M src/jrd/jrd.cpp
+ M src/jrd/tra.h
+ M src/jrd/trace/TraceConfigStorage.cpp
+ M src/jrd/trace/TraceManager.cpp
+ M src/jrd/trace/TraceManager.h
+ M src/jrd/trace/TraceObjects.cpp
+ M src/jrd/trace/TraceObjects.h
+ M src/plugins/udr_engine/UdrEngine.cpp
+ M src/remote/client/interface.cpp
+ M src/remote/server/os/posix/inet_server.cpp
+ M src/remote/server/os/win32/srvr_w32.cpp
+ M src/remote/server/server.cpp
+ M src/utilities/gsec/gsec.cpp
+ M src/utilities/ntrace/PluginLogWriter.h
+ M src/utilities/ntrace/TracePluginImpl.h
+ M src/utilities/ntrace/traceplugin.cpp
+ M src/yvalve/MasterImplementation.cpp
+ M src/yvalve/PluginManager.cpp
+ M src/yvalve/PluginManager.h
+ M src/yvalve/why.cpp
+Continued renaming interfaces. Added comments
+
+ 2011-04-08 08:21 hvlad
+ M builds/win32/msvc8/isql.vcproj
+Fix MSVC8 build
+
2011-04-07 17:16 alexpeshkoff
M src/auth/AuthDbg.cpp
M src/auth/AuthDbg.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-08 16:43:05 UTC (rev 52693)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-09 03:16:26 UTC (rev 52694)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29273
+ FORMAL BUILD NUMBER:29276
*/
-#define PRODUCT_VER_STRING "3.0.0.29273"
-#define FILE_VER_STRING "WI-T3.0.0.29273"
-#define LICENSE_VER_STRING "WI-T3.0.0.29273"
-#define FILE_VER_NUMBER 3, 0, 0, 29273
+#define PRODUCT_VER_STRING "3.0.0.29276"
+#define FILE_VER_STRING "WI-T3.0.0.29276"
+#define LICENSE_VER_STRING "WI-T3.0.0.29276"
+#define FILE_VER_NUMBER 3, 0, 0, 29276
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29273"
+#define FB_BUILD_NO "29276"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-08 16:43:05 UTC (rev 52693)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-09 03:16:26 UTC (rev 52694)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29273
+BuildNum=29276
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-10 03:16:05
|
Revision: 52702
http://firebird.svn.sourceforge.net/firebird/?rev=52702&view=rev
Author: firebirds
Date: 2011-04-10 03:15:59 +0000 (Sun, 10 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-09 20:00:00 UTC (rev 52701)
+++ firebird/trunk/ChangeLog 2011-04-10 03:15:59 UTC (rev 52702)
@@ -1,3 +1,17 @@
+ 2011-04-09 20:00 asfernandes
+ M src/dsql/dsql.h
+ M src/include/ProviderInterface.h
+ M src/jrd/jrd.cpp
+ M src/remote/client/interface.cpp
+ M src/yvalve/why.cpp
+Remove unused parameter and rename a constant.
+
+ 2011-04-09 19:27 asfernandes
+ M src/auth/SecurityDatabase/LegacyServer.cpp
+ M src/jrd/pag.cpp
+ M src/yvalve/why_proto.h
+Misc
+
2011-04-08 16:43 alexpeshkoff
M src/common/classes/ImplementHelper.h
M src/dsql/dsql.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-09 20:00:00 UTC (rev 52701)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-10 03:15:59 UTC (rev 52702)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29276
+ FORMAL BUILD NUMBER:29278
*/
-#define PRODUCT_VER_STRING "3.0.0.29276"
-#define FILE_VER_STRING "WI-T3.0.0.29276"
-#define LICENSE_VER_STRING "WI-T3.0.0.29276"
-#define FILE_VER_NUMBER 3, 0, 0, 29276
+#define PRODUCT_VER_STRING "3.0.0.29278"
+#define FILE_VER_STRING "WI-T3.0.0.29278"
+#define LICENSE_VER_STRING "WI-T3.0.0.29278"
+#define FILE_VER_NUMBER 3, 0, 0, 29278
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29276"
+#define FB_BUILD_NO "29278"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-09 20:00:00 UTC (rev 52701)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-10 03:15:59 UTC (rev 52702)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29276
+BuildNum=29278
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-12 03:17:06
|
Revision: 52706
http://firebird.svn.sourceforge.net/firebird/?rev=52706&view=rev
Author: firebirds
Date: 2011-04-12 03:16:59 +0000 (Tue, 12 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-11 11:22:03 UTC (rev 52705)
+++ firebird/trunk/ChangeLog 2011-04-12 03:16:59 UTC (rev 52706)
@@ -1,3 +1,22 @@
+ 2011-04-11 11:22 alexpeshkoff
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd_proto.h
+Fixed memory leak - thanks to Adriano
+
+ 2011-04-11 11:14 alexpeshkoff
+ M src/jrd/trace/TraceManager.cpp
+Fixed correct calling convention - thanks to Adriano
+
+ 2011-04-11 11:12 alexpeshkoff
+ M src/common/classes/GetPlugins.h
+ M src/common/classes/ImplementHelper.h
+ M src/include/FirebirdPluginApi.h
+ M src/include/Interface.h
+ M src/plugins/udr_engine/UdrEngine.cpp
+ M src/yvalve/MasterImplementation.cpp
+ M src/yvalve/PluginManager.cpp
+Renamed a number of functions to match Dmitry's requirement
+
2011-04-09 20:00 asfernandes
M src/dsql/dsql.h
M src/include/ProviderInterface.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-11 11:22:03 UTC (rev 52705)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-12 03:16:59 UTC (rev 52706)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29278
+ FORMAL BUILD NUMBER:29281
*/
-#define PRODUCT_VER_STRING "3.0.0.29278"
-#define FILE_VER_STRING "WI-T3.0.0.29278"
-#define LICENSE_VER_STRING "WI-T3.0.0.29278"
-#define FILE_VER_NUMBER 3, 0, 0, 29278
+#define PRODUCT_VER_STRING "3.0.0.29281"
+#define FILE_VER_STRING "WI-T3.0.0.29281"
+#define LICENSE_VER_STRING "WI-T3.0.0.29281"
+#define FILE_VER_NUMBER 3, 0, 0, 29281
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29278"
+#define FB_BUILD_NO "29281"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-11 11:22:03 UTC (rev 52705)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-12 03:16:59 UTC (rev 52706)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29278
+BuildNum=29281
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-13 03:16:07
|
Revision: 52708
http://firebird.svn.sourceforge.net/firebird/?rev=52708&view=rev
Author: firebirds
Date: 2011-04-13 03:16:00 +0000 (Wed, 13 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-12 12:47:33 UTC (rev 52707)
+++ firebird/trunk/ChangeLog 2011-04-13 03:16:00 UTC (rev 52708)
@@ -1,3 +1,7 @@
+ 2011-04-12 12:47 hvlad
+ M src/common/config/config.cpp
+Let config file detects literals "true", "yes" and "y" as TRUE boolean values.
+
2011-04-11 11:22 alexpeshkoff
M src/jrd/jrd.cpp
M src/jrd/jrd_proto.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-12 12:47:33 UTC (rev 52707)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-13 03:16:00 UTC (rev 52708)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29281
+ FORMAL BUILD NUMBER:29282
*/
-#define PRODUCT_VER_STRING "3.0.0.29281"
-#define FILE_VER_STRING "WI-T3.0.0.29281"
-#define LICENSE_VER_STRING "WI-T3.0.0.29281"
-#define FILE_VER_NUMBER 3, 0, 0, 29281
+#define PRODUCT_VER_STRING "3.0.0.29282"
+#define FILE_VER_STRING "WI-T3.0.0.29282"
+#define LICENSE_VER_STRING "WI-T3.0.0.29282"
+#define FILE_VER_NUMBER 3, 0, 0, 29282
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29281"
+#define FB_BUILD_NO "29282"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-12 12:47:33 UTC (rev 52707)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-13 03:16:00 UTC (rev 52708)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29281
+BuildNum=29282
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-14 03:16:37
|
Revision: 52719
http://firebird.svn.sourceforge.net/firebird/?rev=52719&view=rev
Author: firebirds
Date: 2011-04-14 03:16:31 +0000 (Thu, 14 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-14 01:03:43 UTC (rev 52718)
+++ firebird/trunk/ChangeLog 2011-04-14 03:16:31 UTC (rev 52719)
@@ -1,3 +1,53 @@
+ 2011-04-14 01:03 asfernandes
+ A src/common/StatementMetadata.cpp
+ A src/common/StatementMetadata.h
+ M src/common/StatusHolder.h
+ M src/dsql/dsql.h
+ M src/dsql/sqlda.h
+ M src/include/ProviderInterface.h
+ M src/include/gen/msgs.h
+ M src/jrd/extds/InternalDS.cpp
+ M src/jrd/jrd.cpp
+ M src/msgs/messages2.sql
+ M src/remote/client/interface.cpp
+ D src/yvalve/utly.cpp
+ D src/yvalve/utly_proto.h
+ M src/yvalve/why.cpp
+Added metadata support to IStatement.
+
+ 2011-04-13 17:14 asfernandes
+ M src/dsql/gen.cpp
+Generate DSQL internal dbkey/rec_version only for SELECT...FOR UPDATE. They do nothing for others commands.
+
+ 2011-04-13 16:57 asfernandes
+ M src/dsql/gen.cpp
+Correction for cursor-based UPDATE/DELETE.
+
+ 2011-04-13 15:09 asfernandes
+ M src/common/classes/ImplementHelper.h
+ M src/common/config/config.cpp
+ M src/yvalve/why.cpp
+Misc
+
+ 2011-04-13 12:41 alexpeshkoff
+ M src/common/classes/ImplementHelper.h
+ M src/dsql/dsql.h
+ M src/include/ProviderInterface.h
+ M src/jrd/Attachment.h
+ M src/jrd/extds/InternalDS.cpp
+ M src/jrd/jrd.cpp
+ M src/remote/client/interface.cpp
+ M src/yvalve/why.cpp
+Rolled back my commit using IBlrMessage interface. Replaced with single plain structure FbMessage.
+
+ 2011-04-13 12:39 alexpeshkoff
+ M src/dsql/dsql.cpp
+Added more diagnostics in DEV_BUILD. If you find it reasonable, can be internationalized and added to release too.
+
+ 2011-04-13 10:38 hvlad
+ M src/jrd/event.cpp
+Fixed bug CORE-3440 : AV in engine if isc_que_events queued 0 events
+
2011-04-12 12:47 hvlad
M src/common/config/config.cpp
Let config file detects literals "true", "yes" and "y" as TRUE boolean values.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-14 01:03:43 UTC (rev 52718)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-14 03:16:31 UTC (rev 52719)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29282
+ FORMAL BUILD NUMBER:29289
*/
-#define PRODUCT_VER_STRING "3.0.0.29282"
-#define FILE_VER_STRING "WI-T3.0.0.29282"
-#define LICENSE_VER_STRING "WI-T3.0.0.29282"
-#define FILE_VER_NUMBER 3, 0, 0, 29282
+#define PRODUCT_VER_STRING "3.0.0.29289"
+#define FILE_VER_STRING "WI-T3.0.0.29289"
+#define LICENSE_VER_STRING "WI-T3.0.0.29289"
+#define FILE_VER_NUMBER 3, 0, 0, 29289
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29282"
+#define FB_BUILD_NO "29289"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-14 01:03:43 UTC (rev 52718)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-14 03:16:31 UTC (rev 52719)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29282
+BuildNum=29289
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-15 03:15:57
|
Revision: 52728
http://firebird.svn.sourceforge.net/firebird/?rev=52728&view=rev
Author: firebirds
Date: 2011-04-15 03:15:51 +0000 (Fri, 15 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-15 02:51:29 UTC (rev 52727)
+++ firebird/trunk/ChangeLog 2011-04-15 03:15:51 UTC (rev 52728)
@@ -1,3 +1,15 @@
+ 2011-04-15 02:51 asfernandes
+ M src/common/classes/condition.h
+Misc.
+
+ 2011-04-14 13:21 asfernandes
+ M src/common/StatementMetadata.cpp
+License.
+
+ 2011-04-14 12:12 hvlad
+ M src/lock/lock.cpp
+Moved assertion out of loop else it could wrongly fire at second execution
+
2011-04-14 01:03 asfernandes
A src/common/StatementMetadata.cpp
A src/common/StatementMetadata.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-15 02:51:29 UTC (rev 52727)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-15 03:15:51 UTC (rev 52728)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29289
+ FORMAL BUILD NUMBER:29292
*/
-#define PRODUCT_VER_STRING "3.0.0.29289"
-#define FILE_VER_STRING "WI-T3.0.0.29289"
-#define LICENSE_VER_STRING "WI-T3.0.0.29289"
-#define FILE_VER_NUMBER 3, 0, 0, 29289
+#define PRODUCT_VER_STRING "3.0.0.29292"
+#define FILE_VER_STRING "WI-T3.0.0.29292"
+#define LICENSE_VER_STRING "WI-T3.0.0.29292"
+#define FILE_VER_NUMBER 3, 0, 0, 29292
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29289"
+#define FB_BUILD_NO "29292"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-15 02:51:29 UTC (rev 52727)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-15 03:15:51 UTC (rev 52728)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29289
+BuildNum=29292
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-16 03:17:46
|
Revision: 52737
http://firebird.svn.sourceforge.net/firebird/?rev=52737&view=rev
Author: firebirds
Date: 2011-04-16 03:17:39 +0000 (Sat, 16 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-15 18:54:02 UTC (rev 52736)
+++ firebird/trunk/ChangeLog 2011-04-16 03:17:39 UTC (rev 52737)
@@ -1,3 +1,28 @@
+ 2011-04-15 18:54 asfernandes
+ M src/include/ProviderInterface.h
+ M src/jrd/blb.cpp
+ M src/jrd/blb.h
+ M src/jrd/blb_proto.h
+ M src/jrd/blf_proto.h
+ M src/jrd/blob_filter.cpp
+ M src/jrd/jrd.cpp
+ M src/remote/client/interface.cpp
+ M src/yvalve/why.cpp
+Make the new BLOB API use void* buffers, so applications can read/write char* strings or any other type without casts.
+
+ 2011-04-15 16:37 dimitr
+ M src/jrd/jrd.cpp
+Fixed possible deadlock between the shutting down engine and the running service. Reported by RedSoft.
+
+ 2011-04-15 07:02 hvlad
+ M builds/win32/msvc8/common.vcproj
+ M builds/win32/msvc8/yvalve.vcproj
+Update MSVC8 build
+
+ 2011-04-15 06:19 hvlad
+ M src/lock/lock.cpp
+Correction. Thanks to Claudio.
+
2011-04-15 02:51 asfernandes
M src/common/classes/condition.h
Misc.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-15 18:54:02 UTC (rev 52736)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-16 03:17:39 UTC (rev 52737)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29292
+ FORMAL BUILD NUMBER:29296
*/
-#define PRODUCT_VER_STRING "3.0.0.29292"
-#define FILE_VER_STRING "WI-T3.0.0.29292"
-#define LICENSE_VER_STRING "WI-T3.0.0.29292"
-#define FILE_VER_NUMBER 3, 0, 0, 29292
+#define PRODUCT_VER_STRING "3.0.0.29296"
+#define FILE_VER_STRING "WI-T3.0.0.29296"
+#define LICENSE_VER_STRING "WI-T3.0.0.29296"
+#define FILE_VER_NUMBER 3, 0, 0, 29296
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29292"
+#define FB_BUILD_NO "29296"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-15 18:54:02 UTC (rev 52736)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-16 03:17:39 UTC (rev 52737)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29292
+BuildNum=29296
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-17 03:17:44
|
Revision: 52743
http://firebird.svn.sourceforge.net/firebird/?rev=52743&view=rev
Author: firebirds
Date: 2011-04-17 03:17:37 +0000 (Sun, 17 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-16 21:59:19 UTC (rev 52742)
+++ firebird/trunk/ChangeLog 2011-04-17 03:17:37 UTC (rev 52743)
@@ -1,3 +1,7 @@
+ 2011-04-16 21:59 asfernandes
+ M src/common/StatementMetadata.cpp
+Do not count selected records for IStatement::getAffectedRecords.
+
2011-04-15 18:54 asfernandes
M src/include/ProviderInterface.h
M src/jrd/blb.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-16 21:59:19 UTC (rev 52742)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-17 03:17:37 UTC (rev 52743)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29296
+ FORMAL BUILD NUMBER:29297
*/
-#define PRODUCT_VER_STRING "3.0.0.29296"
-#define FILE_VER_STRING "WI-T3.0.0.29296"
-#define LICENSE_VER_STRING "WI-T3.0.0.29296"
-#define FILE_VER_NUMBER 3, 0, 0, 29296
+#define PRODUCT_VER_STRING "3.0.0.29297"
+#define FILE_VER_STRING "WI-T3.0.0.29297"
+#define LICENSE_VER_STRING "WI-T3.0.0.29297"
+#define FILE_VER_NUMBER 3, 0, 0, 29297
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29296"
+#define FB_BUILD_NO "29297"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-16 21:59:19 UTC (rev 52742)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-17 03:17:37 UTC (rev 52743)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29296
+BuildNum=29297
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2011-04-17 05:02:32
|
Revision: 52745
http://firebird.svn.sourceforge.net/firebird/?rev=52745&view=rev
Author: robocop
Date: 2011-04-17 05:02:26 +0000 (Sun, 17 Apr 2011)
Log Message:
-----------
Misc.
Modified Paths:
--------------
firebird/trunk/builds/win32/msvc9/codes.vcproj
firebird/trunk/src/common/StatementMetadata.cpp
firebird/trunk/src/common/StatementMetadata.h
firebird/trunk/src/common/classes/condition.h
firebird/trunk/src/yvalve/why.cpp
Modified: firebird/trunk/builds/win32/msvc9/codes.vcproj
===================================================================
--- firebird/trunk/builds/win32/msvc9/codes.vcproj 2011-04-17 05:00:56 UTC (rev 52744)
+++ firebird/trunk/builds/win32/msvc9/codes.vcproj 2011-04-17 05:02:26 UTC (rev 52745)
@@ -319,42 +319,6 @@
<File
RelativePath="..\..\..\gen\misc\codes.cpp"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
- />
- </FileConfiguration>
</File>
</Filter>
<Filter
Modified: firebird/trunk/src/common/StatementMetadata.cpp
===================================================================
--- firebird/trunk/src/common/StatementMetadata.cpp 2011-04-17 05:00:56 UTC (rev 52744)
+++ firebird/trunk/src/common/StatementMetadata.cpp 2011-04-17 05:02:26 UTC (rev 52745)
@@ -333,6 +333,10 @@
}
}
+ // CVC: This routine assumes the input is well formed, hence at least check we didn't read
+ // beyond the buffer's end, although I would prefer to make the previous code more robust.
+ fb_assert(buffer <= bufferEnd);
+
for (ObjectsArray<Parameters::Item>::iterator i = inputParameters.items.begin();
i != inputParameters.items.end() && inputParameters.fetched;
++i)
Modified: firebird/trunk/src/common/StatementMetadata.h
===================================================================
--- firebird/trunk/src/common/StatementMetadata.h 2011-04-17 05:00:56 UTC (rev 52744)
+++ firebird/trunk/src/common/StatementMetadata.h 2011-04-17 05:02:26 UTC (rev 52745)
@@ -43,7 +43,7 @@
public:
struct Item : public PermanentStorage
{
- Item(MemoryPool& pool)
+ explicit Item(MemoryPool& pool)
: PermanentStorage(pool),
field(pool),
relation(pool),
@@ -71,7 +71,7 @@
};
public:
- Parameters(MemoryPool& pool)
+ explicit Parameters(MemoryPool& pool)
: PermanentStorage(pool),
items(pool),
fetched(false)
@@ -87,99 +87,81 @@
{
if (index < items.getCount())
return items[index].field.c_str();
- else
- {
- raiseIndexError(status, index, "getField");
- return NULL;
- }
+
+ raiseIndexError(status, index, "getField");
+ return NULL;
}
virtual const char* FB_CARG getRelation(IStatus* status, unsigned index) const
{
if (index < items.getCount())
return items[index].relation.c_str();
- else
- {
- raiseIndexError(status, index, "getRelation");
- return NULL;
- }
+
+ raiseIndexError(status, index, "getRelation");
+ return NULL;
}
virtual const char* FB_CARG getOwner(IStatus* status, unsigned index) const
{
if (index < items.getCount())
return items[index].owner.c_str();
- else
- {
- raiseIndexError(status, index, "getOwner");
- return NULL;
- }
+
+ raiseIndexError(status, index, "getOwner");
+ return NULL;
}
virtual const char* FB_CARG getAlias(IStatus* status, unsigned index) const
{
if (index < items.getCount())
return items[index].alias.c_str();
- else
- {
- raiseIndexError(status, index, "getAlias");
- return NULL;
- }
+
+ raiseIndexError(status, index, "getAlias");
+ return NULL;
}
virtual unsigned FB_CARG getType(IStatus* status, unsigned index) const
{
if (index < items.getCount())
return items[index].type;
- else
- {
- raiseIndexError(status, index, "getType");
- return 0;
- }
+
+ raiseIndexError(status, index, "getType");
+ return 0;
}
virtual bool FB_CARG isNullable(IStatus* status, unsigned index) const
{
if (index < items.getCount())
return items[index].nullable;
- else
- {
- raiseIndexError(status, index, "isNullable");
- return false;
- }
+
+ raiseIndexError(status, index, "isNullable");
+ return false;
}
virtual unsigned FB_CARG getSubType(IStatus* status, unsigned index) const
{
if (index < items.getCount())
return items[index].subType;
- else
- {
- raiseIndexError(status, index, "getSubType");
- return 0;
- }
+
+ raiseIndexError(status, index, "getSubType");
+ return 0;
}
virtual unsigned FB_CARG getLength(IStatus* status, unsigned index) const
{
if (index < items.getCount())
return items[index].length;
- else
- {
- raiseIndexError(status, index, "getLength");
- return 0;
- }
+
+ raiseIndexError(status, index, "getLength");
+ return 0;
}
virtual unsigned FB_CARG getScale(IStatus* status, unsigned index) const
{
if (index < items.getCount())
return items[index].scale;
- else
- {
- raiseIndexError(status, index, "getScale");
- return 0;
- }
+
+ raiseIndexError(status, index, "getScale");
+ return 0;
}
private:
Modified: firebird/trunk/src/common/classes/condition.h
===================================================================
--- firebird/trunk/src/common/classes/condition.h 2011-04-17 05:00:56 UTC (rev 52744)
+++ firebird/trunk/src/common/classes/condition.h 2011-04-17 05:02:26 UTC (rev 52745)
@@ -138,7 +138,8 @@
void init()
{
int err = pthread_cond_init(&cv, NULL);
- if (err != 0) {
+ if (err != 0)
+ {
//gds__log("Error on semaphore.h: constructor");
system_call_failed::raise("pthread_cond_init", err);
}
@@ -151,7 +152,8 @@
~Condition()
{
int err = pthread_cond_destroy(&cv);
- if (err != 0) {
+ if (err != 0)
+ {
//gds__log("Error on semaphore.h: destructor");
//system_call_failed::raise("pthread_cond_destroy", err);
}
Modified: firebird/trunk/src/yvalve/why.cpp
===================================================================
--- firebird/trunk/src/yvalve/why.cpp 2011-04-17 05:00:56 UTC (rev 52744)
+++ firebird/trunk/src/yvalve/why.cpp 2011-04-17 05:02:26 UTC (rev 52745)
@@ -1526,14 +1526,13 @@
if (!sqlda)
return;
- else
- {
- if (sqlda->version != SQLDA_VERSION1)
- error804(isc_dsql_sqlda_err);
- }
- USHORT count = sqlda->sqld;
+ if (sqlda->version != SQLDA_VERSION1)
+ error804(isc_dsql_sqlda_err);
+ const USHORT count = sqlda->sqld;
+ fb_assert(count < MAX_USHORT / 2); // Nobody does this, but...
+
if (count == 0)
return; // If there isn't an SQLDA, don't bother with anything else.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-18 03:17:32
|
Revision: 52750
http://firebird.svn.sourceforge.net/firebird/?rev=52750&view=rev
Author: firebirds
Date: 2011-04-18 03:17:25 +0000 (Mon, 18 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-17 16:04:43 UTC (rev 52749)
+++ firebird/trunk/ChangeLog 2011-04-18 03:17:25 UTC (rev 52750)
@@ -1,3 +1,32 @@
+ 2011-04-17 16:04 asfernandes
+ M src/common/StatementMetadata.cpp
+Misc
+
+ 2011-04-17 08:33 hvlad
+ M builds/win32/msvc10/common.vcxproj
+ M builds/win32/msvc10/common.vcxproj.filters
+ M builds/win32/msvc10/yvalve.vcxproj
+ M builds/win32/msvc10/yvalve.vcxproj.filters
+Update MSVC10 build
+
+ 2011-04-17 05:04 robocop
+ M src/yvalve/why.cpp
+Unused vars.
+
+ 2011-04-17 05:03 robocop
+ M builds/win32/msvc9/common.vcproj
+ M builds/win32/msvc9/isql.vcproj
+ M builds/win32/msvc9/yvalve.vcproj
+Follow Vlad's changes in VC8.
+
+ 2011-04-17 05:02 robocop
+ M builds/win32/msvc9/codes.vcproj
+ M src/common/StatementMetadata.cpp
+ M src/common/StatementMetadata.h
+ M src/common/classes/condition.h
+ M src/yvalve/why.cpp
+Misc.
+
2011-04-16 21:59 asfernandes
M src/common/StatementMetadata.cpp
Do not count selected records for IStatement::getAffectedRecords.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-17 16:04:43 UTC (rev 52749)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-18 03:17:25 UTC (rev 52750)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29297
+ FORMAL BUILD NUMBER:29302
*/
-#define PRODUCT_VER_STRING "3.0.0.29297"
-#define FILE_VER_STRING "WI-T3.0.0.29297"
-#define LICENSE_VER_STRING "WI-T3.0.0.29297"
-#define FILE_VER_NUMBER 3, 0, 0, 29297
+#define PRODUCT_VER_STRING "3.0.0.29302"
+#define FILE_VER_STRING "WI-T3.0.0.29302"
+#define LICENSE_VER_STRING "WI-T3.0.0.29302"
+#define FILE_VER_NUMBER 3, 0, 0, 29302
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29297"
+#define FB_BUILD_NO "29302"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-17 16:04:43 UTC (rev 52749)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-18 03:17:25 UTC (rev 52750)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29297
+BuildNum=29302
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-19 03:17:31
|
Revision: 52754
http://firebird.svn.sourceforge.net/firebird/?rev=52754&view=rev
Author: firebirds
Date: 2011-04-19 03:17:24 +0000 (Tue, 19 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-18 19:21:34 UTC (rev 52753)
+++ firebird/trunk/ChangeLog 2011-04-19 03:17:24 UTC (rev 52754)
@@ -1,3 +1,7 @@
+ 2011-04-18 19:21 asfernandes
+ M src/common/StatementMetadata.cpp
+Correction.
+
2011-04-17 16:04 asfernandes
M src/common/StatementMetadata.cpp
Misc
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-18 19:21:34 UTC (rev 52753)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-19 03:17:24 UTC (rev 52754)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29302
+ FORMAL BUILD NUMBER:29303
*/
-#define PRODUCT_VER_STRING "3.0.0.29302"
-#define FILE_VER_STRING "WI-T3.0.0.29302"
-#define LICENSE_VER_STRING "WI-T3.0.0.29302"
-#define FILE_VER_NUMBER 3, 0, 0, 29302
+#define PRODUCT_VER_STRING "3.0.0.29303"
+#define FILE_VER_STRING "WI-T3.0.0.29303"
+#define LICENSE_VER_STRING "WI-T3.0.0.29303"
+#define FILE_VER_NUMBER 3, 0, 0, 29303
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29302"
+#define FB_BUILD_NO "29303"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-18 19:21:34 UTC (rev 52753)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-19 03:17:24 UTC (rev 52754)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29302
+BuildNum=29303
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-20 03:18:15
|
Revision: 52760
http://firebird.svn.sourceforge.net/firebird/?rev=52760&view=rev
Author: firebirds
Date: 2011-04-20 03:18:09 +0000 (Wed, 20 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-19 15:29:46 UTC (rev 52759)
+++ firebird/trunk/ChangeLog 2011-04-20 03:18:09 UTC (rev 52760)
@@ -1,3 +1,15 @@
+ 2011-04-19 15:24 asfernandes
+ M src/burp/restore.epp
+Improvement CORE-3433 - Improve GBAK restore performance (records insertion).
+
+ 2011-04-19 15:24 asfernandes
+ M src/dsql/dsql.cpp
+ M src/dsql/movd.cpp
+ M src/dsql/movd_proto.h
+ M src/jrd/blb.cpp
+ M src/jrd/jrd.cpp
+Improvement CORE-3446 - Allow conversion from/to BLOBs and others types in the API functions (XSQLVAR or blr messages).
+
2011-04-18 19:21 asfernandes
M src/common/StatementMetadata.cpp
Correction.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-19 15:29:46 UTC (rev 52759)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-20 03:18:09 UTC (rev 52760)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29303
+ FORMAL BUILD NUMBER:29305
*/
-#define PRODUCT_VER_STRING "3.0.0.29303"
-#define FILE_VER_STRING "WI-T3.0.0.29303"
-#define LICENSE_VER_STRING "WI-T3.0.0.29303"
-#define FILE_VER_NUMBER 3, 0, 0, 29303
+#define PRODUCT_VER_STRING "3.0.0.29305"
+#define FILE_VER_STRING "WI-T3.0.0.29305"
+#define LICENSE_VER_STRING "WI-T3.0.0.29305"
+#define FILE_VER_NUMBER 3, 0, 0, 29305
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29303"
+#define FB_BUILD_NO "29305"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-19 15:29:46 UTC (rev 52759)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-20 03:18:09 UTC (rev 52760)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29303
+BuildNum=29305
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-21 03:17:22
|
Revision: 52778
http://firebird.svn.sourceforge.net/firebird/?rev=52778&view=rev
Author: firebirds
Date: 2011-04-21 03:17:16 +0000 (Thu, 21 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-20 11:44:42 UTC (rev 52777)
+++ firebird/trunk/ChangeLog 2011-04-21 03:17:16 UTC (rev 52778)
@@ -1,3 +1,12 @@
+ 2011-04-20 07:03 robocop
+ M builds/win32/make_all.bat
+It would be better to copy the file from the place where it exists.
+:-)
+
+ 2011-04-20 07:02 robocop
+ M builds/win32/msvc9/fbguard.vcproj
+Delete obsolete option (not supported).
+
2011-04-19 15:24 asfernandes
M src/burp/restore.epp
Improvement CORE-3433 - Improve GBAK restore performance (records insertion).
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-20 11:44:42 UTC (rev 52777)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-21 03:17:16 UTC (rev 52778)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29305
+ FORMAL BUILD NUMBER:29307
*/
-#define PRODUCT_VER_STRING "3.0.0.29305"
-#define FILE_VER_STRING "WI-T3.0.0.29305"
-#define LICENSE_VER_STRING "WI-T3.0.0.29305"
-#define FILE_VER_NUMBER 3, 0, 0, 29305
+#define PRODUCT_VER_STRING "3.0.0.29307"
+#define FILE_VER_STRING "WI-T3.0.0.29307"
+#define LICENSE_VER_STRING "WI-T3.0.0.29307"
+#define FILE_VER_NUMBER 3, 0, 0, 29307
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29305"
+#define FB_BUILD_NO "29307"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-20 11:44:42 UTC (rev 52777)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-21 03:17:16 UTC (rev 52778)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29305
+BuildNum=29307
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-26 03:19:55
|
Revision: 52811
http://firebird.svn.sourceforge.net/firebird/?rev=52811&view=rev
Author: firebirds
Date: 2011-04-26 03:19:48 +0000 (Tue, 26 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-26 01:00:33 UTC (rev 52810)
+++ firebird/trunk/ChangeLog 2011-04-26 03:19:48 UTC (rev 52811)
@@ -1,3 +1,45 @@
+ 2011-04-26 01:00 asfernandes
+ M src/jrd/Attachment.cpp
+ M src/jrd/EngineInterface.h
+ M src/jrd/blb.h
+ M src/jrd/extds/InternalDS.cpp
+ M src/jrd/jrd.cpp
+ M src/yvalve/why.cpp
+Misc; reinterpret to static casts; correction in YRequest version.
+
+ 2011-04-25 17:47 alexpeshkoff
+ M src/burp/burp.cpp
+ D src/common/classes/PublicHandle.cpp
+ D src/common/classes/PublicHandle.h
+ M src/dsql/dsql.cpp
+ M src/dsql/dsql.h
+ M src/include/ProviderInterface.h
+ M src/jrd/Attachment.cpp
+ M src/jrd/Attachment.h
+ M src/jrd/Database.h
+ A src/jrd/EngineInterface.h
+ M src/jrd/JrdStatement.cpp
+ M src/jrd/JrdStatement.h
+ M src/jrd/blb.cpp
+ M src/jrd/blb.h
+ M src/jrd/extds/InternalDS.cpp
+ M src/jrd/extds/InternalDS.h
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd_proto.h
+ M src/jrd/tra.cpp
+ M src/jrd/tra.h
+ M src/remote/client/interface.cpp
+ M src/yvalve/why.cpp
+1. Use reference counted stable in global pool objects instead PublicHandle's validation.
+2. Avoid massive segfaults when closing heavily loaded server.
+3. Restored logic in YValve required for correct shutdown.
+4. Do not change externally visible request body when preparing it.
+
+ 2011-04-25 12:56 hvlad
+ M src/common/isc_sync.cpp
+Frontported fix for regression introduced by me in patch for CORE-3326 - too many unnecessary calls of ISC_check_process_existence().
+Added defines to switch usage of fast mutex off if necessary.
+
2011-04-20 07:03 robocop
M builds/win32/make_all.bat
It would be better to copy the file from the place where it exists.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-26 01:00:33 UTC (rev 52810)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-26 03:19:48 UTC (rev 52811)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29307
+ FORMAL BUILD NUMBER:29310
*/
-#define PRODUCT_VER_STRING "3.0.0.29307"
-#define FILE_VER_STRING "WI-T3.0.0.29307"
-#define LICENSE_VER_STRING "WI-T3.0.0.29307"
-#define FILE_VER_NUMBER 3, 0, 0, 29307
+#define PRODUCT_VER_STRING "3.0.0.29310"
+#define FILE_VER_STRING "WI-T3.0.0.29310"
+#define LICENSE_VER_STRING "WI-T3.0.0.29310"
+#define FILE_VER_NUMBER 3, 0, 0, 29310
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29307"
+#define FB_BUILD_NO "29310"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-26 01:00:33 UTC (rev 52810)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-26 03:19:48 UTC (rev 52811)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29307
+BuildNum=29310
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-27 03:17:40
|
Revision: 52818
http://firebird.svn.sourceforge.net/firebird/?rev=52818&view=rev
Author: firebirds
Date: 2011-04-27 03:17:33 +0000 (Wed, 27 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-26 15:23:33 UTC (rev 52817)
+++ firebird/trunk/ChangeLog 2011-04-27 03:17:33 UTC (rev 52818)
@@ -1,3 +1,28 @@
+ 2011-04-26 15:23 asfernandes
+ M src/jrd/jrd.cpp
+Correction for statement repreparation.
+
+ 2011-04-26 08:03 alexpeshkoff
+ M src/yvalve/why.cpp
+Fixed bug - thanks to Adriano
+
+ 2011-04-26 07:05 hvlad
+ M builds/win32/msvc10/common.vcxproj
+ M builds/win32/msvc10/common.vcxproj.filters
+ M builds/win32/msvc10/engine.vcxproj
+ M builds/win32/msvc10/engine.vcxproj.filters
+Update MSVC10 build
+
+ 2011-04-26 06:59 hvlad
+ M builds/win32/msvc9/common.vcproj
+ M builds/win32/msvc9/engine.vcproj
+Update MSVC9 build
+
+ 2011-04-26 06:57 hvlad
+ M builds/win32/msvc8/common.vcproj
+ M builds/win32/msvc8/engine.vcproj
+Update MSVC8 build
+
2011-04-26 01:00 asfernandes
M src/jrd/Attachment.cpp
M src/jrd/EngineInterface.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-26 15:23:33 UTC (rev 52817)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-27 03:17:33 UTC (rev 52818)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29310
+ FORMAL BUILD NUMBER:29315
*/
-#define PRODUCT_VER_STRING "3.0.0.29310"
-#define FILE_VER_STRING "WI-T3.0.0.29310"
-#define LICENSE_VER_STRING "WI-T3.0.0.29310"
-#define FILE_VER_NUMBER 3, 0, 0, 29310
+#define PRODUCT_VER_STRING "3.0.0.29315"
+#define FILE_VER_STRING "WI-T3.0.0.29315"
+#define LICENSE_VER_STRING "WI-T3.0.0.29315"
+#define FILE_VER_NUMBER 3, 0, 0, 29315
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29310"
+#define FB_BUILD_NO "29315"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-26 15:23:33 UTC (rev 52817)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-27 03:17:33 UTC (rev 52818)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29310
+BuildNum=29315
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-28 03:16:51
|
Revision: 52831
http://firebird.svn.sourceforge.net/firebird/?rev=52831&view=rev
Author: firebirds
Date: 2011-04-28 03:16:44 +0000 (Thu, 28 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-27 12:55:50 UTC (rev 52830)
+++ firebird/trunk/ChangeLog 2011-04-28 03:16:44 UTC (rev 52831)
@@ -1,3 +1,7 @@
+ 2011-04-27 06:31 alexpeshkoff
+ M src/jrd/jrd.cpp
+Check att_in_use before cancelling operation of attachment
+
2011-04-26 15:23 asfernandes
M src/jrd/jrd.cpp
Correction for statement repreparation.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-27 12:55:50 UTC (rev 52830)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-28 03:16:44 UTC (rev 52831)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29315
+ FORMAL BUILD NUMBER:29316
*/
-#define PRODUCT_VER_STRING "3.0.0.29315"
-#define FILE_VER_STRING "WI-T3.0.0.29315"
-#define LICENSE_VER_STRING "WI-T3.0.0.29315"
-#define FILE_VER_NUMBER 3, 0, 0, 29315
+#define PRODUCT_VER_STRING "3.0.0.29316"
+#define FILE_VER_STRING "WI-T3.0.0.29316"
+#define LICENSE_VER_STRING "WI-T3.0.0.29316"
+#define FILE_VER_NUMBER 3, 0, 0, 29316
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29315"
+#define FB_BUILD_NO "29316"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-27 12:55:50 UTC (rev 52830)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-28 03:16:44 UTC (rev 52831)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29315
+BuildNum=29316
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hv...@us...> - 2011-04-28 14:36:10
|
Revision: 52832
http://firebird.svn.sourceforge.net/firebird/?rev=52832&view=rev
Author: hvlad
Date: 2011-04-28 14:35:58 +0000 (Thu, 28 Apr 2011)
Log Message:
-----------
Preparing for the shared page cache : new sync objects ported from Vulcan
Modified Paths:
--------------
firebird/trunk/builds/win32/msvc10/common.vcxproj
firebird/trunk/builds/win32/msvc10/common.vcxproj.filters
firebird/trunk/builds/win32/msvc8/common.vcproj
firebird/trunk/builds/win32/msvc9/common.vcproj
firebird/trunk/src/common/ThreadStart.cpp
firebird/trunk/src/common/classes/alloc.h
firebird/trunk/src/common/classes/fb_atomic.h
Added Paths:
-----------
firebird/trunk/src/common/classes/SyncObject.cpp
firebird/trunk/src/common/classes/SyncObject.h
firebird/trunk/src/common/classes/Synchronize.cpp
firebird/trunk/src/common/classes/Synchronize.h
Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/common.vcxproj 2011-04-28 03:16:44 UTC (rev 52831)
+++ firebird/trunk/builds/win32/msvc10/common.vcxproj 2011-04-28 14:35:58 UTC (rev 52832)
@@ -35,6 +35,8 @@
<ClCompile Include="..\..\..\src\common\classes\SafeArg.cpp" />
<ClCompile Include="..\..\..\src\common\classes\semaphore.cpp" />
<ClCompile Include="..\..\..\src\common\classes\Switches.cpp" />
+ <ClCompile Include="..\..\..\src\common\classes\Synchronize.cpp" />
+ <ClCompile Include="..\..\..\src\common\classes\SyncObject.cpp" />
<ClCompile Include="..\..\..\src\common\classes\TempFile.cpp" />
<ClCompile Include="..\..\..\src\common\classes\timestamp.cpp" />
<ClCompile Include="..\..\..\src\common\classes\UserBlob.cpp" />
@@ -102,7 +104,6 @@
<ClInclude Include="..\..\..\src\common\classes\Hash.h" />
<ClInclude Include="..\..\..\src\common\classes\ImplementHelper.h" />
<ClInclude Include="..\..\..\src\common\classes\init.h" />
- <ClInclude Include="..\..\..\src\common\classes\Interface.h" />
<ClInclude Include="..\..\..\src\common\classes\Interlock.h" />
<ClInclude Include="..\..\..\src\common\classes\locks.h" />
<ClInclude Include="..\..\..\src\common\classes\MetaName.h" />
@@ -119,6 +120,8 @@
<ClInclude Include="..\..\..\src\common\classes\sparse_bitmap.h" />
<ClInclude Include="..\..\..\src\common\classes\stack.h" />
<ClInclude Include="..\..\..\src\common\classes\Switches.h" />
+ <ClInclude Include="..\..\..\src\common\classes\Synchronize.h" />
+ <ClInclude Include="..\..\..\src\common\classes\SyncObject.h" />
<ClInclude Include="..\..\..\src\common\classes\TempFile.h" />
<ClInclude Include="..\..\..\src\common\classes\timestamp.h" />
<ClInclude Include="..\..\..\src\common\classes\tree.h" />
Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj.filters
===================================================================
--- firebird/trunk/builds/win32/msvc10/common.vcxproj.filters 2011-04-28 03:16:44 UTC (rev 52831)
+++ firebird/trunk/builds/win32/msvc10/common.vcxproj.filters 2011-04-28 14:35:58 UTC (rev 52832)
@@ -186,6 +186,12 @@
<ClCompile Include="..\..\..\src\common\StatementMetadata.cpp">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\common\classes\Synchronize.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\common\classes\SyncObject.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\common\xdr_proto.h">
@@ -365,9 +371,6 @@
<ClInclude Include="..\..\..\src\common\classes\init.h">
<Filter>headers</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\src\common\classes\Interface.h">
- <Filter>headers</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\src\common\classes\Interlock.h">
<Filter>headers</Filter>
</ClInclude>
@@ -482,5 +485,11 @@
<ClInclude Include="..\..\..\src\common\StatementMetadata.h">
<Filter>headers</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\src\common\classes\SyncObject.h">
+ <Filter>headers</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\common\classes\Synchronize.h">
+ <Filter>headers</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
Modified: firebird/trunk/builds/win32/msvc8/common.vcproj
===================================================================
--- firebird/trunk/builds/win32/msvc8/common.vcproj 2011-04-28 03:16:44 UTC (rev 52831)
+++ firebird/trunk/builds/win32/msvc8/common.vcproj 2011-04-28 14:35:58 UTC (rev 52832)
@@ -281,7 +281,7 @@
</File>
<File
RelativePath="..\..\..\src\common\config\os\win32\config_root.cpp"
- >
+ >
</File>
<File
RelativePath="..\..\..\src\common\config\ConfigCache.cpp"
@@ -317,7 +317,7 @@
</File>
<File
RelativePath="..\..\..\src\common\dllinst.cpp"
- >
+ >
</File>
<File
RelativePath="..\..\..\src\common\dsc.cpp"
@@ -496,6 +496,14 @@
>
</File>
<File
+ RelativePath="..\..\..\src\common\classes\Synchronize.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\common\classes\SyncObject.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\common\classes\TempFile.cpp"
>
</File>
@@ -689,10 +697,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\common\classes\Interface.h"
- >
- </File>
- <File
RelativePath="..\..\..\src\common\classes\Interlock.h"
>
</File>
@@ -845,6 +849,14 @@
>
</File>
<File
+ RelativePath="..\..\..\src\common\classes\Synchronize.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\common\classes\SyncObject.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\common\classes\TempFile.h"
>
</File>
Modified: firebird/trunk/builds/win32/msvc9/common.vcproj
===================================================================
--- firebird/trunk/builds/win32/msvc9/common.vcproj 2011-04-28 03:16:44 UTC (rev 52831)
+++ firebird/trunk/builds/win32/msvc9/common.vcproj 2011-04-28 14:35:58 UTC (rev 52832)
@@ -496,6 +496,14 @@
>
</File>
<File
+ RelativePath="..\..\..\src\common\classes\Synchronize.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\common\classes\SyncObject.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\common\classes\TempFile.cpp"
>
</File>
@@ -689,10 +697,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\common\classes\Interface.h"
- >
- </File>
- <File
RelativePath="..\..\..\src\common\classes\Interlock.h"
>
</File>
@@ -845,6 +849,14 @@
>
</File>
<File
+ RelativePath="..\..\..\src\common\classes\Synchronize.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\common\classes\SyncObject.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\common\classes\TempFile.h"
>
</File>
Modified: firebird/trunk/src/common/ThreadStart.cpp
===================================================================
--- firebird/trunk/src/common/ThreadStart.cpp 2011-04-28 03:16:44 UTC (rev 52831)
+++ firebird/trunk/src/common/ThreadStart.cpp 2011-04-28 14:35:58 UTC (rev 52832)
@@ -48,6 +48,7 @@
#include "../common/classes/locks.h"
#include "../common/classes/rwlock.h"
+#include "../common/classes/Synchronize.h"
namespace
@@ -57,6 +58,7 @@
THREAD_ENTRY_DECLARE threadStart(THREAD_ENTRY_PARAM arg)
{
fb_assert(arg);
+ Firebird::ThreadSync thread("threadStart");
MemoryPool::setContextPool(getDefaultMemoryPool());
{
ThreadPriorityScheduler* tps = static_cast<ThreadPriorityScheduler*>(arg);
@@ -107,6 +109,7 @@
THREAD_ENTRY_DECLARE threadStart(THREAD_ENTRY_PARAM arg)
{
fb_assert(arg);
+ Firebird::ThreadSync thread("threadStart");
MemoryPool::setContextPool(getDefaultMemoryPool());
ThreadArgs localArgs(*static_cast<ThreadArgs*>(arg));
delete static_cast<ThreadArgs*>(arg);
Added: firebird/trunk/src/common/classes/SyncObject.cpp
===================================================================
--- firebird/trunk/src/common/classes/SyncObject.cpp (rev 0)
+++ firebird/trunk/src/common/classes/SyncObject.cpp 2011-04-28 14:35:58 UTC (rev 52832)
@@ -0,0 +1,490 @@
+/*
+ *
+ * The contents of this file are subject to the Initial
+ * Developer's Public License Version 1.0 (the "License");
+ * you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ * http://www.ibphoenix.com/idpl.html.
+ *
+ * Software distributed under the License is distributed on
+ * an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the License for the specific
+ * language governing rights and limitations under the License.
+ *
+ * The contents of this file or any work derived from this file
+ * may not be distributed under any other license whatsoever
+ * without the express prior written permission of the original
+ * author.
+ *
+ *
+ * The Original Code was created by James A. Starkey for IBPhoenix.
+ *
+ * Copyright (c) 1997 - 2000, 2001, 2003 James A. Starkey
+ * Copyright (c) 1997 - 2000, 2001, 2003 Netfrastructure, Inc.
+ * All Rights Reserved.
+ *
+ * The \xD1ode was ported into Firebird Open Source RDBMS project by
+ * Vladyslav Khorsun at 2010
+ *
+ * Contributor(s):
+ */
+
+#include "../../common/common.h"
+#include "../../common/gdsassert.h"
+#include "fb_exception.h"
+
+#include "SyncObject.h"
+#include "Synchronize.h"
+#include "Interlock.h"
+
+namespace Firebird {
+
+
+void SyncObject::lock(Sync *sync, LockType type)
+{
+ ThreadSync *thread = NULL;
+
+ if (type == Shared)
+ {
+ //while (true)
+ while (waiters == 0)
+ {
+ const AtomicCounter::counter_type oldState = lockState;
+ if (oldState < 0)
+ break;
+
+ const AtomicCounter::counter_type newState = oldState + 1;
+ if (lockState.compareExchange(oldState, newState))
+ {
+ WAIT_FOR_FLUSH_CACHE
+ return;
+ }
+ }
+
+ mutex.enter();
+ ++waiters;
+
+ //while (true)
+ while (waitingThreads == NULL)
+ {
+ const AtomicCounter::counter_type oldState = lockState;
+ if (oldState < 0)
+ break;
+
+ const AtomicCounter::counter_type newState = oldState + 1;
+ if (lockState.compareExchange(oldState, newState))
+ {
+ --waiters;
+ mutex.leave();
+ return;
+ }
+ }
+
+ thread = ThreadSync::findThread();
+ fb_assert(thread);
+ }
+ else
+ {
+ thread = ThreadSync::findThread();
+ fb_assert(thread);
+
+ if (thread == exclusiveThread)
+ {
+ ++monitorCount;
+ return;
+ }
+
+ while (waiters == 0)
+ {
+ const AtomicCounter::counter_type oldState = lockState;
+ if (oldState != 0)
+ break;
+
+ if (lockState.compareExchange(oldState, -1))
+ {
+ exclusiveThread = thread;
+ WAIT_FOR_FLUSH_CACHE
+ return;
+ }
+ }
+
+ mutex.enter();
+ ++waiters;
+
+ while (waitingThreads == NULL)
+ {
+ const AtomicCounter::counter_type oldState = lockState;
+ if (oldState != 0)
+ break;
+
+ if (lockState.compareExchange(oldState, -1))
+ {
+ exclusiveThread = thread;
+ --waiters;
+ mutex.leave();
+ return;
+ }
+ }
+ }
+
+ wait(type, thread, sync);
+}
+
+bool SyncObject::lockConditional(LockType type)
+{
+ if (waitingThreads)
+ return false;
+
+ if (type == Shared)
+ {
+ while (true)
+ {
+ const AtomicCounter::counter_type oldState = lockState;
+ if (oldState < 0)
+ break;
+
+ const AtomicCounter::counter_type newState = oldState + 1;
+ if (lockState.compareExchange(oldState, newState))
+ {
+ WAIT_FOR_FLUSH_CACHE
+ return true;
+ }
+ }
+
+ return false;
+ }
+ else
+ {
+ ThreadSync *thread = ThreadSync::findThread();
+ fb_assert(thread);
+
+ if (thread == exclusiveThread)
+ {
+ ++monitorCount;
+ return true;
+ }
+
+ while (waiters == 0)
+ {
+ const AtomicCounter::counter_type oldState = lockState;
+ if (oldState != 0)
+ break;
+
+ if (lockState.compareExchange(oldState, -1))
+ {
+ WAIT_FOR_FLUSH_CACHE
+ exclusiveThread = thread;
+ return true;
+ }
+ }
+
+ return false;
+ }
+}
+
+void SyncObject::unlock(Sync *sync, LockType type)
+{
+ fb_assert((type == Shared && lockState > 0) ||
+ (type == Exclusive && lockState == -1));
+
+ if (monitorCount)
+ {
+ fb_assert(monitorCount > 0);
+ --monitorCount;
+ return;
+ }
+
+ while (true)
+ {
+ const AtomicCounter::counter_type oldState = lockState;
+ const AtomicCounter::counter_type newState = (type == Shared) ? oldState - 1 : 0;
+ exclusiveThread = NULL;
+
+ FLUSH_CACHE
+
+ if (lockState.compareExchange(oldState, newState))
+ {
+ if (waiters) {
+ grantLocks();
+ }
+ return;
+ }
+ }
+}
+
+void SyncObject::unlock()
+{
+ if (lockState > 0) {
+ unlock(NULL, Shared);
+ }
+ else if (lockState == -1) {
+ unlock(NULL, Exclusive);
+ }
+ else {
+ fb_assert(false);
+ }
+}
+
+void SyncObject::downGrade(LockType type)
+{
+ fb_assert(monitorCount == 0);
+ fb_assert(type == Shared);
+ fb_assert(lockState == -1);
+ fb_assert(exclusiveThread);
+ fb_assert(exclusiveThread == ThreadSync::findThread());
+
+ FLUSH_CACHE
+
+ while (true)
+ {
+ if (lockState.compareExchange(-1, 1))
+ {
+ if (waiters) {
+ grantLocks();
+ }
+ return;
+ }
+ }
+}
+
+void SyncObject::wait(LockType type, ThreadSync *thread, Sync *sync)
+{
+/*
+ ThreadSync *volatile *ptr = &waitingThreads;
+
+ for (; *ptr; ptr = &(*ptr)->nextWaiting)
+ {
+ if (*ptr == thread)
+ {
+ LOG_DEBUG ("Apparent single thread deadlock for thread %d (%x)\n", thread->threadId, thread);
+ //for (ThreadSync *thread = que; thread; thread = thread->que)
+ // thread->print();
+ mutex.leave();
+ fatal_exception::raise("single thread deadlock");
+ }
+ }
+*/
+ if (thread->nextWaiting)
+ {
+ mutex.leave();
+ fatal_exception::raise("single thread deadlock");
+ }
+
+ if (waitingThreads)
+ {
+ thread->prevWaiting = waitingThreads->prevWaiting;
+ thread->nextWaiting = waitingThreads;
+
+ waitingThreads->prevWaiting->nextWaiting = thread;
+ waitingThreads->prevWaiting = thread;
+ }
+ else
+ {
+ thread->prevWaiting = thread->nextWaiting = thread;
+ waitingThreads = thread;
+ }
+
+// thread->nextWaiting = NULL;
+ thread->lockType = type;
+// *ptr = thread;
+ thread->lockGranted = false;
+ thread->lockPending = sync;
+ mutex.leave();
+
+ while (!thread->lockGranted)
+ {
+ const bool wakeup = thread->sleep(10000);
+ if (thread->lockGranted)
+ break;
+
+ if (!wakeup)
+ {
+ // stalled(thread);
+ break;
+ }
+ }
+
+ while (!thread->lockGranted)
+ thread->sleep();
+}
+
+
+/**
+void SyncObject::grantLocks(void)
+{
+ mutex.enter();
+ fb_assert((waiters && waitingThreads) || (!waiters && !waitingThreads));
+
+ ThreadSync *volatile *ptr = &waitingThreads;
+ ThreadSync *thread = *ptr;
+ while (thread = *ptr)
+ {
+ bool granted = false;
+
+ if (thread->lockType == Shared)
+ {
+ AtomicCounter::counter_type oldState = lockState;
+ while (oldState >= 0)
+ {
+ const AtomicCounter::counter_type newState = oldState + 1;
+ if (lockState.compareExchange(oldState, newState))
+ {
+ *ptr = thread->nextWaiting;
+ granted = true;
+ --waiters;
+ thread->grantLock(this);
+ break;
+ }
+ oldState = lockState;
+ }
+ }
+ else
+ {
+ while (lockState == 0)
+ {
+ if (lockState.compareExchange(0, -1))
+ {
+ *ptr = thread->nextWaiting;
+ granted = true;
+ exclusiveThread = thread;
+ --waiters;
+ thread->grantLock(this);
+ break;
+ }
+ }
+ }
+
+ if (!granted) {
+ break;
+ ptr = &thread->nextWaiting;
+ }
+ }
+
+ mutex.leave();
+}
+**/
+
+ThreadSync* SyncObject::grantThread(ThreadSync *thread)
+{
+ ThreadSync* next = NULL;
+ if (thread == thread->nextWaiting)
+ {
+ thread->nextWaiting = thread->prevWaiting = NULL;
+ waitingThreads = NULL;
+ }
+ else
+ {
+ next = thread->nextWaiting;
+
+ thread->prevWaiting->nextWaiting = next;
+ next->prevWaiting = thread->prevWaiting;
+
+ thread->nextWaiting = thread->prevWaiting = NULL;
+ if (waitingThreads == thread)
+ waitingThreads = next;
+ }
+
+ --waiters;
+ thread->grantLock(this);
+ return next;
+}
+
+void SyncObject::grantLocks(void)
+{
+ mutex.enter();
+ fb_assert((waiters && waitingThreads) || (!waiters && !waitingThreads));
+
+ ThreadSync *thread = waitingThreads;
+ while (thread)
+ {
+ bool granted = false;
+
+ if (thread->lockType == Shared)
+ {
+ AtomicCounter::counter_type oldState = lockState;
+ while (oldState >= 0)
+ {
+ const AtomicCounter::counter_type newState = oldState + 1;
+ if (lockState.compareExchange(oldState, newState))
+ {
+ granted = true;
+ thread = grantThread(thread);
+ break;
+ }
+ oldState = lockState;
+ }
+ }
+ else
+ {
+ while (lockState == 0)
+ {
+ if (lockState.compareExchange(0, -1))
+ {
+ granted = true;
+ exclusiveThread = thread;
+ thread = grantThread(thread);
+ break;
+ }
+ }
+ }
+
+ if (!granted) {
+ break;
+ //thread = thread->nextWaiting;
+ //if (thread == waitingThreads)
+ // break;
+ }
+ }
+
+ mutex.leave();
+}
+
+
+void SyncObject::validate(LockType lockType)
+{
+ switch (lockType)
+ {
+ case None:
+ fb_assert(lockState == 0);
+ break;
+
+ case Shared:
+ fb_assert(lockState > 0);
+ break;
+
+ case Exclusive:
+ fb_assert(lockState == -1);
+ break;
+ }
+}
+
+
+bool SyncObject::ourExclusiveLock(void) const
+{
+ if (lockState != -1)
+ return false;
+
+// fb_assert(exclusiveThread);
+ return (exclusiveThread == ThreadSync::findThread());
+}
+
+/**
+void SyncObject::sysServiceFailed(const char* service, int code)
+{
+ throw OSRIException (isc_sys_request,
+ isc_arg_string, service,
+ SYS_ARG, code,
+ isc_arg_end);
+}
+
+void SyncObject::assertionFailed(void)
+{
+ throw OSRIException (isc_sys_request,
+ isc_arg_string, "SyncObject assertion failed",
+ SYS_ARG, lockState,
+ isc_arg_end);
+}
+**/
+
+
+} // namespace Firebird
Property changes on: firebird/trunk/src/common/classes/SyncObject.cpp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: firebird/trunk/src/common/classes/SyncObject.h
===================================================================
--- firebird/trunk/src/common/classes/SyncObject.h (rev 0)
+++ firebird/trunk/src/common/classes/SyncObject.h 2011-04-28 14:35:58 UTC (rev 52832)
@@ -0,0 +1,478 @@
+/*
+ *
+ * The contents of this file are subject to the Initial
+ * Developer's Public License Version 1.0 (the "License");
+ * you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ * http://www.ibphoenix.com/idpl.html.
+ *
+ * Software distributed under the License is distributed on
+ * an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the License for the specific
+ * language governing rights and limitations under the License.
+ *
+ * The contents of this file or any work derived from this file
+ * may not be distributed under any other license whatsoever
+ * without the express prior written permission of the original
+ * author.
+ *
+ *
+ * The Original Code was created by James A. Starkey for IBPhoenix.
+ *
+ * Copyright (c) 1997 - 2000, 2001, 2003 James A. Starkey
+ * Copyright (c) 1997 - 2000, 2001, 2003 Netfrastructure, Inc.
+ * All Rights Reserved.
+ *
+ * The \xD1ode was ported into Firebird Open Source RDBMS project by
+ * Vladyslav Khorsun at 2010
+ *
+ * Contributor(s):
+ */
+
+#ifndef CLASSES_SYNCOBJECT_H
+#define CLASSES_SYNCOBJECT_H
+
+#include "../../common/classes/fb_atomic.h"
+#include "../../common/classes/locks.h"
+
+namespace Firebird {
+
+#define LOG_DEBUG
+#define ASSERT fb_assert
+
+enum LockType {
+ None,
+ Exclusive,
+ Shared,
+ Invalid
+};
+
+class Sync;
+class ThreadSync;
+
+class SynchronizationObject
+{
+public:
+ virtual void lock(Sync *sync, LockType type) = 0;
+ virtual void unlock(Sync *sync, LockType type) = 0;
+ virtual void downGrade(LockType type) = 0;
+};
+
+class SyncObject : public SynchronizationObject
+{
+public:
+ SyncObject()
+ {
+ waiters = 0;
+ monitorCount = 0;
+ exclusiveThread = NULL;
+ waitingThreads = NULL;
+ }
+
+ virtual ~SyncObject()
+ {}
+
+ virtual void lock(Sync *sync, LockType type);
+ bool lockConditional(LockType type);
+
+ virtual void unlock(Sync *sync, LockType type);
+ void unlock(void);
+
+ virtual void downGrade(LockType type);
+
+ LockType getState(void) const
+ {
+ if (lockState.value() == 0)
+ return None;
+
+ if (lockState.value() < 0)
+ return Exclusive;
+
+ return Shared;
+ }
+
+ bool isLocked() const
+ {
+ return lockState.value() != 0;
+ }
+
+ bool hasContention() const
+ {
+ return (waiters.value() > 0);
+ }
+
+ bool ourExclusiveLock(void) const;
+
+ void sysServiceFailed(const char* service, int code);
+ void assertionFailed(void);
+
+protected:
+ void wait(LockType type, ThreadSync *thread, Sync *sync);
+ ThreadSync* grantThread(ThreadSync *thread);
+ void grantLocks(void);
+ void validate(LockType lockType);
+
+ AtomicCounter lockState;
+ AtomicCounter waiters;
+ //int waiters;
+ int monitorCount;
+ Mutex mutex;
+ ThreadSync *volatile exclusiveThread;
+ ThreadSync *volatile waitingThreads;
+};
+
+
+class Sync
+{
+public:
+ Sync(SynchronizationObject *obj, const char *fromWhere)
+ {
+ ASSERT(obj);
+ syncObject = obj;
+ prior = NULL;
+ where = fromWhere;
+ state = request = None;
+ }
+
+ ~Sync()
+ {
+ ASSERT(state != Invalid);
+
+ if (syncObject && state != None)
+ {
+ syncObject->unlock(this, state);
+ state = Invalid;
+ }
+ }
+
+ void lock(LockType type)
+ {
+ request = type;
+ syncObject->lock(this, type);
+ state = type;
+ }
+
+ void lock(LockType type, const char *fromWhere)
+ {
+ where = fromWhere;
+ lock(type);
+ }
+
+ void unlock()
+ {
+ ASSERT(state != None);
+ syncObject->unlock(this, state);
+ state = None;
+ }
+
+ void downGrade(LockType type)
+ {
+ ASSERT(state == Exclusive);
+ syncObject->downGrade(type);
+ state = Shared;
+ }
+
+ void setObject(SynchronizationObject *obj)
+ {
+ if (syncObject && state != None)
+ syncObject->unlock(this, state);
+
+ state = None;
+ syncObject = obj;
+ }
+
+
+protected:
+ LockType state;
+ LockType request;
+ SynchronizationObject *syncObject;
+ Sync *prior; // not used
+ const char *where;
+
+friend class ThreadSync;
+};
+
+
+class SyncLockGuard : public Sync
+{
+public:
+ SyncLockGuard(SynchronizationObject *obj, LockType type, const char *fromWhere) :
+ Sync(obj, fromWhere)
+ {
+ lock(type);
+ }
+
+ ~SyncLockGuard()
+ {
+ //ASSERT(state != None);
+ if (state != None)
+ unlock();
+ }
+};
+
+class SyncUnlockGuard : public Sync
+{
+public:
+ SyncUnlockGuard(SynchronizationObject *obj, const char *fromWhere) :
+ Sync(obj, fromWhere)
+ {
+ oldState = state;
+
+ ASSERT(oldState != None);
+ if (oldState != None)
+ unlock();
+ }
+
+ ~SyncUnlockGuard()
+ {
+ if (oldState != None)
+ lock(oldState);
+ }
+
+private:
+ LockType oldState;
+};
+
+} // namespace Firebird
+
+#endif // CLASSES_SYNCOBJECT_H
+
+/*
+ *
+ * The contents of this file are subject to the Initial
+ * Developer's Public License Version 1.0 (the "License");
+ * you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ * http://www.ibphoenix.com/idpl.html.
+ *
+ * Software distributed under the License is distributed on
+ * an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the License for the specific
+ * language governing rights and limitations under the License.
+ *
+ * The contents of this file or any work derived from this file
+ * may not be distributed under any other license whatsoever
+ * without the express prior written permission of the original
+ * author.
+ *
+ *
+ * The Original Code was created by James A. Starkey for IBPhoenix.
+ *
+ * Copyright (c) 1997 - 2000, 2001, 2003 James A. Starkey
+ * Copyright (c) 1997 - 2000, 2001, 2003 Netfrastructure, Inc.
+ * All Rights Reserved.
+ *
+ * The \xD1ode was ported into Firebird Open Source RDBMS project by
+ * Vladyslav Khorsun at 2010
+ *
+ * Contributor(s):
+ */
+
+#ifndef CLASSES_SYNCOBJECT_H
+#define CLASSES_SYNCOBJECT_H
+
+#include "../../common/classes/fb_atomic.h"
+#include "../../common/classes/locks.h"
+
+namespace Firebird {
+
+#define LOG_DEBUG
+#define ASSERT fb_assert
+
+enum LockType {
+ None,
+ Exclusive,
+ Shared,
+ Invalid
+};
+
+class Sync;
+class ThreadSync;
+
+class SynchronizationObject
+{
+public:
+ virtual void lock(Sync *sync, LockType type) = 0;
+ virtual void unlock(Sync *sync, LockType type) = 0;
+ virtual void downGrade(LockType type) = 0;
+};
+
+class SyncObject : public SynchronizationObject
+{
+public:
+ SyncObject()
+ {
+ waiters = 0;
+ monitorCount = 0;
+ exclusiveThread = NULL;
+ waitingThreads = NULL;
+ }
+
+ virtual ~SyncObject()
+ {}
+
+ virtual void lock(Sync *sync, LockType type);
+ bool lockConditional(LockType type);
+
+ virtual void unlock(Sync *sync, LockType type);
+ void unlock(void);
+
+ virtual void downGrade(LockType type);
+
+ LockType getState(void) const
+ {
+ if (lockState.value() == 0)
+ return None;
+
+ if (lockState.value() < 0)
+ return Exclusive;
+
+ return Shared;
+ }
+
+ bool isLocked() const
+ {
+ return lockState.value() != 0;
+ }
+
+ bool hasContention() const
+ {
+ return (waiters.value() > 0);
+ }
+
+ bool ourExclusiveLock(void) const;
+
+ void sysServiceFailed(const char* service, int code);
+ void assertionFailed(void);
+
+protected:
+ void wait(LockType type, ThreadSync *thread, Sync *sync);
+ ThreadSync* grantThread(ThreadSync *thread);
+ void grantLocks(void);
+ void validate(LockType lockType);
+
+ AtomicCounter lockState;
+ AtomicCounter waiters;
+ //int waiters;
+ int monitorCount;
+ Mutex mutex;
+ ThreadSync *volatile exclusiveThread;
+ ThreadSync *volatile waitingThreads;
+};
+
+
+class Sync
+{
+public:
+ Sync(SynchronizationObject *obj, const char *fromWhere)
+ {
+ ASSERT(obj);
+ syncObject = obj;
+ prior = NULL;
+ where = fromWhere;
+ state = request = None;
+ }
+
+ ~Sync()
+ {
+ ASSERT(state != Invalid);
+
+ if (syncObject && state != None)
+ {
+ syncObject->unlock(this, state);
+ state = Invalid;
+ }
+ }
+
+ void lock(LockType type)
+ {
+ request = type;
+ syncObject->lock(this, type);
+ state = type;
+ }
+
+ void lock(LockType type, const char *fromWhere)
+ {
+ where = fromWhere;
+ lock(type);
+ }
+
+ void unlock()
+ {
+ ASSERT(state != None);
+ syncObject->unlock(this, state);
+ state = None;
+ }
+
+ void downGrade(LockType type)
+ {
+ ASSERT(state == Exclusive);
+ syncObject->downGrade(type);
+ state = Shared;
+ }
+
+ void setObject(SynchronizationObject *obj)
+ {
+ if (syncObject && state != None)
+ syncObject->unlock(this, state);
+
+ state = None;
+ syncObject = obj;
+ }
+
+
+protected:
+ LockType state;
+ LockType request;
+ SynchronizationObject *syncObject;
+ Sync *prior; // not used
+ const char *where;
+
+friend class ThreadSync;
+};
+
+
+class SyncLockGuard : public Sync
+{
+public:
+ SyncLockGuard(SynchronizationObject *obj, LockType type, const char *fromWhere) :
+ Sync(obj, fromWhere)
+ {
+ lock(type);
+ }
+
+ ~SyncLockGuard()
+ {
+ //ASSERT(state != None);
+ if (state != None)
+ unlock();
+ }
+};
+
+class SyncUnlockGuard : public Sync
+{
+public:
+ SyncUnlockGuard(SynchronizationObject *obj, const char *fromWhere) :
+ Sync(obj, fromWhere)
+ {
+ oldState = state;
+
+ ASSERT(oldState != None);
+ if (oldState != None)
+ unlock();
+ }
+
+ ~SyncUnlockGuard()
+ {
+ if (oldState != None)
+ lock(oldState);
+ }
+
+private:
+ LockType oldState;
+};
+
+} // namespace Firebird
+
+#endif // CLASSES_SYNCOBJECT_H
+
Property changes on: firebird/trunk/src/common/classes/SyncObject.h
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: firebird/trunk/src/common/classes/Synchronize.cpp
===================================================================
--- firebird/trunk/src/common/classes/Synchronize.cpp (rev 0)
+++ firebird/trunk/src/common/classes/Synchronize.cpp 2011-04-28 14:35:58 UTC (rev 52832)
@@ -0,0 +1,327 @@
+/*
+*
+* The contents of this file are subject to the Initial
+* Developer's Public License Version 1.0 (the "License");
+* you may not use this file except in compliance with the
+* License. You may obtain a copy of the License at
+* http://www.ibphoenix.com/idpl.html.
+*
+* Software distributed under the License is distributed on
+* an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
+* express or implied. See the License for the specific
+* language governing rights and limitations under the License.
+*
+* The contents of this file or any work derived from this file
+* may not be distributed under any other license whatsoever
+* without the express prior written permission of the original
+* author.
+*
+*
+* The Original Code was created by James A. Starkey for IBPhoenix.
+*
+* Copyright (c) 1997 - 2000, 2001, 2003 James A. Starkey
+* Copyright (c) 1997 - 2000, 2001, 2003 Netfrastructure, Inc.
+* All Rights Reserved.
+*
+* The \xD1ode was ported into Firebird Open Source RDBMS project by
+* Vladyslav Khorsun at 2010
+*
+* Contributor(s):
+*/
+
+#include "../../common/common.h"
+#include "fb_tls.h"
+#include "../thd.h"
+
+#include "SyncObject.h"
+#include "Synchronize.h"
+
+#define NANO 1000000000
+#define MICRO 1000000
+
+namespace Firebird {
+
+Synchronize::Synchronize()
+{
+ shutdownInProgress = false;
+ sleeping = false;
+ wakeup = false;
+
+#ifdef _WIN32
+ evnt = CreateEvent(NULL, false, false, NULL);
+#endif
+
+#ifdef _PTHREADS
+ int ret = pthread_mutex_init(&mutex, NULL);
+ pthread_cond_init(&condition, NULL);
+#endif
+
+#ifdef SOLARIS_MT
+ int ret = mutex_init(&mutex, USYNC_THREAD, NULL);
+ cond_init(&condition, USYNC_THREAD, NULL);
+#endif
+}
+
+Synchronize::~Synchronize()
+{
+#ifdef _WIN32
+ CloseHandle(evnt);
+#endif
+
+#ifdef _PTHREADS
+ int ret = pthread_mutex_destroy(&mutex);
+ ret = pthread_cond_destroy(&condition);
+#endif
+
+#ifdef SOLARIS_MT
+ int ret = mutex_destroy(&mutex);
+#endif
+}
+
+
+void Synchronize::sleep()
+{
+ sleeping = true;
+#ifdef _WIN32
+#ifdef _DEBUG
+ for (;;)
+ {
+ const int n = WaitForSingleObject(evnt, 10000);
+ if (n != WAIT_TIMEOUT)
+ break;
+ }
+#else
+ sleep (INFINITE);
+#endif
+#endif
+
+#ifdef _PTHREADS
+ int ret = pthread_mutex_lock(&mutex);
+ CHECK_RET("pthread_mutex_lock failed, errno %d", errno);
+
+ while (!wakeup)
+ pthread_cond_wait(&condition, &mutex);
+
+ wakeup = false;
+ ret = pthread_mutex_unlock(&mutex);
+ CHECK_RET("pthread_mutex_unlock failed, errno %d", errno);
+#endif
+
+#ifdef SOLARIS_MT
+ int ret = mutex_lock(&mutex);
+ CHECK_RET("mutex_lock failed, errno %d", errno);
+
+ while (!wakeup)
+ cond_wait(&condition, &mutex);
+
+ wakeup = false;
+ ret = mutex_unlock(&mutex);
+ CHECK_RET("mutex_unlock failed, errno %d", errno);
+#endif
+
+ sleeping = false;
+}
+
+bool Synchronize::sleep(int milliseconds)
+{
+ sleeping = true;
+
+#ifdef _WIN32
+ const int n = WaitForSingleObject(evnt, milliseconds);
+ sleeping = false;
+
+ return n != WAIT_TIMEOUT;
+#endif
+
+#ifdef _PTHREADS
+ struct timeval microTime;
+ int ret = gettimeofday(µTime, NULL);
+ SINT64 nanos = (SINT64) microTime.tv_sec * NANO + microTime.tv_usec * 1000 +
+ (SINT64) milliseconds * 1000000;
+ struct timespec nanoTime;
+ nanoTime.tv_sec = nanos / NANO;
+ nanoTime.tv_nsec = nanos % NANO;
+ ret = pthread_mutex_lock (&mutex);
+ CHECK_RET("pthread_mutex_lock failed, errno %d", errno);
+ int seconds = nanoTime.tv_sec - microTime.tv_sec;
+
+ while (!wakeup)
+ {
+#ifdef MVS
+ ret = pthread_cond_timedwait(&condition, &mutex, &nanoTime);
+ if (ret == -1 && errno == EAGAIN)
+ ret = ETIMEDOUT;
+ break;
+#else
+ ret = pthread_cond_timedwait(&condition, &mutex, &nanoTime);
+ if (ret == ETIMEDOUT)
+ break;
+#endif
+ /***
+ if (!wakeup)
+ Log::debug ("Synchronize::sleep(milliseconds): unexpected wakeup, ret %d\n", ret);
+ ***/
+ }
+
+ sleeping = false;
+ wakeup = false;
+ pthread_mutex_unlock(&mutex);
+ return ret != ETIMEDOUT;
+#endif
+
+#ifdef SOLARIS_MT
+ struct timeval microTime;
+ int ret = gettimeofday(µTime, NULL);
+ SINT64 nanos = (SINT64) microTime.tv_sec * NANO + microTime.tv_usec * 1000 +
+ (SINT64) milliseconds * 1000000;
+ struct timespec nanoTime;
+ nanoTime.tv_sec = nanos / NANO;
+ nanoTime.tv_nsec = nanos % NANO;
+ ret = mutex_lock (&mutex);
+ CHECK_RET("mutex_lock failed, errno %d", errno);
+ int seconds = nanoTime.tv_sec - microTime.tv_sec;
+
+ while (!wakeup)
+ {
+ ret = cond_timedwait(&condition, &mutex, &nanoTime);
+ if (ret == ETIMEDOUT)
+ break;
+ /***
+ if (!wakeup)
+ Log::debug ("Synchronize::sleep(milliseconds): unexpected wakeup, ret %d\n", ret);
+ ***/
+ }
+
+ sleeping = false;
+ wakeup = false;
+ mutex_unlock(&mutex);
+
+ return ret != ETIMEDOUT;
+#endif
+}
+
+void Synchronize::wake()
+{
+#ifdef _WIN32
+ SetEvent (evnt);
+#endif
+
+#ifdef _PTHREADS
+ int ret = pthread_mutex_lock(&mutex);
+ CHECK_RET("pthread_mutex_lock failed, errno %d", errno);
+ wakeup = true;
+ pthread_cond_broadcast(&condition);
+ ret = pthread_mutex_unlock(&mutex);
+ CHECK_RET("pthread_mutex_unlock failed, errno %d", errno);
+#endif
+
+#ifdef SOLARIS_MT
+ int ret = mutex_lock(&mutex);
+ CHECK_RET("mutex_lock failed, errno %d", errno);
+ wakeup = true;
+ cond_broadcast(&condition);
+ ret = mutex_unlock(&mutex);
+ CHECK_RET("mutex_unlock failed, errno %d", errno);
+#endif
+}
+
+void Synchronize::shutdown()
+{
+ shutdownInProgress = true;
+ wake();
+}
+
+
+
+/// ThreadSync
+
+TLS_DECLARE (ThreadSync*, threadIndex);
+
+ThreadSync::ThreadSync(const char *desc)
+{
+ init(desc);
+ setThread(this);
+}
+
+void ThreadSync::init(const char *desc)
+{
+ description = desc;
+ threadId = getCurrentThreadId();
+ prevWaiting = nextWaiting = NULL;
+ lockType = None;
+ lockGranted = false;
+ lockPending = NULL;
+ locks = NULL;
+}
+
+ThreadSync::~ThreadSync()
+{
+ setThread (NULL);
+}
+
+
+ThreadSync* ThreadSync::findThread()
+{
+ return TLS_GET(threadIndex);
+}
+
+
+ThreadSync* ThreadSync::getThread(const char *desc)
+{
+ ThreadSync *thread = findThread();
+
+ if (!thread)
+ {
+ thread = new ThreadSync (desc);
+ setThread(thread);
+ }
+
+ return thread;
+}
+
+void ThreadSync::setThread(ThreadSync *thread)
+{
+ TLS_SET(threadIndex, thread);
+}
+
+FB_THREAD_ID ThreadSync::getCurrentThreadId(void)
+{
+ return getThreadId();
+}
+
+
+const char* ThreadSync::getWhere()
+{
+ if (lockPending && lockPending->where)
+ return lockPending->where;
+
+ return "";
+}
+
+
+void ThreadSync::validateLocks()
+{
+ ThreadSync *thread = getThread("ThreadSync::validateLocks");
+
+ // hvlad: not worked
+ if (thread->locks)
+ {
+ LOG_DEBUG ("thread %d has active locks:\n", thread->threadId);
+ for (Sync *sync = thread->locks; sync; sync = sync->prior)
+ LOG_DEBUG (" %s\n", sync->where);
+ }
+}
+
+
+void ThreadSync::grantLock(SyncObject *lock)
+{
+ ASSERT(!lockGranted);
+ ASSERT(!lockPending || lockPending->syncObject == lock);
+
+ lockGranted = true;
+ lockPending = NULL;
+
+ wake();
+}
+
+} // namespace Firebird
Property changes on: firebird/trunk/src/common/classes/Synchronize.cpp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: firebird/trunk/src/common/classes/Synchronize.h
===================================================================
--- firebird/trunk/src/common/classes/Synchronize.h (rev 0)
+++ firebird/trunk/src/common/classes/Synchronize.h 2011-04-28 14:35:58 UTC (rev 52832)
@@ -0,0 +1,111 @@
+/*
+ *
+ * The contents of this file are subject to the Initial
+ * Developer's Public License Version 1.0 (the "License");
+ * you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ * http://www.ibphoenix.com/idpl.html.
+ *
+ * Software distributed under the License is distributed on
+ * an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the License for the specific
+ * language governing rights and limitations under the License.
+ *
+ * The contents of this file or any work derived from this file
+ * may not be distributed under any other license whatsoever
+ * without the express prior written permission of the original
+ * author.
+ *
+ *
+ * The Original Code was created by James A. Starkey for IBPhoenix.
+ *
+ * Copyright (c) 1997 - 2000, 2001, 2003 James A. Starkey
+ * Copyright (c) 1997 - 2000, 2001, 2003 Netfrastructure, Inc.
+ * All Rights Reserved.
+ *
+ * The \xD1ode was ported into Firebird Open Source RDBMS project by
+ * Vladyslav Khorsun at 2010
+ *
+ * Contributor(s):
+ */
+
+#ifndef CLASSES_SYNCHRONIZE_H
+#define CLASSES_SYNCHRONIZE_H
+
+#include "../../common/common.h"
+#include "../../common/classes/SyncObject.h"
+
+
+namespace Firebird {
+
+class Synchronize
+{
+public:
+ Synchronize();
+ virtual ~Synchronize();
+
+ virtual void shutdown();
+ void wake();
+ bool sleep(int milliseconds);
+ void sleep();
+
+protected:
+ bool shutdownInProgress;
+ bool sleeping;
+ volatile bool wakeup;
+ SINT64 waitTime;
+
+#ifdef _WIN32
+ void *evnt;
+#endif
+
+#ifdef _PTHREADS
+ pthread_cond_t condition;
+ pthread_mutex_t mutex;
+#endif
+
+#ifdef SOLARIS_MT
+ cond_t condition;
+ mutex_t mutex;
+#endif
+};
+
+
+class Sync;
+class SyncObject;
+
+class ThreadSync : public Synchronize
+{
+public:
+ ThreadSync(const char *desc);
+ virtual ~ThreadSync();
+
+ void init(const char *description);
+
+ static ThreadSync* findThread();
+ static ThreadSync* getThread(const char *desc);
+ static FB_THREAD_ID getCurrentThreadId(void);
+
+ const char* getWhere();
+
+ static void validateLocks();
+ void grantLock(SyncObject *lock);
+
+ FB_THREAD_ID threadId;
+ ThreadSync *nextWaiting; // next thread in sleep que (see SyncObject)
+ ThreadSync *prevWaiting; // previous thread in sleep que (see SyncObject)
+ LockType lockType; // requested lock type (see SyncObject)
+ volatile bool lockGranted;
+ Sync *lockPending;
+ Sync *locks;
+ const char *description;
+
+protected:
+ static void setThread (ThreadSync *thread);
+};
+
+
+} // namespace Firebird
+
+#endif // CLASSES_SYNCHRONIZE_H
+
Property changes on: firebird/trunk/src/common/classes/Synchronize.h
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: firebird/trunk/src/common/classes/alloc.h
===================================================================
--- firebird/trunk/src/common/classes/alloc.h 2011-04-28 03:16:44 UTC (rev 52831)
+++ firebird/trunk/src/common/classes/alloc.h 2011-04-28 14:35:58 UTC (rev 52832)
@@ -130,7 +130,7 @@
{
for (MemoryStats* statistics = this; statistics; statistics = statistics->mst_parent)
{
- const size_t temp = statistics->mst_usage += size;
+ const size_t temp = statistics->mst_usage.exchangeAdd(size) + size;
if (temp > statistics->mst_max_usage)
statistics->mst_max_usage = temp;
}
@@ -148,7 +148,7 @@
{
for (MemoryStats* statistics = this; statistics; statistics = statistics->mst_parent)
{
- const size_t temp = statistics->mst_mapped += size;
+ const size_t temp = statistics->mst_mapped.exchangeAdd(size) + size;
if (temp > statistics->mst_max_mapped)
statistics->mst_max_mapped = temp;
}
Modified: firebird/trunk/src/common/classes/fb_atomic.h
===================================================================
--- firebird/trunk/src/common/classes/fb_atomic.h 2011-04-28 03:16:44 UTC (rev 52831)
+++ firebird/trunk/src/common/classes/fb_atomic.h 2011-04-28 14:35:58 UTC (rev 52832)
@@ -35,9 +35,23 @@
typedef SLONG AtomicType;
#endif
+// IMPORTANT !
+// Most of the interlocked functions returns "old" value of operand (except of
+// InterlockedIncrement and InterlockedDecrement on Windows) and this is correct
+// as "old" value impossible to restore from "new" value and operation parameters
+// and "new" value could be changed at time when code looks at it.
+// This (returning of original value) is not how operators such as "=", "+=",
+// "&=" etc, usually works. Therefore overloaded operators in AtomicCounter class
+// are void and all of them have corresponding equivalent functions returning
+// "old" value of operand.
+// The only exceptions from this rule is unary increment and decrement (for
+// historical reasons). Use it with care ! If one need old value of just
+// incremented atomic variable he should use exchangeAdd, not operator++.
+
#if defined(WIN_NT)
#include <windows.h>
+#include <intrin.h>
namespace Firebird {
@@ -55,60 +69,165 @@
explicit AtomicCounter(counter_type val = 0) : counter(val) {}
~AtomicCounter() {}
+ // returns old value
counter_type exchangeAdd(counter_type val)
{
#ifdef _WIN64
- return InterlockedExchangeAdd64(&counter, val);
+ return _InterlockedExchangeAdd64(&counter, val);
#else
- return InterlockedExchangeAdd(&counter, val);
+ return _InterlockedExchangeAdd(&counter, val);
#endif
}
- counter_type operator +=(counter_type val)
+ bool compareExchange(counter_type oldVal, counter_type newVal)
{
- return exchangeAdd(val) + val;
+#ifdef _WIN64
+ return (_InterlockedCompareExchange64(&counter, newVal, oldVal) == oldVal);
+#else
+ return (_InterlockedCompareExchange(&counter, newVal, oldVal) == oldVal);
+#endif
}
- counter_type operator -=(counter_type val)
+ void setValue(counter_type val)
{
- return exchangeAdd(-val) - val;
+#ifdef _WIN64
+ _InterlockedExchange64(&counter, val);
+#else
+ _InterlockedExchange(&counter, val);
+#endif
}
+// platform-independent code
+
+ counter_type value() const { return counter; }
+
+ // returns old value
+ counter_type exchangeBitAnd(counter_type val)
+ {
+ while (true)
+ {
+ volatile counter_type oldVal = counter;
+
+ if (compareExchange(oldVal, oldVal & val))
+ return oldVal;
+ }
+ }
+
+ // returns old value
+ counter_type exchangeBitOr(counter_type val)
+ {
+ while (true)
+ {
+ volatile counter_type oldVal = counter;
+
+ if (compareExchange(oldVal, oldVal | val))
+ return oldVal;
+ }
+ }
+
+
+ // returns old value
+ counter_type exchangeGreater(counter_type val)
+ {
+ while (true)
+ {
+ volatile counter_type oldVal = counter;
+
+ if (oldVal >= val)
+ return oldVal;
+
+ if (compareExchange(oldVal, val))
+ return oldVal;
+ }
+ }
+
+ operator counter_type () const
+ {
+ return value();
+ }
+
+ void operator =(counter_type val)
+ {
+ setValue(val);
+ }
+
+ // returns new value !
counter_type operator ++()
{
-#ifdef _WIN64
- return InterlockedIncrement64(&counter);
-#else
- return InterlockedIncrement(&counter);
-#endif
+ return exchangeAdd(1) + 1;
}
+ // returns new value !
counter_type operator --()
{
+ return exchangeAdd(-1) - 1;
+ }
+
+ void operator +=(counter_type val)
+ {
+ exchangeAdd(val);
+ }
+
+ void operator -=(counter_type val)
+ {
+ exchangeAdd(-val);
+ }
+
+ void operator &=(counter_type val)
+ {
+ exchangeBitAnd(val);
+ }
+
+ void operator |=(counter_type val)
+ {
+ exchangeBitOr(val);
+ }
+
+private:
+#if defined(MINGW)
+ counter_type counter;
+#else
+ volatile counter_type counter;
+#endif
+};
+
+
+
+template <typename T>
+class AtomicPointer
+{
+public:
+ explicit AtomicPointer(T* val = NULL) : pointer(val) {}
+ ~AtomicPointer() {}
+
+ T* value() const { return (T*)pointer; }
+
+ void setValue(T* val)
+ {
#ifdef _WIN64
- return InterlockedDecrement64(&counter);
+ _InterlockedExchangePointer((volatile PVOID*)&pointer, val);
#else
- return InterlockedDecrement(&counter);
+ //InterlockedExchangePointer((volatile PVOID*)&pointer, val);
+ _InterlockedExchange((LONG volatile*)&pointer, (LONG)val);
#endif
}
- counter_type value() const { return counter; }
-
- counter_type setValue(counter_type val)
+ bool compareExchange(T* oldVal, T* newVal)
{
#ifdef _WIN64
- return InterlockedExchange64(&counter, val);
+ return (_InterlockedCompareExchangePointer((PVOID volatile*)&pointer, newVal, oldVal) == oldVal);
#else
- return InterlockedExchange(&counter, val);
+ //return (InterlockedCompareExchangePointer((PVOID volatile*)&pointer, newVal, oldVal) == oldVal);
+ return ((PVOID)(LONG_PTR)_InterlockedCompareExchange((LONG volatile*)&pointer, (LONG)newVal, (LONG)oldVal)) == oldVal;
#endif
}
+ operator T* () const { return value(); }
+ T* operator ->() const { return value(); }
+ void operator =(T* val) { setValue(val); }
+
private:
-# if defined(MINGW)
- counter_type counter;
-# else
- volatile counter_type counter;
-# endif
+ volatile T* pointer;
};
} // namespace Firebird
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-04-29 03:18:36
|
Revision: 52838
http://firebird.svn.sourceforge.net/firebird/?rev=52838&view=rev
Author: firebirds
Date: 2011-04-29 03:18:30 +0000 (Fri, 29 Apr 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2011-04-28 16:59:29 UTC (rev 52837)
+++ firebird/trunk/ChangeLog 2011-04-29 03:18:30 UTC (rev 52838)
@@ -1,3 +1,28 @@
+ 2011-04-28 16:59 dimitr
+ M src/common/classes/SyncObject.cpp
+ M src/common/classes/SyncObject.h
+ M src/common/classes/Synchronize.cpp
+ M src/common/classes/Synchronize.h
+Misc.
+
+ 2011-04-28 14:39 hvlad
+ M src/common/classes/SyncObject.h
+correction
+
+ 2011-04-28 14:35 hvlad
+ M builds/win32/msvc10/common.vcxproj
+ M builds/win32/msvc10/common.vcxproj.filters
+ M builds/win32/msvc8/common.vcproj
+ M builds/win32/msvc9/common.vcproj
+ M src/common/ThreadStart.cpp
+ A src/common/classes/SyncObject.cpp
+ A src/common/classes/SyncObject.h
+ A src/common/classes/Synchronize.cpp
+ A src/common/classes/Synchronize.h
+ M src/common/classes/alloc.h
+ M src/common/classes/fb_atomic.h
+Preparing for the shared page cache : new sync objects ported from Vulcan
+
2011-04-27 06:31 alexpeshkoff
M src/jrd/jrd.cpp
Check att_in_use before cancelling operation of attachment
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-04-28 16:59:29 UTC (rev 52837)
+++ firebird/trunk/src/jrd/build_no.h 2011-04-29 03:18:30 UTC (rev 52838)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29316
+ FORMAL BUILD NUMBER:29319
*/
-#define PRODUCT_VER_STRING "3.0.0.29316"
-#define FILE_VER_STRING "WI-T3.0.0.29316"
-#define LICENSE_VER_STRING "WI-T3.0.0.29316"
-#define FILE_VER_NUMBER 3, 0, 0, 29316
+#define PRODUCT_VER_STRING "3.0.0.29319"
+#define FILE_VER_STRING "WI-T3.0.0.29319"
+#define LICENSE_VER_STRING "WI-T3.0.0.29319"
+#define FILE_VER_NUMBER 3, 0, 0, 29319
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29316"
+#define FB_BUILD_NO "29319"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-04-28 16:59:29 UTC (rev 52837)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-04-29 03:18:30 UTC (rev 52838)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29316
+BuildNum=29319
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X