firebird-checkins — CVS checkins

[Firebird-checkins] CVS: interbase/firebird/bellardo/darwin makefile,1.1,1.2

[John B. <bel...@us...>]

Update of /cvsroot/firebird/interbase/firebird/bellardo/darwin
In directory usw-pr-cvs1:/tmp/cvs-serv14440

Modified Files:
	makefile 
Log Message:
Updated to reflect the name change of the Info.plist file.


Index: makefile
===================================================================
RCS file: /cvsroot/firebird/interbase/firebird/bellardo/darwin/makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** makefile	2001/02/04 04:06:13	1.1
--- makefile	2001/04/09 16:56:23	1.2
***************
*** 43,47 ****
  	-rm -f .codes >> /dev/null
  
! install_package:
  	rm -rf firebird_install
  	mkdir firebird_install
--- 43,47 ----
  	-rm -f .codes >> /dev/null
  
! install_package: files/addServEnt
  	rm -rf firebird_install
  	mkdir firebird_install

[Firebird-checkins] CVS: interbase/builds/original prefix.darwin,1.1,1.2

[John B. <bel...@us...>]

Update of /cvsroot/firebird/interbase/builds/original
In directory usw-pr-cvs1:/tmp/cvs-serv13827

Modified Files:
	prefix.darwin 
Log Message:
Removed references to -lcc and added path need to compile in OS X.


Index: prefix.darwin
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/prefix.darwin,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** prefix.darwin	2001/02/04 05:35:43	1.1
--- prefix.darwin	2001/04/09 16:53:48	1.2
***************
*** 76,80 ****
  GDS_PYXIS=		gds_pyxis.a
  GDSLIB_BACKEND=		source/interbase/lib/gds_b.a
! GDSLIB_LINK=		-Lsource/jrd -lgds_b -lcc
  LINK_OPTS=		-Fsource/interbase -framework Firebird
  GPRE_BOOT_LINK_OPTS=	
--- 76,80 ----
  GDS_PYXIS=		gds_pyxis.a
  GDSLIB_BACKEND=		source/interbase/lib/gds_b.a
! GDSLIB_LINK=		-Lsource/jrd -lgds_b
  LINK_OPTS=		-Fsource/interbase -framework Firebird
  GPRE_BOOT_LINK_OPTS=	
***************
*** 105,109 ****
  LANGUAGES=		cc cxx ada microfocus_cob make16 gdl1
  LD_LIBS=		-lcc_dynamic
! LD_LIBS_J=		-lcc
  LD_OPTS=		-dylib
  LOCK_JRD_MISC=		
--- 105,109 ----
  LANGUAGES=		cc cxx ada microfocus_cob make16 gdl1
  LD_LIBS=		-lcc_dynamic
! LD_LIBS_J=		
  LD_OPTS=		-dylib
  LOCK_JRD_MISC=		
***************
*** 130,134 ****
  SPECIAL_OPT=		source/special_opt
  NETWORK_LIB=		
! SOCKET_LIB=		-lcc
  THREAD_LIB=		-lpthread
  SUN_FUNCSHR=		$(FUNCSHR)
--- 130,134 ----
  SPECIAL_OPT=		source/special_opt
  NETWORK_LIB=		
! SOCKET_LIB=		
  THREAD_LIB=		-lpthread
  SUN_FUNCSHR=		$(FUNCSHR)
***************
*** 136,140 ****
  SUPER_CLIENT_GDSSHR=    $(LX_SUPER_GDSSHR)
  SUPER_BACKEND=		source/jrd/gds_ss.a
! SUPER_LINK=		-Lsource/jrd -lgds_ss -lcc -lpthread
  SUPER_SERVER=	
  UTILITIES=		
--- 136,140 ----
  SUPER_CLIENT_GDSSHR=    $(LX_SUPER_GDSSHR)
  SUPER_BACKEND=		source/jrd/gds_ss.a
! SUPER_LINK=		-Lsource/jrd -lgds_ss -lpthread
  SUPER_SERVER=	
  UTILITIES=		
***************
*** 174,177 ****
--- 174,178 ----
  
  MSG_INSTALL_CMD=	$(CP) source/interbase/interbase.msg source/interbase/Firebird.framework/Resources/English.lproj
+ CARBONCORE_DIR_FLAG=	-F/System/Library/Frameworks/CoreServices.framework/Frameworks
  
  #   End of file prefix.macos:	$(VERSION)	$(PLATFORM)

[Firebird-checkins] CVS: interbase/firebird/bellardo/darwin FrameworkInfo.plist,NONE,1.1 Info.plist,1.1,NONE

[John B. <bel...@us...>]

Update of /cvsroot/firebird/interbase/firebird/bellardo/darwin
In directory usw-pr-cvs1:/tmp/cvs-serv27189

Added Files:
	FrameworkInfo.plist 
Removed Files:
	Info.plist 
Log Message:
Renamed Info.plist to FrameworkInfo.plist


--- NEW FILE ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
<plist version="0.9">
<dict>
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleExecutable</key>
        <string>Firebird</string>
        <key>CFBundleIdentifier</key>
        <string>com.firebird.Firebird</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>__VERSION__</string>
        <key>CFBundlePackageType</key>
        <string>FMWK</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <string>__VERSION__</string>
</dict>
</plist>


--- Info.plist DELETED ---

[Firebird-checkins] CVS: interbase ChangeLog,1.21,1.22

[Frank Schlottmann-G. <fs...@us...>]

Update of /cvsroot/firebird/interbase
In directory usw-pr-cvs1:/tmp/cvs-serv23947/interbase

Modified Files:
	ChangeLog 
Log Message:
Updated ChangeLog


Index: ChangeLog
===================================================================
RCS file: /cvsroot/firebird/interbase/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** ChangeLog	2001/03/27 13:04:17	1.21
--- ChangeLog	2001/04/05 19:05:47	1.22
***************
*** 1,2 ****
--- 1,17 ----
+ 2001-04-05 19:05  skywalker
+ 
+ 	* interbase/: builds_win32/original/metadata.sql, burp/backup.e,
+ 	burp/burp.c, burp/burp.h, burp/mvol.c, burp/restore.e,
+ 	dsql/pass1.c, dudley/ddl.h, iscguard/cntl_guard.c,
+ 	iscguard/iscguard.c, iscguard/iscguard.rc, jrd/event.c, jrd/ini.e,
+ 	jrd/ods.h, jrd/pag.h, jrd/sdw.c, jrd/utl.c, jrd/winnt.c,
+ 	remote/cntl.c, remote/ibconfig.c, remote/ibconfig.rc,
+ 	remote/inet.c, remote/property.c, remote/property.rc,
+ 	utilities/dba.e, utilities/dba_full.e, utilities/sbc_print.c,
+ 	utilities/security.e:
+ 	
+ 	Committed Changes made in the borland tree Committed Changes made
+ 	by Mike Nordel re, 64 bit io for win32 and bug fixes
+ 
  2001-03-26 00:29  nmcc
  
***************
*** 540,547 ****
  	
  	Changed all $Log$
! 	Changed all Revision 1.21  2001/03/27 13:04:17  fsg
! 	Changed all Marked *.gbak files as binaries
! 	Changed all
! 	Changed all fsg
  	Changed all tags to $Id$ BTW this will hopefully set
  	this_build to 2 :-)
--- 555,560 ----
  	
  	Changed all $Log$
! 	Changed all Revision 1.22  2001/04/05 19:05:47  fsg
! 	Changed all Updated ChangeLog
  	Changed all tags to $Id$ BTW this will hopefully set
  	this_build to 2 :-)

[Firebird-checkins] CVS: interbase/dudley ddl.h,1.1.1.1,1.2

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/dudley
In directory usw-pr-cvs1:/tmp/cvs-serv32292/dudley

Modified Files:
	ddl.h 
Log Message:
Committed Changes made in the borland tree
Committed Changes made by Mike Nordel re, 64 bit io for win32 and bug fixes


Index: ddl.h
===================================================================
RCS file: /cvsroot/firebird/interbase/dudley/ddl.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** ddl.h	2000/08/03 20:43:25	1.1.1.1
--- ddl.h	2001/04/05 17:05:43	1.2
***************
*** 34,38 ****
  
  #define MAXSYMLEN	257	/* max length of symbol + terminator */
! #define MAX_PAGE_LEN	8192	/* max allowable length for a database page */
  
  #define DDL_MSG_FAC	2
--- 34,38 ----
  
  #define MAXSYMLEN	257	/* max length of symbol + terminator */
! #define MAX_PAGE_LEN	16384	/* max allowable length for a database page */
  
  #define DDL_MSG_FAC	2

[Firebird-checkins] CVS: interbase/dsql pass1.c,1.2,1.3

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/dsql
In directory usw-pr-cvs1:/tmp/cvs-serv32292/dsql

Modified Files:
	pass1.c 
Log Message:
Committed Changes made in the borland tree
Committed Changes made by Mike Nordel re, 64 bit io for win32 and bug fixes


Index: pass1.c
===================================================================
RCS file: /cvsroot/firebird/interbase/dsql/pass1.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** pass1.c	2000/08/07 03:54:35	1.2
--- pass1.c	2001/04/05 17:05:43	1.3
***************
*** 1822,1825 ****
--- 1822,1853 ----
      return TRUE; 
      }
+ else if (node->nod_type == nod_dbkey)
+     {
+     CTX	context;
+     NOD	reference, rel_node;
+ 
+     if (!list)
+         return TRUE;
+     rel_node = (NOD) node->nod_arg [0];
+     context = (CTX) rel_node->nod_arg [0];
+ 
+     DEV_BLKCHK (context, type_ctx);
+ 
+     for (ptr = list->nod_arg, end = ptr + list->nod_count; ptr < end; ptr++)
+ 	{
+ 	DEV_BLKCHK (*ptr, type_nod);
+ 	reference = *ptr;
+ 	if ((*ptr)->nod_type == nod_cast)
+ 	    {
+ 	    reference = (*ptr)->nod_arg[e_cast_source];
+ 	    }
+ 	DEV_BLKCHK (reference, type_nod);
+ 	if (reference->nod_type == nod_dbkey &&
+ 	    rel_node == (NOD) reference->nod_arg [0] &&
+ 	    context == (CTX) rel_node->nod_arg [0])
+ 	    return FALSE;
+ 	}
+     return TRUE; 
+     }
  else
      {
***************
*** 2579,2584 ****
  	context = (CTX) stack->lls_object;
  	DEV_BLKCHK (context, type_ctx);
! 	if (strcmp (qualifier->str_data, context->ctx_relation->rel_name) && ( 
! 	    !(context->ctx_alias) || 
  		    strcmp (qualifier->str_data, context->ctx_alias)))
  	   continue;
--- 2607,2613 ----
  	context = (CTX) stack->lls_object;
  	DEV_BLKCHK (context, type_ctx);
! 	if ((!(context->ctx_relation) ||
! 		    strcmp (qualifier->str_data, context->ctx_relation->rel_name)) && 
! 	    (!(context->ctx_alias) || 
  		    strcmp (qualifier->str_data, context->ctx_alias)))
  	   continue;

[Firebird-checkins] CVS: interbase/burp backup.e,1.5,1.6 burp.c,1.3,1.4 burp.h,1.1.1.1,1.2 mvol.c,1.2,1.3 restore.e,1.3,1.4

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/burp
In directory usw-pr-cvs1:/tmp/cvs-serv32292/burp

Modified Files:
	backup.e burp.c burp.h mvol.c restore.e 
Log Message:
Committed Changes made in the borland tree
Committed Changes made by Mike Nordel re, 64 bit io for win32 and bug fixes


Index: backup.e
===================================================================
RCS file: /cvsroot/firebird/interbase/burp/backup.e,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** backup.e	2001/03/18 15:42:39	1.5
--- backup.e	2001/04/05 17:05:42	1.6
***************
*** 207,211 ****
  SSHORT	l;
  TEXT	temp [32];
! SLONG	cumul_count;
  isc_req_handle  req_handle1 = NULL;
  long            req_status [20];
--- 207,211 ----
  SSHORT	l;
  TEXT	temp [32];
! SLONG	cumul_count_kb;
  isc_req_handle  req_handle1 = NULL;
  long            req_status [20];
***************
*** 221,225 ****
  tdgbl->io_cnt = 0;
  tdgbl->relations = (REL) NULL;
! cumul_count = tdgbl->BCK_capabilities = 0;
  
  gds__trans = NULL;
--- 221,225 ----
  tdgbl->io_cnt = 0;
  tdgbl->relations = (REL) NULL;
! cumul_count_kb = tdgbl->BCK_capabilities = 0;
  
  gds__trans = NULL;
***************
*** 428,433 ****
  
  PUT (rec_end);
! MVOL_fini_write (&tdgbl->io_cnt, &tdgbl->io_ptr, &cumul_count);
! BURP_verbose (176, (TEXT*) cumul_count, NULL, NULL, NULL, NULL);
  	/* msg 176 closing file, committing, and finishing.  %ld bytes written */
  COMMIT;
--- 428,433 ----
  
  PUT (rec_end);
! MVOL_fini_write (&tdgbl->io_cnt, &tdgbl->io_ptr, &cumul_count_kb);
! BURP_verbose (176, (TEXT*) cumul_count_kb, NULL, NULL, NULL, NULL);
  	/* msg 176 closing file, committing, and finishing.  %ld bytes written */
  COMMIT;

Index: burp.c
===================================================================
RCS file: /cvsroot/firebird/interbase/burp/burp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** burp.c	2000/09/04 16:04:21	1.3
--- burp.c	2001/04/05 17:05:42	1.4
***************
*** 31,34 ****
--- 31,36 ----
  #include "../jrd/ibsetjmp.h"
  #include "../jrd/msg_encode.h"
+ #include "../jrd/thd_proto.h"
+ #include "../jrd/ods.h"		// to get MAX_PAGE_SIZE
  #include "../burp/burp.h"
  #include "../burp/burpswi.h"
***************
*** 491,495 ****
  IB_FILE		*tmp_outfile;
  
! struct tgbl	thd_context;
  
  tdgbl = (struct tgbl *) gds__alloc (sizeof(*tdgbl));
--- 493,499 ----
  IB_FILE		*tmp_outfile;
  
! /* TMN: This variable should probably be removed, but I left it in */
! /* in case some platform should redefine the BURP SET_THREAD_DATA. */
! /* struct tgbl	thd_context; */
  
  tdgbl = (struct tgbl *) gds__alloc (sizeof(*tdgbl));
***************
*** 1065,1082 ****
  	BURP_error (8, 0, 0, 0, 0, 0); /* msg 8 page size is allowed only on restore or create */
      temp = tdgbl->gbl_sw_page_size;
!     if (temp <= 1024)
! 	temp = 1024;
!     else if (temp <= 2048)
! 	temp = 2048;
!     else if (temp <= 4096)
! 	temp = 4096;
!     else if (temp <= 8192)
! 	temp = 8192;
!     else 
  #ifdef SUPERSERVER
  	BURP_svc_error (3, isc_arg_number, tdgbl->gbl_sw_page_size,
  			   0, NULL, 0, NULL, 0, NULL, 0, NULL);
  #else
! 	BURP_error (3, (TEXT *) tdgbl->gbl_sw_page_size, 0, 0, 0, 0); /* msg 3 Page size specified (%ld) greater than limit (8192 bytes) */
  #endif
      if (temp != tdgbl->gbl_sw_page_size)
--- 1069,1088 ----
  	BURP_error (8, 0, 0, 0, 0, 0); /* msg 8 page size is allowed only on restore or create */
      temp = tdgbl->gbl_sw_page_size;
! 	{
! 		int curr_pg_size = 1024;
! 		while (curr_pg_size <= MAX_PAGE_SIZE) {
! 			if (temp <= curr_pg_size) {
! 				temp = curr_pg_size;
! 				break;
! 			}
! 			curr_pg_size <<= 1;
! 		}
! 	}
! 	if (temp > MAX_PAGE_SIZE)
  #ifdef SUPERSERVER
  	BURP_svc_error (3, isc_arg_number, tdgbl->gbl_sw_page_size,
  			   0, NULL, 0, NULL, 0, NULL, 0, NULL);
  #else
! 	BURP_error (3, (TEXT *) tdgbl->gbl_sw_page_size, 0, 0, 0, 0); /* msg 3 Page size specified (%ld) greater than limit (MAX_PAGE_SIZE bytes) */
  #endif
      if (temp != tdgbl->gbl_sw_page_size)
***************
*** 1169,1172 ****
--- 1175,1180 ----
  else
      BURP_abort();
+ 
+ return 0;	/* silence compiler warning */
  }
  

Index: burp.h
===================================================================
RCS file: /cvsroot/firebird/interbase/burp/burp.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** burp.h	2000/08/03 20:42:56	1.1.1.1
--- burp.h	2001/04/05 17:05:42	1.2
***************
*** 737,741 ****
      ULONG	mvol_io_buffer_size;
      ULONG	mvol_actual_buffer_size;
!     ULONG   	mvol_cumul_count;
      UCHAR	*mvol_io_ptr;
      int	   	mvol_io_cnt;
--- 737,741 ----
      ULONG	mvol_io_buffer_size;
      ULONG	mvol_actual_buffer_size;
!     ULONG   	mvol_cumul_count_kb;
      UCHAR	*mvol_io_ptr;
      int	   	mvol_io_cnt;

Index: mvol.c
===================================================================
RCS file: /cvsroot/firebird/interbase/burp/mvol.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** mvol.c	2000/08/30 03:58:43	1.2
--- mvol.c	2001/04/05 17:05:42	1.3
***************
*** 116,120 ****
  
  void MVOL_fini_read (
!     int		*count)
  {
  /**************************************
--- 116,120 ----
  
  void MVOL_fini_read (
!     int		*count_kb)
  {
  /**************************************
***************
*** 135,139 ****
  
  tdgbl->file_desc = INVALID_HANDLE_VALUE;
! *count = tdgbl->mvol_cumul_count;
  BURP_FREE (tdgbl->mvol_io_buffer);
  tdgbl->mvol_io_buffer = NULL;
--- 135,139 ----
  
  tdgbl->file_desc = INVALID_HANDLE_VALUE;
! *count_kb = tdgbl->mvol_cumul_count_kb;
  BURP_FREE (tdgbl->mvol_io_buffer);
  tdgbl->mvol_io_buffer = NULL;
***************
*** 145,149 ****
      int		*io_cnt,
      UCHAR	**io_ptr,
!     int		*count)
  {
  /**************************************
--- 145,149 ----
      int		*io_cnt,
      UCHAR	**io_ptr,
!     int		*count_kb)
  {
  /**************************************
***************
*** 165,169 ****
      CLOSE (tdgbl->file_desc);
  tdgbl->file_desc = INVALID_HANDLE_VALUE;
! *count = tdgbl->mvol_cumul_count;
  BURP_FREE (tdgbl->mvol_io_header);
  tdgbl->mvol_io_header = NULL;
--- 165,169 ----
      CLOSE (tdgbl->file_desc);
  tdgbl->file_desc = INVALID_HANDLE_VALUE;
! *count_kb = tdgbl->mvol_cumul_count_kb;
  BURP_FREE (tdgbl->mvol_io_header);
  tdgbl->mvol_io_header = NULL;
***************
*** 345,349 ****
      }
  
! tdgbl->mvol_cumul_count += tdgbl->mvol_io_cnt;
  file_not_empty();
  
--- 345,349 ----
      }
  
! tdgbl->mvol_cumul_count_kb += tdgbl->mvol_io_cnt / 1024;
  file_not_empty();
  
***************
*** 401,405 ****
      }
  
! tdgbl->mvol_cumul_count += tdgbl->mvol_io_cnt;
  file_not_empty();
  
--- 401,405 ----
      }
  
! tdgbl->mvol_cumul_count_kb += tdgbl->mvol_io_cnt / 1024;
  file_not_empty();
  
***************
*** 644,648 ****
      if (cnt > 0)
  	{
! 	tdgbl->mvol_cumul_count += cnt;
  	file_not_empty();
  	if (tdgbl->action->act_action == ACT_backup_split)
--- 644,648 ----
      if (cnt > 0)
  	{
! 	tdgbl->mvol_cumul_count_kb += cnt / 1024;
  	file_not_empty();
  	if (tdgbl->action->act_action == ACT_backup_split)
***************
*** 717,721 ****
                          tdgbl->mvol_io_header + tdgbl->mvol_io_buffer_size,
  			left);
! 		tdgbl->mvol_cumul_count += tdgbl->mvol_io_buffer_size;
  		tdgbl->mvol_io_buffer = tdgbl->mvol_io_data;
  		}
--- 717,721 ----
                          tdgbl->mvol_io_header + tdgbl->mvol_io_buffer_size,
  			left);
! 		tdgbl->mvol_cumul_count_kb += tdgbl->mvol_io_buffer_size / 1024;
  		tdgbl->mvol_io_buffer = tdgbl->mvol_io_data;
  		}

Index: restore.e
===================================================================
RCS file: /cvsroot/firebird/interbase/burp/restore.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** restore.e	2001/03/18 15:42:39	1.3
--- restore.e	2001/04/05 17:05:42	1.4
***************
*** 244,248 ****
   *
   **************************************/
! int		cumul_count;
  REL		relation;
  PRC		procedure;
--- 244,248 ----
   *
   **************************************/
! int		cumul_count_kb;
  REL		relation;
  PRC		procedure;
***************
*** 532,536 ****
  /* msg 88 finishing, closing, and going home */
  
! MVOL_fini_read (&cumul_count);
  
  /* attach database again to put it online */
--- 532,536 ----
  /* msg 88 finishing, closing, and going home */
  
! MVOL_fini_read (&cumul_count_kb);
  
  /* attach database again to put it online */

[Firebird-checkins] CVS: interbase/builds_win32/original metadata.sql,1.2,1.3

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/builds_win32/original
In directory usw-pr-cvs1:/tmp/cvs-serv32292/builds_win32/original

Modified Files:
	metadata.sql 
Log Message:
Committed Changes made in the borland tree
Committed Changes made by Mike Nordel re, 64 bit io for win32 and bug fixes


Index: metadata.sql
===================================================================
RCS file: /cvsroot/firebird/interbase/builds_win32/original/metadata.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** metadata.sql	2000/08/21 21:06:59	1.2
--- metadata.sql	2001/04/05 17:05:42	1.3
***************
*** 20,25 ****
--- 20,29 ----
   */
  SET SQL DIALECT 1;
+ /* 
+  * Commented out the delete since it gives an error message, that puts off 
+  * the builder.  Deletion handled in shell script instead. MOD 04-Jan-01
  CONNECT 'metadata.gdb';
  DROP DATABASE;
+ */
  
  CREATE DATABASE 'metadata.gdb' PAGE_SIZE 1024;

[Firebird-checkins] CVS: interbase/jrd event.c,1.1.1.1,1.2 ini.e,1.1.1.1,1.2 ods.h,1.2,1.3 pag.h,1.2,1.3 sdw.c,1.1.1.1,1.2 utl.c,1.5,1.6 winnt.c,1.1.1.1,1.2

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/jrd
In directory usw-pr-cvs1:/tmp/cvs-serv32292/jrd

Modified Files:
	event.c ini.e ods.h pag.h sdw.c utl.c winnt.c 
Log Message:
Committed Changes made in the borland tree
Committed Changes made by Mike Nordel re, 64 bit io for win32 and bug fixes


Index: event.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/event.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** event.c	2000/08/03 20:50:05	1.1.1.1
--- event.c	2001/04/05 17:05:43	1.2
***************
*** 154,157 ****
--- 154,160 ----
  SRQ	*que, *que2;
  
+ if (!EVENT_header)
+     return;
+ 
  ACQUIRE;
  

Index: ini.e
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/ini.e,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** ini.e	2000/08/03 20:50:37	1.1.1.1
--- ini.e	2001/04/05 17:05:43	1.2
***************
*** 468,472 ****
  vector         = dbb->dbb_relations;
  
- 
  for (relfld = relfields; relfld [RFLD_R_NAME]; relfld = fld + 1)
      {
--- 468,471 ----
***************
*** 488,535 ****
      else
          {
!     relation = MET_relation (tdbb, relfld [RFLD_R_ID]);
!     format = relation->rel_current_format;
  
!     for (n = 0, fld = relfld + RFLD_RPT; fld [RFLD_F_NAME]; fld += RFLD_F_LENGTH)
! 	{
! 	/* If the ODS is less than 10, then remove the field
! 	 * RDB$FIELD_PRECISION, as it is not present in < 10 ODS
! 	 */
! 	if (fld [RFLD_F_NAME] == nam_f_precision)
  	    {
! 	    if (major_version >= ODS_VERSION10)
! 		if (!fld [RFLD_F_MINOR])
  		    {
  		    n++;
  		    if (fld [RFLD_F_UPD_MINOR])
! 			relation->rel_flags |= REL_force_scan;
  		    }
! 		else
! 		    relation->rel_flags |= REL_force_scan;
! 	    }
! 	else
! 	    {
! 	    if (!fld [RFLD_F_MINOR])
! 		{
! 		n++;
! 		if (fld [RFLD_F_UPD_MINOR])
  		    relation->rel_flags |= REL_force_scan;
! 		}
! 	    else
! 		relation->rel_flags |= REL_force_scan;
  	    }
- 	}
  
!     relation->rel_fields->vec_count = n;
!     format->fmt_count = n;
!     format->fmt_length = FLAG_BYTES (n);
!     desc = format->fmt_desc;
!     for (fld = relfld + RFLD_RPT; fld [RFLD_F_NAME]; fld += RFLD_F_LENGTH, desc++)
! 	if (n-- > 0)
! 	    {
! 	    format->fmt_length = MET_align (desc, format->fmt_length);
! 	    desc->dsc_address = (UCHAR*) (SLONG) format->fmt_length;
! 	    format->fmt_length += desc->dsc_length;
! 	    }
          }
      }
--- 487,537 ----
      else
          {
! 	relation = MET_relation (tdbb, relfld [RFLD_R_ID]);
! 	format = relation->rel_current_format;
  
! 	for (n = 0, fld = relfld + RFLD_RPT; fld [RFLD_F_NAME]; fld += RFLD_F_LENGTH)
  	    {
! 	    /* If the ODS is less than 10, then remove all fields named
! 	     * RDB$FIELD_PRECISION and field RDB$CHARACTER_LENGTH from
! 	     * relation RDB$FUNCTION_ARGUMENTS , as they were not present
! 	     * in < 10 ODS
! 	     */
! 	    if (fld [RFLD_F_NAME] == nam_f_precision ||
! 	       (fld [RFLD_F_NAME] == nam_char_length && relfld [RFLD_R_NAME] == nam_args))
! 	    	{
! 	    	if (major_version >= ODS_VERSION10)
! 		    if (!fld [RFLD_F_MINOR])
! 		    	{
! 		    	n++;
! 		    	if (fld [RFLD_F_UPD_MINOR])
! 			    relation->rel_flags |= REL_force_scan;
! 		    	}
! 		    else
! 		    	relation->rel_flags |= REL_force_scan;
! 	        }
! 	    else
! 	        {
! 	        if (!fld [RFLD_F_MINOR])
  		    {
  		    n++;
  		    if (fld [RFLD_F_UPD_MINOR])
! 		    	relation->rel_flags |= REL_force_scan;
  		    }
! 	    	else
  		    relation->rel_flags |= REL_force_scan;
! 	        }
  	    }
  
! 	relation->rel_fields->vec_count = n;
! 	format->fmt_count = n;
! 	format->fmt_length = FLAG_BYTES (n);
! 	desc = format->fmt_desc;
! 	for (fld = relfld + RFLD_RPT; fld [RFLD_F_NAME]; fld += RFLD_F_LENGTH, desc++)
! 	    if (n-- > 0)
! 	    	{
! 	    	format->fmt_length = MET_align (desc, format->fmt_length);
! 	    	desc->dsc_address = (UCHAR*) (SLONG) format->fmt_length;
! 	    	format->fmt_length += desc->dsc_length;
! 	    	}
          }
      }

Index: ods.h
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/ods.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ods.h	2000/11/30 14:27:32	1.2
--- ods.h	2001/04/05 17:05:43	1.3
***************
*** 143,147 ****
  #endif
  
! #define MAX_PAGE_SIZE		8192
  #define DEFAULT_PAGE_SIZE	4096
  
--- 143,147 ----
  #endif
  
! #define MAX_PAGE_SIZE		16384
  #define DEFAULT_PAGE_SIZE	4096
  

Index: pag.h
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/pag.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** pag.h	2000/11/30 14:27:32	1.2
--- pag.h	2001/04/05 17:05:43	1.3
***************
*** 43,49 ****
      SLONG	pgc_ppp;		/* Pages per pip */
      SLONG	pgc_pip;		/* First pointer page */
!     int		pgc_bytes;		/* Number of bytes of bit in PIP */
!     int		pgc_tpt;		/* Transactions per TIP */
!     int		pgc_gpg;		/* Generators per generator page */
  } *PGC;
  
--- 43,49 ----
      SLONG	pgc_ppp;		/* Pages per pip */
      SLONG	pgc_pip;		/* First pointer page */
!     ULONG	pgc_bytes;		/* Number of bytes of bit in PIP */
!     ULONG	pgc_tpt;		/* Transactions per TIP */
!     ULONG	pgc_gpg;		/* Generators per generator page */
  } *PGC;
  

Index: sdw.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/sdw.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** sdw.c	2000/08/03 20:51:18	1.1.1.1
--- sdw.c	2001/04/05 17:05:43	1.2
***************
*** 939,943 ****
  SCHAR	expanded_name [MAX_PATH_LENGTH];
  UCHAR	*p;
! FIL	dbb_file, shadow_file;
  JMP_BUF	env, *old_env;
  WIN	window;
--- 939,943 ----
  SCHAR	expanded_name [MAX_PATH_LENGTH];
  UCHAR	*p;
! FIL	dbb_file, shadow_file = NULL_PTR;
  JMP_BUF	env, *old_env;
  WIN	window;
***************
*** 991,994 ****
--- 991,1001 ----
      if (header_fetched)
  	CCH_RELEASE (tdbb, &window);
+     if (shadow_file)
+ 	{
+ 	PIO_close (shadow_file);
+ 	ALL_release (shadow_file);
+ 	}
+     if (spare_buffer)
+         ALL_free (spare_buffer);
      if (file_flags & FILE_manual && !delete)
          ERR_post (gds__shadow_missing, gds_arg_number, (SLONG) shadow_number, 0);
***************
*** 998,1003 ****
  	gds__log ("shadow %s deleted from database %s due to unavailability on attach", expanded_name, dbb_file->fil_string);
  	}
-     if (spare_buffer)
-         ALL_free (spare_buffer);
      return;
      }
--- 1005,1008 ----

Index: utl.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/utl.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** utl.c	2000/10/15 13:26:47	1.5
--- utl.c	2001/04/05 17:05:43	1.6
***************
*** 1172,1175 ****
--- 1172,1176 ----
   *
   **************************************/
+ #ifndef SUPERSERVER
  TEXT	*username, *password;
  UCHAR	*p, *end_dpb;
***************
*** 1224,1227 ****
--- 1225,1229 ----
  else if (password && !password_seen)
      isc_expand_dpb (dpb, dpb_size, gds__dpb_password, password, 0);
+ #endif
  }
  

Index: winnt.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/winnt.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** winnt.c	2000/08/03 20:51:46	1.1.1.1
--- winnt.c	2001/04/05 17:05:43	1.2
***************
*** 22,25 ****
--- 22,35 ----
   */
  
+ #ifdef _MSC_VER
+ /* TMN: 27 Jul 2000 - Added define to make it compile on Win32 */
+ #ifndef _tagBLOB_DEFINED
+ #define _tagBLOB_DEFINED
+ #endif
+ #ifndef WIN32_LEAN_AND_MEAN
+ #define WIN32_LEAN_AND_MEAN
+ #endif
+ #endif	/* _MSC_VER */
+ 
  #include <string.h>
  #include "../jrd/jrd.h"
***************
*** 41,46 ****
--- 51,62 ----
  
  #include <windows.h>
+ #ifdef TEXT
+ #undef TEXT
+ #endif
  #define TEXT		SCHAR
  
+ #ifdef MAXPATHLEN
+ #undef MAXPATHLEN
+ #endif
  #define MAXPATHLEN		512
  #define DEFAULTBUFFERSIZE	1024
***************
*** 58,74 ****
  static USHORT	ostype;
  
! int PIO_add_file (
!     DBB		dbb,
!     FIL		main_file,
!     TEXT	*file_name,
!     SLONG	start)
! {
  /**************************************
   *
-  *	P I O _ a d d _ f i l e
-  *
-  **************************************
-  *
-  * Functional description
   *	Add a file to an existing database.  Return the sequence
   *	number of the new file.  If anything goes wrong, return a
--- 74,80 ----
  static USHORT	ostype;
  
! 
  /**************************************
   *
   *	Add a file to an existing database.  Return the sequence
   *	number of the new file.  If anything goes wrong, return a
***************
*** 76,90 ****
   *
   **************************************/
  USHORT	sequence;
! FIL	file, new_file;
  
! if (!(new_file = PIO_create (dbb, file_name, strlen (file_name), FALSE)))
      return 0;
  
  new_file->fil_min_page = start;
  sequence = 1;
  
! for (file = main_file; file->fil_next; file = file->fil_next)
      ++sequence;
  
  file->fil_max_page = start - 1;
--- 82,105 ----
   *
   **************************************/
+ int PIO_add_file(
+ 	DBB		dbb,
+ 	FIL		main_file,
+ 	TEXT*	file_name,
+ 	SLONG	start)
+ {
  USHORT	sequence;
! 	FIL	file;
  
! 	FIL	new_file = PIO_create(dbb, file_name, strlen (file_name), FALSE);
! 	if (!new_file) {
      return 0;
+ 	}
  
  new_file->fil_min_page = start;
  sequence = 1;
  
! 	for (file = main_file; file->fil_next; file = file->fil_next) {
      ++sequence;
+ 	}
  
  file->fil_max_page = start - 1;
***************
*** 94,99 ****
  }
  
! void PIO_close (
!     FIL		main_file)
  {
  /**************************************
--- 109,113 ----
  }
  
! void PIO_close(FIL main_file)
  {
  /**************************************
***************
*** 107,113 ****
   **************************************/
  FIL	file;
- USHORT	i;
  
  for (file = main_file; file; file = file->fil_next)
      if ((HANDLE) file->fil_desc != INVALID_HANDLE_VALUE)
  	{
--- 121,127 ----
   **************************************/
  FIL	file;
  
  for (file = main_file; file; file = file->fil_next)
+ 	{
      if ((HANDLE) file->fil_desc != INVALID_HANDLE_VALUE)
  	{
***************
*** 115,119 ****
--- 129,135 ----
  	file->fil_desc = (SLONG) INVALID_HANDLE_VALUE;
  	if ((HANDLE) file->fil_force_write_desc != INVALID_HANDLE_VALUE)
+ 			{
  	    CloseHandle ((HANDLE) file->fil_force_write_desc);
+ 			}
  	file->fil_force_write_desc = (SLONG) INVALID_HANDLE_VALUE;
  #ifdef SUPERSERVER_V2
***************
*** 125,128 ****
--- 141,145 ----
  	}
  }
+ }
  
  int PIO_connection (
***************
*** 145,171 ****
   **************************************/
  
! return NULL;
  }
  
! FIL PIO_create (
!     DBB		dbb,
!     TEXT	*string,
!     SSHORT	length,
!     BOOLEAN	overwrite)
! {
  /**************************************
   *
-  *	P I O _ c r e a t e
-  *
-  **************************************
-  *
-  * Functional description
   *	Create a new database file.
   *
   **************************************/
  HANDLE	desc;
  FIL	file;
! TEXT	workspace [MAXPATHLEN], *file_name;
  
  file_name = string;
  
--- 162,192 ----
   **************************************/
  
! return 0;
  }
  
! 
  /**************************************
   *
   *	Create a new database file.
   *
   **************************************/
+ FIL PIO_create(	DBB		dbb,
+ 				TEXT*	string,
+ 				SSHORT	length,
+ 				BOOLEAN	overwrite)
+ {
  HANDLE	desc;
  FIL	file;
! 	TEXT	workspace[MAXPATHLEN];
! 	TEXT*	file_name;
  
+ #ifdef SUPERSERVER_V2
+ 	const DWORD dwShareFlags = 0;	/* no sharing */
+ 	const DWORD dwExtraFlags = FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING;
+ #else
+ 	const DWORD dwShareFlags = FILE_SHARE_READ | FILE_SHARE_WRITE;
+ 	const DWORD dwExtraFlags = 0;
+ #endif
+ 
  file_name = string;
  
***************
*** 177,197 ****
      }
  
! if ((desc = CreateFile (file_name,
  	GENERIC_READ | GENERIC_WRITE,
! 	FILE_SHARE_READ | FILE_SHARE_WRITE,
  	NULL,
  	(overwrite ? CREATE_ALWAYS : CREATE_NEW) ,
  	FILE_ATTRIBUTE_NORMAL |
! #ifdef SUPERSERVER_V2
! 	FILE_FLAG_OVERLAPPED |
! 	FILE_FLAG_NO_BUFFERING |
! #endif
! 	FILE_FLAG_RANDOM_ACCESS,
! 	0)) == INVALID_HANDLE_VALUE)
      ERR_post (isc_io_error, 
  	gds_arg_string, "CreateFile (create)",
! 	gds_arg_cstring, length, ERR_string (string, length),
!     	isc_arg_gds, isc_io_create_err,
! 	gds_arg_win32, GetLastError(), 0);
  
  /* File open succeeded.  Now expand the file name. */
--- 198,224 ----
      }
  
! 	desc = CreateFile(	file_name,
  	GENERIC_READ | GENERIC_WRITE,
! 						dwShareFlags,
  	NULL,
  	(overwrite ? CREATE_ALWAYS : CREATE_NEW) ,
  	FILE_ATTRIBUTE_NORMAL |
! 						FILE_FLAG_RANDOM_ACCESS |
! 						dwExtraFlags,
! 						0);
! 
! 	if (desc == INVALID_HANDLE_VALUE)
! 	{
      ERR_post (isc_io_error, 
  	gds_arg_string, "CreateFile (create)",
! 					gds_arg_cstring,
! 					length,
! 					ERR_string(string, length),
! 					isc_arg_gds,
! 					isc_io_create_err,
! 					gds_arg_win32,
! 					GetLastError(),
! 					0);
! 	}
  
  /* File open succeeded.  Now expand the file name. */
***************
*** 265,268 ****
--- 292,303 ----
  HANDLE	desc;
  
+ #ifdef SUPERSERVER_V2
+ 	const DWORD dwShareFlags = 0;	/* no sharing */
+ 	const DWORD dwExtraFlags = FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING;
+ #else
+ 	const DWORD dwShareFlags = FILE_SHARE_READ | FILE_SHARE_WRITE;
+ 	const DWORD dwExtraFlags = 0;
+ #endif
+ 
  if (flag)
      {
***************
*** 271,292 ****
  	desc = CreateFile (file->fil_string,
  	    GENERIC_READ | GENERIC_WRITE,
! 	    FILE_SHARE_READ | FILE_SHARE_WRITE,
  	    NULL,
  	    OPEN_EXISTING,
  	    FILE_ATTRIBUTE_NORMAL |
  	    FILE_FLAG_WRITE_THROUGH |
! #ifdef SUPERSERVER_V2
! 	    FILE_FLAG_OVERLAPPED |
! 	    FILE_FLAG_NO_BUFFERING |
! #endif
! 	    FILE_FLAG_RANDOM_ACCESS,
  	    0);
  	if (desc == INVALID_HANDLE_VALUE)
  	    ERR_post (isc_io_error,
! 		gds_arg_string, "CreateFile (force write)",
!         	gds_arg_cstring, file->fil_length, ERR_string (file->fil_string, file->fil_length),
              	isc_arg_gds, isc_io_access_err,
!     		gds_arg_win32, GetLastError(), 0);
  
  	file->fil_force_write_desc = desc;
  	}
--- 306,333 ----
  	desc = CreateFile (file->fil_string,
  	    GENERIC_READ | GENERIC_WRITE,
! 								dwShareFlags,
  	    NULL,
  	    OPEN_EXISTING,
  	    FILE_ATTRIBUTE_NORMAL |
  	    FILE_FLAG_WRITE_THROUGH |
! 								FILE_FLAG_RANDOM_ACCESS |
! 								dwExtraFlags,
  	    0);
+ 
  	if (desc == INVALID_HANDLE_VALUE)
+ 			{
  	    ERR_post (isc_io_error,
! 							gds_arg_string,
! 							"CreateFile (force write)",
! 							gds_arg_cstring,
! 							file->fil_length,
! 							ERR_string(file->fil_string, file->fil_length),
              	isc_arg_gds, isc_io_access_err,
! 							gds_arg_win32,
! 							GetLastError(),
! 							0);
! 			}
  
+ 			/* TMN: Take note! Assumes sizeof(long) == sizeof(void*) ! */
  	file->fil_force_write_desc = desc;
  	}
***************
*** 294,299 ****
--- 335,342 ----
      }
  else
+ 	{
      file->fil_flags &= ~FIL_force_write;
  }
+ }
  
  void PIO_header (
***************
*** 385,432 ****
  #endif
  
! if (ostype == OS_CHICAGO)
      THD_MUTEX_UNLOCK (file->fil_mutex);
  }
  
- SLONG PIO_max_alloc (
-     DBB		dbb)
- {
  /**************************************
   *
!  *	P I O _ m a x _ a l l o c
!  *
!  **************************************
!  *
!  * Functional description
!  *	Compute last physically allocated page of database.
   *
   **************************************/
! ULONG	length;
! FIL	file;
  
! for (file = dbb->dbb_file; file->fil_next; file = file->fil_next)
!     ;
  
! if ((length = GetFileSize ((HANDLE) file->fil_desc, NULL)) == -1)
      nt_error ("GetFileSize", file, isc_io_access_err, NULL_PTR);
  
! return file->fil_min_page - file->fil_fudge +
!        (length + dbb->dbb_page_size - 1) / dbb->dbb_page_size;
  }
  
- SLONG PIO_act_alloc (
-     DBB		dbb)
- {
  /**************************************
   *
!  *	P I O _ a c t _ a l l o c
   *
!  **************************************
   *
-  * Functional description
   *  Compute actual number of physically allocated pages of database.
   *
   **************************************/
! ULONG	length;
  FIL	file;
  SLONG tot_pages=0;
--- 428,488 ----
  #endif
  
! 	if (ostype == OS_CHICAGO) {
      THD_MUTEX_UNLOCK (file->fil_mutex);
  }
+ }
+ 
  
  /**************************************
   *
!  *	Compute number of pages in file, based only on file size.
   *
   **************************************/
! static ULONG private_PIO_get_number_of_pages(
! 	FIL		file,
! 	USHORT	pagesize)
! {
! 	HANDLE		hFile = (HANDLE)file->fil_desc;
! 	DWORD		dwFileSizeLow;
! 	DWORD		dwFileSizeHigh;
! 	ULONGLONG	ullFileSize;
  
! 	dwFileSizeLow = GetFileSize(hFile, &dwFileSizeHigh);
  
! 	if (dwFileSizeLow == -1) {
      nt_error ("GetFileSize", file, isc_io_access_err, NULL_PTR);
+ 	}
  
! 	ullFileSize = (((ULONGLONG)dwFileSizeHigh) << 32) + dwFileSizeLow;
! 	return (ULONG)((ullFileSize + pagesize - 1) / pagesize);
  }
  
  /**************************************
   *
!  *	Compute last physically allocated page of database.
   *
!  **************************************/
! SLONG PIO_max_alloc(DBB dbb)
! {
! 	FIL			file = dbb->dbb_file;
! 	ULONG		nPages;
! 
! 	while (file->fil_next) {
! 		file = file->fil_next;
! 	}
! 
! 	nPages = private_PIO_get_number_of_pages(file, dbb->dbb_page_size);
! 
! 	return file->fil_min_page - file->fil_fudge + nPages;
! }
! 
! 
! /**************************************
   *
   *  Compute actual number of physically allocated pages of database.
   *
   **************************************/
! SLONG PIO_act_alloc(DBB dbb)
! {
  FIL	file;
  SLONG tot_pages=0;
***************
*** 438,445 ****
  for (file = dbb->dbb_file; file != NULL; file = file->fil_next)
      {
!         if ((length = GetFileSize ((HANDLE) file->fil_desc, NULL)) == -1)
!         nt_error ("GetFileSize", file, isc_io_access_err, NULL_PTR);
! 
!         tot_pages +=  (length + dbb->dbb_page_size - 1) / dbb->dbb_page_size;
      }
  
--- 494,499 ----
  for (file = dbb->dbb_file; file != NULL; file = file->fil_next)
      {
! 		tot_pages +=
! 			private_PIO_get_number_of_pages(file, dbb->dbb_page_size);
      }
  
***************
*** 447,450 ****
--- 501,511 ----
  }
  
+ 
+ /**************************************
+  *
+  *	Open a database file.  If a "connection" block is provided, use
+  *	the connection to communication with a page/lock server.
+  *
+  **************************************/
  FIL PIO_open (
      DBB		dbb,
***************
*** 456,473 ****
      USHORT	file_length)
  {
- /**************************************
-  *
-  *	P I O _ o p e n
-  *
-  **************************************
-  *
-  * Functional description
-  *	Open a database file.  If a "connection" block is provided, use
-  *	the connection to communication with a page/lock server.
-  *
-  **************************************/
  TEXT	temp [MAXPATHLEN], *ptr;
  HANDLE	desc;
  
  if (string)
      {
--- 517,531 ----
      USHORT	file_length)
  {
  TEXT	temp [MAXPATHLEN], *ptr;
  HANDLE	desc;
  
+ #ifdef SUPERSERVER_V2
+ 	const DWORD dwShareFlags = 0;	/* no sharing */
+ 	const DWORD dwExtraFlags = FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING;
+ #else
+ 	const DWORD dwShareFlags = FILE_SHARE_READ | FILE_SHARE_WRITE;
+ 	const DWORD dwExtraFlags = 0;
+ #endif
+ 
  if (string)
      {
***************
*** 491,512 ****
      }
  
! if ((desc = CreateFile (ptr,
  	GENERIC_READ | GENERIC_WRITE,
! 	FILE_SHARE_READ | FILE_SHARE_WRITE,
  	NULL,
  	OPEN_EXISTING,
  	FILE_ATTRIBUTE_NORMAL |
! #ifdef SUPERSERVER_V2
! 	FILE_FLAG_OVERLAPPED |
!         FILE_FLAG_NO_BUFFERING |
! #endif
! 	FILE_FLAG_RANDOM_ACCESS,
! 	0)) == INVALID_HANDLE_VALUE)
      {
  #ifdef READONLY_DATABASE
!     /* Try opening the database file in ReadOnly mode. The database file could
!      * be on a RO medium (CD-ROM etc.). If this fileopen fails, return error.
       */
!     if ((desc = CreateFile (ptr,
  	    GENERIC_READ,
  	    FILE_SHARE_READ,
--- 549,570 ----
      }
  
! 	desc = CreateFile(	ptr,
  	GENERIC_READ | GENERIC_WRITE,
! 						dwShareFlags,
  	NULL,
  	OPEN_EXISTING,
  	FILE_ATTRIBUTE_NORMAL |
! 						FILE_FLAG_RANDOM_ACCESS |
! 						dwExtraFlags,
! 						0);
! 
! 	if (desc == INVALID_HANDLE_VALUE)
      {
  #ifdef READONLY_DATABASE
! 		/* Try opening the database file in ReadOnly mode.
! 		 * The database file could be on a RO medium (CD-ROM etc.).
! 		 * If this fileopen fails, return error.
       */
! 		desc = CreateFile(	ptr,
  	    GENERIC_READ,
  	    FILE_SHARE_READ,
***************
*** 514,530 ****
  	    OPEN_EXISTING,
  	    FILE_ATTRIBUTE_NORMAL |
! #ifdef SUPERSERVER_V2
! 	    FILE_FLAG_OVERLAPPED |
! 	    FILE_FLAG_NO_BUFFERING |
! #endif
! 	    FILE_FLAG_RANDOM_ACCESS,
! 	    0)) == INVALID_HANDLE_VALUE)
  	{
  #endif  /* READONLY_DATABASE */
  	ERR_post (isc_io_error, 
! 	    gds_arg_string, "CreateFile (open)",
! 	    gds_arg_cstring, file_length, ERR_string (file_name, file_length),
! 	    isc_arg_gds, isc_io_open_err,
! 	    gds_arg_win32, GetLastError(), 0);
  #ifdef READONLY_DATABASE
  	}
--- 572,593 ----
  	    OPEN_EXISTING,
  	    FILE_ATTRIBUTE_NORMAL |
! 							FILE_FLAG_RANDOM_ACCESS |
! 							dwExtraFlags,
! 							0);
! 
! 		if (desc == INVALID_HANDLE_VALUE)
  	{
  #endif  /* READONLY_DATABASE */
  	ERR_post (isc_io_error, 
! 						gds_arg_string,
! 						"CreateFile (open)",
! 						gds_arg_cstring,
! 						file_length,
! 						ERR_string(file_name, file_length),
! 						isc_arg_gds,
! 						isc_io_open_err,
! 						gds_arg_win32,
! 						GetLastError(),
! 						0);
  #ifdef READONLY_DATABASE
  	}
***************
*** 569,574 ****
  size = dbb->dbb_page_size;
  
! if (!(file = seek_file (file, bdb, status_vector, &overlapped, &overlapped_ptr)))
      return FALSE;
  
  desc = (HANDLE) ((file->fil_flags & FIL_force_write) ?
--- 632,639 ----
  size = dbb->dbb_page_size;
  
! 	file = seek_file(file, bdb, status_vector, &overlapped, &overlapped_ptr);
! 	if (!file) {
      return FALSE;
+ 	}
  
  desc = (HANDLE) ((file->fil_flags & FIL_force_write) ?
***************
*** 594,615 ****
  #endif
      {
!     if (ReadFile (desc, page, size, &actual_length, overlapped_ptr) &&
! 	actual_length == size);
  #ifdef SUPERSERVER_V2
!     else if (!GetOverlappedResult (desc, overlapped_ptr, &actual_length, TRUE) ||
  	actual_length != size)
  	{
  	release_io_event (file, overlapped_ptr);
  	return nt_error ("GetOverlappedResult", file, isc_io_read_err, status_vector);
! 	}
  #else
-     else    
  	{
  	if (ostype == OS_CHICAGO)
  	    THD_MUTEX_UNLOCK (file->fil_mutex);
  	return nt_error ("ReadFile", file, isc_io_read_err, status_vector);
  	}
  #endif
      }
  
  #ifdef SUPERSERVER_V2
--- 659,683 ----
  #endif
      {
! 		if (!ReadFile(desc, page, size, &actual_length, overlapped_ptr) ||
! 			actual_length != size)
! 		{
  #ifdef SUPERSERVER_V2
! 			if (!GetOverlappedResult (desc, overlapped_ptr, &actual_length, TRUE) ||
  	actual_length != size)
  	{
  	release_io_event (file, overlapped_ptr);
  	return nt_error ("GetOverlappedResult", file, isc_io_read_err, status_vector);
! 			} else
  #else
  	{
  	if (ostype == OS_CHICAGO)
+ 				{
  	    THD_MUTEX_UNLOCK (file->fil_mutex);
+ 				}
  	return nt_error ("ReadFile", file, isc_io_read_err, status_vector);
  	}
  #endif
      }
+ 	}
  
  #ifdef SUPERSERVER_V2
***************
*** 618,622 ****
--- 686,692 ----
  
  if (ostype == OS_CHICAGO)
+ 	{
      THD_MUTEX_UNLOCK (file->fil_mutex);
+ 	}
  
  return TRUE;
***************
*** 654,658 ****
--- 724,730 ----
  
  if (!piob)
+ 	{
      overlapped_ptr = &overlapped;
+ 	}
  else
      {
***************
*** 668,673 ****
      bdb.bdb_page = start_page;
  
!     if (!(file = seek_file (dbb->dbb_file, &bdb, status_vector, overlapped_ptr, &overlapped_ptr)))
      	return FALSE;
  
      /* Check that every page within the set resides in the same database
--- 740,748 ----
      bdb.bdb_page = start_page;
  
! 		file = seek_file (dbb->dbb_file, &bdb, status_vector, overlapped_ptr, &overlapped_ptr);
! 		if (!file)
! 		{
      	return FALSE;
+ 		}
  
      /* Check that every page within the set resides in the same database
***************
*** 734,742 ****
  DWORD		actual_length;
  
! if (piob->piob_flags & PIOB_success)
!     ;
! else if (piob->piob_flags & PIOB_error)
      return FALSE;
! else if (!GetOverlappedResult ((HANDLE) piob->piob_desc, (OVERLAPPED *) &piob->piob_io_event, &actual_length, piob->piob_wait) ||
      actual_length != piob->piob_io_length)
      {
--- 809,822 ----
  DWORD		actual_length;
  
! 	if (!(piob->piob_flags & PIOB_success))
! 	{
! 		if (piob->piob_flags & PIOB_error)
! 		{
      return FALSE;
! 		}
! 		if (!GetOverlappedResult(	(HANDLE)piob->piob_desc,
! 									(OVERLAPPED*)&piob->piob_io_event,
! 									&actual_length,
! 									piob->piob_wait) ||
      actual_length != piob->piob_io_length)
      {
***************
*** 744,747 ****
--- 824,828 ----
      return nt_error ("GetOverlappedResult", piob->piob_file, isc_io_error, status_vector);
      }
+ 	}
  
  release_io_event (piob->piob_file, (OVERLAPPED *) &piob->piob_io_event);
***************
*** 864,867 ****
--- 945,949 ----
  #endif
  
+ 
  static FIL seek_file (
      FIL		file,
***************
*** 885,901 ****
  DBB	dbb;
  HANDLE	desc;
  USHORT	i;
  
  dbb = bdb->bdb_dbb;
  page = bdb->bdb_page;
  
! for (;; file = file->fil_next)
!     if (!file)
  	CORRUPT (158); /* msg 158 cannot sort on a field that does not exist */
!     else if (page >= file->fil_min_page && page <= file->fil_max_page)
  	break;
  
  page -= file->fil_min_page - file->fil_fudge;
  
  if (ostype == OS_CHICAGO)
      {
--- 967,993 ----
  DBB	dbb;
  HANDLE	desc;
+ 	LARGE_INTEGER liOffset;
+ 
+ #ifdef SUPERSERVER_V2
  USHORT	i;
+ #endif
  
  dbb = bdb->bdb_dbb;
  page = bdb->bdb_page;
  
! 	for (;; file = file->fil_next) {
! 		if (!file) {
  	CORRUPT (158); /* msg 158 cannot sort on a field that does not exist */
! 		}
! 		else
! 		if (page >= file->fil_min_page && page <= file->fil_max_page) {
  	break;
+ 		}
+ 	}
  
  page -= file->fil_min_page - file->fil_fudge;
  
+ 	liOffset.QuadPart = UInt32x32To64((DWORD)page, (DWORD)dbb->dbb_page_size);
+ 
  if (ostype == OS_CHICAGO)
      {
***************
*** 903,907 ****
      desc = (HANDLE) ((file->fil_flags & FIL_force_write) ?
  	file->fil_force_write_desc : file->fil_desc);
!     if (SetFilePointer (desc, (LONG) (page * dbb->dbb_page_size), NULL, FILE_BEGIN) == -1)
  	{
  	THD_MUTEX_UNLOCK (file->fil_mutex);
--- 995,1003 ----
      desc = (HANDLE) ((file->fil_flags & FIL_force_write) ?
  	file->fil_force_write_desc : file->fil_desc);
! 
! 		if (SetFilePointer(	desc,
! 							(LONG)liOffset.LowPart,
! 							&liOffset.HighPart,
! 							FILE_BEGIN) == 0xffffffff)
  	{
  	THD_MUTEX_UNLOCK (file->fil_mutex);
***************
*** 913,927 ****
  else
      {
!     memset (overlapped, 0, sizeof (OVERLAPPED));
!     overlapped->Offset = page * dbb->dbb_page_size;
! 
!     /* This error can be removed if 64-bit file support is added. */
  
-     if ((overlapped->Offset / dbb->dbb_page_size) != page)
- 	return (FIL) nt_error ("seek", file, isc_io_access_err, status_vector);
       *overlapped_ptr = overlapped;
  #ifdef SUPERSERVER_V2
      THD_MUTEX_LOCK (file->fil_mutex);
      for (i = 0; i < MAX_FILE_IO; i++)
  	if (overlapped->hEvent = (HANDLE) file->fil_io_events [i])
  	    {
--- 1009,1024 ----
  else
      {
! 		overlapped->Offset			= liOffset.LowPart;
! 		overlapped->OffsetHigh		= liOffset.HighPart;
! 		overlapped->Internal		= 0;
! 		overlapped->InternalHigh	= 0;
! 		overlapped->hEvent			= (HANDLE)0;
  
       *overlapped_ptr = overlapped;
+ 
  #ifdef SUPERSERVER_V2
      THD_MUTEX_LOCK (file->fil_mutex);
      for (i = 0; i < MAX_FILE_IO; i++)
+ 		{
  	if (overlapped->hEvent = (HANDLE) file->fil_io_events [i])
  	    {
***************
*** 929,936 ****
--- 1026,1036 ----
  	    break;
  	    }
+ 		}
      THD_MUTEX_UNLOCK (file->fil_mutex);
      if (!overlapped->hEvent &&
  	!(overlapped->hEvent = CreateEvent (NULL, TRUE, FALSE, NULL)))
+ 		{
  	return (FIL) nt_error ("CreateEvent", file, isc_io_access_err, status_vector);
+ 		}
      ResetEvent (overlapped->hEvent);
  #endif
***************
*** 1058,1062 ****
      return FALSE;
      }
! else
      ERR_post (isc_io_error, 
  	gds_arg_string, string, 
--- 1158,1162 ----
      return FALSE;
      }
! 
      ERR_post (isc_io_error, 
  	gds_arg_string, string, 
***************
*** 1064,1067 ****
--- 1164,1169 ----
          isc_arg_gds, operation,
      	gds_arg_win32, GetLastError(), 0);
+ 
+ 	return TRUE;
  }
  

[Firebird-checkins] CVS: interbase/iscguard cntl_guard.c,1.2,1.3 iscguard.c,1.5,1.6 iscguard.rc,1.2,1.3

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/iscguard
In directory usw-pr-cvs1:/tmp/cvs-serv32292/iscguard

Modified Files:
	cntl_guard.c iscguard.c iscguard.rc 
Log Message:
Committed Changes made in the borland tree
Committed Changes made by Mike Nordel re, 64 bit io for win32 and bug fixes


Index: cntl_guard.c
===================================================================
RCS file: /cvsroot/firebird/interbase/iscguard/cntl_guard.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** cntl_guard.c	2000/08/16 08:53:05	1.2
--- cntl_guard.c	2001/04/05 17:05:43	1.3
***************
*** 28,31 ****
--- 28,32 ----
  #include "../jrd/thd.h"
  #include "../jrd/isc_proto.h"
+ #include "../jrd/gds_proto.h"
  #include "../jrd/sch_proto.h"
  #include "../jrd/thd_proto.h"
***************
*** 122,126 ****
  TEXT	*p;
  TEXT	default_mode[100] = { 0 };
! DWORD	last_error;
  
  service_handle = RegisterServiceCtrlHandler (service_name, 
--- 123,129 ----
  TEXT	*p;
  TEXT	default_mode[100] = { 0 };
! DWORD	last_error = 0;
! DWORD 	temp;
! int	status;
  
  service_handle = RegisterServiceCtrlHandler (service_name, 
***************
*** 161,164 ****
--- 164,168 ----
   * the service is stoping. */
  
+ status = 1;
  if (report_status (SERVICE_START_PENDING, NO_ERROR, 1, 3000) &&
      (stop_event_handle = CreateEvent (NULL, TRUE, FALSE, NULL)) != NULL &&
***************
*** 166,172 ****
      !gds__thread_start ((FPTR_INT) main_handler, (void*) flag, 0, 0, NULL_PTR) &&
      report_status (SERVICE_RUNNING, NO_ERROR, 0, 0))
!     WaitForSingleObject (stop_event_handle, INFINITE);
  
! last_error = GetLastError();
  
  if (stop_event_handle)
--- 170,180 ----
      !gds__thread_start ((FPTR_INT) main_handler, (void*) flag, 0, 0, NULL_PTR) &&
      report_status (SERVICE_RUNNING, NO_ERROR, 0, 0))
!     {
!     status = 0;
!     temp = WaitForSingleObject (stop_event_handle, INFINITE);
!     }
  
! if (temp == WAIT_FAILED || status)
!     last_error = GetLastError();
  
  if (stop_event_handle)

Index: iscguard.c
===================================================================
RCS file: /cvsroot/firebird/interbase/iscguard/iscguard.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** iscguard.c	2000/09/02 07:53:34	1.5
--- iscguard.c	2001/04/05 17:05:43	1.6
***************
*** 714,717 ****
--- 714,718 ----
          while (WaitForSingleObject (procHandle, INFINITE) == WAIT_FAILED);
          GetExitCodeProcess (procHandle, &exit_status);
+ 	CloseHandle(procHandle);
          }      
  

Index: iscguard.rc
===================================================================
RCS file: /cvsroot/firebird/interbase/iscguard/iscguard.rc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** iscguard.rc	2000/08/16 08:53:05	1.2
--- iscguard.rc	2001/04/05 17:05:43	1.3
***************
*** 17,20 ****
--- 17,21 ----
   * Contributor(s): ______________________________________.
   */
+ #include <windows.h>
  #include "iscguard.rh"
  #include "windows.h"
***************
*** 63,67 ****
   CONTROL "", IDC_RESTARTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 96, 80, 60, 8, 0
   CONTROL "", IDC_LOCATION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 44, 49, 144, 8, 0
!  CONTROL "InterBase Guardian for Windows NT / 95", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 44, 12, 144, 8, 0
   CONTROL "Text7", IDC_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 44, 61, 144, 8, 0
   CONTROL "ListView1", IDC_LOG, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOLABELWRAP | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER, 12, 99, 184, 81
--- 64,68 ----
   CONTROL "", IDC_RESTARTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 96, 80, 60, 8, 0
   CONTROL "", IDC_LOCATION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 44, 49, 144, 8, 0
!  CONTROL "InterBase Guardian for Windows", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 44, 12, 144, 8, 0
   CONTROL "Text7", IDC_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 44, 61, 144, 8, 0
   CONTROL "ListView1", IDC_LOG, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOLABELWRAP | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER, 12, 99, 184, 81

[Firebird-checkins] CVS: interbase/utilities dba.e,1.4,1.5 dba_full.e,1.1.1.1,1.2 sbc_print.c,1.1.1.1,1.2 security.e,1.1.1.1,1.2

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/utilities
In directory usw-pr-cvs1:/tmp/cvs-serv32292/utilities

Modified Files:
	dba.e dba_full.e sbc_print.c security.e 
Log Message:
Committed Changes made in the borland tree
Committed Changes made by Mike Nordel re, 64 bit io for win32 and bug fixes


Index: dba.e
===================================================================
RCS file: /cvsroot/firebird/interbase/utilities/dba.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** dba.e	2000/10/12 02:52:18	1.4
--- dba.e	2001/04/05 17:05:43	1.5
***************
*** 1932,1935 ****
--- 1932,1936 ----
  DBA_FIL	fil;
  TDBA	tddba;
+ LARGE_INTEGER liOffset;
  
  tddba = GET_THREAD_DATA;
***************
*** 1944,1948 ****
  
  page_number -= fil->fil_min_page - fil->fil_fudge;
! if (SetFilePointer (fil->fil_desc, (ULONG) (page_number * tddba->page_size), NULL, FILE_BEGIN) == -1)
      {
  #ifdef SUPERSERVER
--- 1945,1950 ----
  
  page_number -= fil->fil_min_page - fil->fil_fudge;
! liOffset.QuadPart = UInt32x32To64((DWORD)page_number, (DWORD)tddba->page_size);
! if (SetFilePointer (fil->fil_desc, (LONG)liOffset.LowPart, &liOffset.HighPart, FILE_BEGIN) == -1)
      {
  #ifdef SUPERSERVER

Index: dba_full.e
===================================================================
RCS file: /cvsroot/firebird/interbase/utilities/dba_full.e,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** dba_full.e	2000/08/03 20:54:25	1.1.1.1
--- dba_full.e	2001/04/05 17:05:43	1.2
***************
*** 1617,1620 ****
--- 1617,1621 ----
  FIL	fil;
  TDBA	tddba;
+ LARGE_INTEGER liOffset;
  
  tddba = GET_THREAD_DATA;
***************
*** 1624,1628 ****
  
  page_number -= fil->fil_min_page - fil->fil_fudge;
! if (SetFilePointer (fil->fil_desc, (ULONG) (page_number * tddba->page_size), NULL, FILE_BEGIN) == -1)
      db_error (GetLastError());
  
--- 1625,1630 ----
  
  page_number -= fil->fil_min_page - fil->fil_fudge;
! liOffset.QuadPart = UInt32x32To64((DWORD)page_number, (DWORD)tddba->page_size);
! if (SetFilePointer (fil->fil_desc, (LONG)liOffset.LowPart, &liOffset.HighPart, FILE_BEGIN) == -1)
      db_error (GetLastError());
  

Index: sbc_print.c
===================================================================
RCS file: /cvsroot/firebird/interbase/utilities/sbc_print.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** sbc_print.c	2000/08/03 20:54:29	1.1.1.1
--- sbc_print.c	2001/04/05 17:05:43	1.2
***************
*** 675,680 ****
   **************************************/
  SLONG	actual_length;
  
! if (SetFilePointer (file, (ULONG) (page_number * page_size), NULL, FILE_BEGIN) == -1)
      db_error (GetLastError());
  
--- 675,682 ----
   **************************************/
  SLONG	actual_length;
+ LARGE_INTEGER liOffset;
  
! liOffset.QuadPart = UInt32x32To64((DWORD)page_number, (DWORD)page_size);
! if (SetFilePointer (file, (LONG)liOffset.LowPart, &liOffset.HighPart, FILE_BEGIN) == -1)
      db_error (GetLastError());
  

Index: security.e
===================================================================
RCS file: /cvsroot/firebird/interbase/utilities/security.e,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** security.e	2000/08/03 20:54:29	1.1.1.1
--- security.e	2001/04/05 17:05:43	1.2
***************
*** 38,41 ****
--- 38,42 ----
  
  #define MAX_PASSWORD_LENGTH	31
+ #define SYSDBA_USER_NAME	"SYSDBA"
  
  SSHORT SECURITY_exec_line (
***************
*** 264,277 ****
  
  	found = FALSE;
! 	FOR U IN USERS WITH U.USER_NAME EQ user_data->user_name
! 	    found = TRUE;
! 	    ERASE U
  	    ON_ERROR
! 		ret = GsecMsg23;	/* gsec - delete record error */
  	    END_ERROR;
! 	END_FOR
! 	ON_ERROR
! 	    ret = GsecMsg24;	/* gsec - find/delete record error */
! 	END_ERROR;
  
  	if (!ret && !found)
--- 265,284 ----
  
  	found = FALSE;
! 	/* Do not allow SYSDBA user to be deleted */
! 	if (!STRICMP(user_data->user_name, SYSDBA_USER_NAME))
! 	    ret = GsecMsg23;
! 	else
! 	    {
! 	    FOR U IN USERS WITH U.USER_NAME EQ user_data->user_name
! 		found = TRUE;
! 		ERASE U
! 		ON_ERROR
! 		    ret = GsecMsg23;	/* gsec - delete record error */
! 		END_ERROR;
! 	    END_FOR
  	    ON_ERROR
! 		ret = GsecMsg24;	/* gsec - find/delete record error */
  	    END_ERROR;
! 	    }
  
  	if (!ret && !found)

[Firebird-checkins] CVS: interbase/remote cntl.c,1.2,1.3 ibconfig.c,1.2,1.3 ibconfig.rc,1.1.1.1,1.2 inet.c,1.4,1.5 property.c,1.2,1.3 property.rc,1.1.1.1,1.2

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/remote
In directory usw-pr-cvs1:/tmp/cvs-serv32292/remote

Modified Files:
	cntl.c ibconfig.c ibconfig.rc inet.c property.c property.rc 
Log Message:
Committed Changes made in the borland tree
Committed Changes made by Mike Nordel re, 64 bit io for win32 and bug fixes


Index: cntl.c
===================================================================
RCS file: /cvsroot/firebird/interbase/remote/cntl.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** cntl.c	2000/08/05 16:13:33	1.2
--- cntl.c	2001/04/05 17:05:43	1.3
***************
*** 121,127 ****
   *
   **************************************/
! int	flag;
  TEXT	*p, default_mode [100];
! DWORD	last_error;
  
  HANDLE cleanup_thread_handle;
--- 121,128 ----
   *
   **************************************/
! int	flag, status;
  TEXT	*p, default_mode [100];
! DWORD	last_error = 0;
! DWORD	temp;
  
  HANDLE cleanup_thread_handle;
***************
*** 159,162 ****
--- 160,165 ----
      }
  
+  status = 1;
+ 
  if (report_status (SERVICE_START_PENDING, NO_ERROR, 1, 3000) &&
      (stop_event_handle = CreateEvent (NULL, TRUE, FALSE, NULL)) != NULL &&
***************
*** 165,172 ****
      report_status (SERVICE_RUNNING, NO_ERROR, 0, 0))
  {
!     WaitForSingleObject (stop_event_handle, INFINITE);
  }
  
! last_error = GetLastError();
  
  if (stop_event_handle)
--- 168,178 ----
      report_status (SERVICE_RUNNING, NO_ERROR, 0, 0))
  {
!     status = 0;
!     temp = WaitForSingleObject (stop_event_handle, INFINITE);
  }
+ 
  
! if (temp == WAIT_FAILED || status) 
!      last_error = GetLastError();     
  
  if (stop_event_handle)
***************
*** 191,194 ****
--- 197,201 ----
  CloseHandle(cleanup_thread_handle);
  
+ CloseHandle (cleanup_thread_handle);
  report_status (SERVICE_STOPPED, last_error, 0, 0);
  }

Index: ibconfig.c
===================================================================
RCS file: /cvsroot/firebird/interbase/remote/ibconfig.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ibconfig.c	2000/08/31 04:57:26	1.2
--- ibconfig.c	2001/04/05 17:05:43	1.3
***************
*** 37,40 ****
--- 37,41 ----
  #include "../jrd/svc_undoc.h"
  #include "../jrd/svc_proto.h"
+ #include "../jrd/ods.h"		// to get MAX_PAGE_SIZE
  #include "../remote/window_proto.h"
  #include "../ipserver/ipsrv_proto.h"
***************
*** 400,407 ****
  
  // Fill the Map Size Combo Box
! SendDlgItemMessage(hDlg, IDC_MAPSIZE, CB_ADDSTRING, 0,(LPARAM)"1024");
! SendDlgItemMessage(hDlg, IDC_MAPSIZE, CB_ADDSTRING, 0,(LPARAM)"2048");
! SendDlgItemMessage(hDlg, IDC_MAPSIZE, CB_ADDSTRING, 0,(LPARAM)"4096");
! SendDlgItemMessage(hDlg, IDC_MAPSIZE, CB_ADDSTRING, 0,(LPARAM)"8192");
  
  // Select the right Map Size, inserting it if necessary
--- 401,413 ----
  
  // Fill the Map Size Combo Box
! {
! 	char szTmp[8];
! 	int temp = 1024;
! 	while (temp <= MAX_PAGE_SIZE) {
! 		wsprintf(szTmp, "%d", temp);
! 		SendDlgItemMessage(hDlg, IDC_MAPSIZE, CB_ADDSTRING, 0,(LPARAM)szTmp);
! 		temp <<= 1;
! 	}
! }
  
  // Select the right Map Size, inserting it if necessary

Index: ibconfig.rc
===================================================================
RCS file: /cvsroot/firebird/interbase/remote/ibconfig.rc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** ibconfig.rc	2000/08/03 20:54:03	1.1.1.1
--- ibconfig.rc	2001/04/05 17:05:43	1.2
***************
*** 27,31 ****
   EDITTEXT IDC_DBPAGES, 137, 84, 47, 12, ES_RIGHT | WS_BORDER | WS_TABSTOP
   LTEXT "&Client map size (bytes):", IDC_MAPTEXT, 22, 107, 77, 12
!  COMBOBOX IDC_MAPSIZE, 126, 106, 58, 40, CBS_DROPDOWNLIST | CBS_SORT | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP
   PUSHBUTTON "&Modify...", IDC_MODRES, 133, 132, 51, 13
   ICON IDI_CAUTION, IDC_CAUTION_ICON, 9, 17, 18, 20
--- 27,31 ----
   EDITTEXT IDC_DBPAGES, 137, 84, 47, 12, ES_RIGHT | WS_BORDER | WS_TABSTOP
   LTEXT "&Client map size (bytes):", IDC_MAPTEXT, 22, 107, 77, 12
!  COMBOBOX IDC_MAPSIZE, 126, 106, 58, 40, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP
   PUSHBUTTON "&Modify...", IDC_MODRES, 133, 132, 51, 13
   ICON IDI_CAUTION, IDC_CAUTION_ICON, 9, 17, 18, 20

Index: inet.c
===================================================================
RCS file: /cvsroot/firebird/interbase/remote/inet.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** inet.c	2001/03/23 08:14:01	1.4
--- inet.c	2001/04/05 17:05:43	1.5
***************
*** 160,164 ****
  ** so that it won't be redefined below.
  */
! #define SOCKET		SOCKET
  #define ERRNO		WSAGetLastError()
  #define H_ERRNO		WSAGetLastError()
--- 160,167 ----
  ** so that it won't be redefined below.
  */
! /* TMN: 28 Jul 2000 - Fixed compiler warning */
! # ifndef SOCKET
! #  define SOCKET		SOCKET
! # endif	/* SOCKET */
  #define ERRNO		WSAGetLastError()
  #define H_ERRNO		WSAGetLastError()
***************
*** 179,184 ****
  #define INET_ADDR_IN_USE	WSAEADDRINUSE
  #define sleep(seconds)  Sleep ((seconds) * 1000)
- #endif
  
  #ifdef PC_PLATFORM
  #define NO_FORK
--- 182,189 ----
  #define INET_ADDR_IN_USE	WSAEADDRINUSE
  #define sleep(seconds)  Sleep ((seconds) * 1000)
  
+ #endif	/* WIN_NT */
+ 
+ 
  #ifdef PC_PLATFORM
  #define NO_FORK
***************
*** 378,382 ****
  static PORT	aux_connect 	(PORT, 
  					PACKET *, 
! 					int (*)(void));
  static PORT	aux_request 	(PORT, 
  					PACKET *);
--- 383,387 ----
  static PORT	aux_connect 	(PORT, 
  					PACKET *, 
! 					XDR_INT (*)(void));
  static PORT	aux_request 	(PORT, 
  					PACKET *);
***************
*** 768,771 ****
--- 773,778 ----
  
  #ifdef  SUPERSERVER
+ /* TMN: 28 Jul 2000 - Added include to remove warnings */
+ #include "../jrd/thd_proto.h"
  static  MUTX_T  port_mutex;
  static  BOOLEAN    port_mutex_inited = 0;
***************
*** 1102,1106 ****
  SOCKET 			s;
  PORT			port;
! TEXT			*protocol, temp [128], *p;
  struct sockaddr_in	address;
  #ifndef VMS
--- 1109,1115 ----
  SOCKET 			s;
  PORT			port;
! 	TEXT*				protocol;
! 	TEXT				temp[128];
! 	TEXT*				p;
  struct sockaddr_in	address;
  #ifndef VMS
***************
*** 1126,1132 ****
      };
  INET_start_time = inet_debug_timer();
! if ((p = getenv ("INET_force_error")) != NULL) 
      INET_force_error = atoi (p);
  }
  #endif
  
--- 1135,1142 ----
      };
  INET_start_time = inet_debug_timer();
! 		if ((p = getenv ("INET_force_error")) != NULL) {
      INET_force_error = atoi (p);
  }
+ 	}
  #endif
  
***************
*** 1146,1149 ****
--- 1156,1160 ----
      strcpy (temp, name);
      for (p = temp; *p;)
+ 		{
  	if (*p++ == '/')
  	    {
***************
*** 1154,1166 ****
  	    }
      }
  
  if (name && *name)
      {
!     if (port->port_connection)
  	ALLR_free (port->port_connection);
      port->port_connection = REMOTE_make_string (name);
      }
  else
      name = port->port_host->str_data;
  
  /* Set up Inter-Net socket address */
--- 1165,1181 ----
  	    }
      }
+ 	}
  
  if (name && *name)
      {
! 		if (port->port_connection) {
  	ALLR_free (port->port_connection);
+ 		}
      port->port_connection = REMOTE_make_string (name);
      }
  else
+ 	{
      name = port->port_host->str_data;
+ 	}
  
  /* Set up Inter-Net socket address */
***************
*** 1168,1177 ****
  inet_zero ((SCHAR*) &address, sizeof (address));
  
- /* V M S */
- 
  #ifdef VMS
  if (getservport (protocol, "tcp", &address.sin_port) == -1)
      {
      inet_error (port, "getservbyname", isc_net_connect_err, 0);
      return NULL;
      }
--- 1183,1192 ----
  inet_zero ((SCHAR*) &address, sizeof (address));
  
  #ifdef VMS
+ 	/* V M S */
  if (getservport (protocol, "tcp", &address.sin_port) == -1)
      {
      inet_error (port, "getservbyname", isc_net_connect_err, 0);
+ 		disconnect (port);
      return NULL;
      }
***************
*** 1181,1194 ****
  	{
  	inet_error (port, "gethostbyname", isc_net_connect_err, 0);
  	return NULL;
  	}
      }
  else
      address.sin_addr.s_addr = INADDR_ANY;
  #else
  
  #ifdef WINDOWS_ONLY
! if (initWSA(port))
      return NULL;
  #endif  /* WINDOWS_ONLY */
  
--- 1196,1214 ----
  	{
  	inet_error (port, "gethostbyname", isc_net_connect_err, 0);
+ 			disconnect (port);
  	return NULL;
  	}
      }
  else
+ 	{
      address.sin_addr.s_addr = INADDR_ANY;
+ 	}
  #else
  
  #ifdef WINDOWS_ONLY
! 	if (initWSA(port)) {
! 		disconnect (port);
      return NULL;
+ 	}
  #endif  /* WINDOWS_ONLY */
  
***************
*** 1236,1239 ****
--- 1256,1260 ----
      NetworkLibraryCleanup ();
  #endif /* WINDOWS_ONLY */
+ 		disconnect (port);
      return NULL;
      }
***************
*** 1243,1250 ****
  
  address.sin_family = host->h_addrtype;
! if (packet)
!     inet_copy (host->h_addr, &address.sin_addr, sizeof (address.sin_addr));
! else
      address.sin_addr.s_addr = INADDR_ANY;
  
  THREAD_EXIT;
--- 1264,1272 ----
  
  address.sin_family = host->h_addrtype;
! 	if (packet) {
! 		inet_copy (host->h_addr, (SCHAR*)&address.sin_addr, sizeof (address.sin_addr));
! 	} else {
      address.sin_addr.s_addr = INADDR_ANY;
+ 	}
  
  THREAD_EXIT;
***************
*** 1358,1361 ****
--- 1380,1385 ----
      NetworkLibraryCleanup ();
  #endif /* WINDOWS_ONLY */	
+ 		disconnect (port);
+ 	disconnect (port);
      return NULL;
      }
***************
*** 1627,1637 ****
  BOOLEAN		user_set;
  #endif
  #if !(defined OS2_ONLY || defined PC_PLATFORM)
  int		trusted;
- SLONG		gids [128];
  TEXT		host [MAXHOSTLEN];
  struct passwd   *passwd;
  int		i, gid_count;
  #endif
  
  /* Default account to "guest" (in theory all packets contain a name) */
--- 1651,1667 ----
  BOOLEAN		user_set;
  #endif
+ 
  #if !(defined OS2_ONLY || defined PC_PLATFORM)
+ # if !defined(WINDOWS_ONLY) && !defined(NETWARE_386) && !defined(OS2_ONLY) && !defined(WIN_NT)
  int		trusted;
  TEXT		host [MAXHOSTLEN];
  struct passwd   *passwd;
+ 
+ #  if !defined(VMS)
+ 	SLONG		gids [128];
  int		i, gid_count;
  #endif
+ # endif
+ #endif
  
  /* Default account to "guest" (in theory all packets contain a name) */
***************
*** 1706,1710 ****
  #endif
  
! #ifndef WINDOWS_ONLY
  if (user_verification)
      {
--- 1736,1741 ----
  #endif
  
! #if !defined(WINDOWS_ONLY)
! 
  if (user_verification)
      {
***************
*** 1712,1718 ****
      port->port_flags |= PORT_not_trusted;
      }
! #ifndef NETWARE_386
! #ifndef OS2_ONLY
! #ifndef WIN_NT
  #ifdef VMS
  else
--- 1743,1749 ----
      port->port_flags |= PORT_not_trusted;
      }
! 
! #if !defined(NETWARE_386) && !defined(OS2_ONLY) && !defined(WIN_NT)
! 
  #ifdef VMS
  else
***************
*** 1817,1823 ****
  }
  #endif /* VMS */
! #endif /* OS2_ONLY */
! #endif /* WIN_NT */
! #endif /* NETWARE_386 */
  #endif /* WINDOWS_ONLY */
  
--- 1848,1854 ----
  }
  #endif /* VMS */
! 
! #endif /* !NETWARE_386 && !OS2_ONLY !WIN_NT */
! 
  #endif /* WINDOWS_ONLY */
  
***************
*** 1888,1892 ****
  
  if (first_time == TRUE)
!     {char messg[128];
      ISC_get_config (LOCK_HEADER, INET_tcp_buffer);
      if (INET_remote_buffer < MAX_DATA_LW || INET_remote_buffer > MAX_DATA_HW)
--- 1919,1923 ----
  
  if (first_time == TRUE)
!     {
      ISC_get_config (LOCK_HEADER, INET_tcp_buffer);
      if (INET_remote_buffer < MAX_DATA_LW || INET_remote_buffer > MAX_DATA_HW)
***************
*** 1894,1899 ****
--- 1925,1933 ----
      INET_max_data = INET_remote_buffer; 
  #ifdef DEBUG
+ 	{
+ 		char messg[128];
      sprintf(messg, " Info: Remote Buffer Size set to %d", INET_remote_buffer);
      gds__log(messg, NULL_PTR);
+ 	}
  #endif
      first_time = FALSE;
***************
*** 1943,1950 ****
  port->port_connect = aux_connect;
  port->port_request = aux_request;
! port->port_buff_size = INET_remote_buffer;
  
  xdrinet_create (&port->port_send, port, 
! 	&port->port_buffer [INET_remote_buffer], INET_remote_buffer,
  	XDR_ENCODE);
  
--- 1977,1984 ----
  port->port_connect = aux_connect;
  port->port_request = aux_request;
! port->port_buff_size = (USHORT)INET_remote_buffer;
  
  xdrinet_create (&port->port_send, port, 
! 	&port->port_buffer [INET_remote_buffer], (USHORT)INET_remote_buffer,
  	XDR_ENCODE);
  
***************
*** 1958,1962 ****
      PORT	port,
      PACKET	*packet,
!     XDR_INT	(*ast)())
  {
  /**************************************
--- 1992,1996 ----
      PORT	port,
      PACKET	*packet,
!     XDR_INT	(*ast)(void))
  {
  /**************************************
***************
*** 1976,1980 ****
--- 2010,2018 ----
  PORT			new_port;
  struct sockaddr_in	address;
+ #if !defined(WINDOWS_ONLY) && \
+ 	(!(defined VMS || defined NETWARE_386 || defined PC_PLATFORM || \
+ 	defined OS2_ONLY || defined WIN_NT) && !defined APOLLO)
  int			arg;
+ #endif
  
  /* If this is a server, we're got an auxiliary connection.  Accept it */
***************
*** 2012,2016 ****
  
  inet_zero ((SCHAR*) &address, sizeof (address));
! inet_copy (response->p_resp_data.cstr_address, &address,
         response->p_resp_data.cstr_length);
  address.sin_family = AF_INET;
--- 2050,2054 ----
  
  inet_zero ((SCHAR*) &address, sizeof (address));
! inet_copy (response->p_resp_data.cstr_address, (SCHAR*)&address,
         response->p_resp_data.cstr_length);
  address.sin_family = AF_INET;
***************
*** 2199,2208 ****
      return NULL;
      }
! inet_copy (host->h_addr, &address.sin_addr, sizeof (address.sin_addr));
  #endif
  
  response->p_resp_data.cstr_address = (UCHAR*) &response->p_resp_blob_id;
  response->p_resp_data.cstr_length = sizeof (response->p_resp_blob_id);
! inet_copy (&address, response->p_resp_data.cstr_address, 
         response->p_resp_data.cstr_length);
  
--- 2237,2246 ----
      return NULL;
      }
! inet_copy (host->h_addr, (SCHAR*)&address.sin_addr, sizeof (address.sin_addr));
  #endif
  
  response->p_resp_data.cstr_address = (UCHAR*) &response->p_resp_blob_id;
  response->p_resp_data.cstr_length = sizeof (response->p_resp_blob_id);
! inet_copy ((SCHAR*)&address, response->p_resp_data.cstr_address, 
         response->p_resp_data.cstr_length);
  
***************
*** 2392,2396 ****
   *
   **************************************/
! PORT	parent, *ptr;
  int	n;
  #ifdef	DEFER_PORT_CLEANUP
--- 2430,2434 ----
   *
   **************************************/
! PORT	parent;
  int	n;
  #ifdef	DEFER_PORT_CLEANUP
***************
*** 2415,2425 ****
      }
  
  shutdown ((int) port->port_handle, 2);
! #endif
  
  #if !(defined VMS || defined NETWARE_386 || defined PC_PLATFORM || \
  	defined OS2_ONLY || defined WIN_NT)
! if (port->port_ast)
      ISC_signal_cancel (SIGURG, inet_handler, port);
  #endif
  
--- 2453,2477 ----
      }
  
+ #if defined WIN_NT
+ 
+ 	if (port->port_handle && (SOCKET)port->port_handle != INVALID_SOCKET) {
  shutdown ((int) port->port_handle, 2);
! 	}
! 
! #else	/* WIN_NT */
! 
! 	if (port->port_handle) {
! 		shutdown ((int) port->port_handle, 2);
! 	}
! 
! #endif	/* WIN_NT */
  
+ #endif	/* !VMS */
+ 
  #if !(defined VMS || defined NETWARE_386 || defined PC_PLATFORM || \
  	defined OS2_ONLY || defined WIN_NT)
! 	if (port->port_ast) {
      ISC_signal_cancel (SIGURG, inet_handler, port);
+ 	}
  #endif
  
***************
*** 2453,2463 ****
  	}
  
  SOCLOSE ((SOCKET) port->port_handle);
  
  #ifdef WINDOWS_ONLY
  NetworkLibraryCleanup ();
! if (port->port_msg_handle)
      /* close socket should flush any async postings, so its safe to destroy */
      DestroyWindow (port->port_msg_handle);
  #endif
  
--- 2505,2518 ----
  	}
  
+ 	if (port->port_handle) {
  SOCLOSE ((SOCKET) port->port_handle);
+ 	}
  
  #ifdef WINDOWS_ONLY
  NetworkLibraryCleanup ();
! 	if (port->port_msg_handle) {
      /* close socket should flush any async postings, so its safe to destroy */
      DestroyWindow (port->port_msg_handle);
+ 	}
  #endif
  
***************
*** 3253,3261 ****
--- 3308,3320 ----
   **************************************/
  PORT	port;
+ 
+ #if !defined(WIN_NT)
  int	n;
+ #endif
  
  #ifdef WIN_NT
  
  /* NT's socket handles are addresses */
+ /* TMN: No, they are "black-box" handles. */
  
  START_PORT_CRITICAL;
***************
*** 3267,3271 ****
          {
  	port->port_dummy_timeout = port->port_dummy_packet_interval;
!         FD_CLR (port->port_handle, &selct->slct_fdset);
          --selct->slct_count;
          STOP_PORT_CRITICAL;
--- 3326,3339 ----
          {
  	port->port_dummy_timeout = port->port_dummy_packet_interval;
! 
! #define TMNchSTR(x) #x
! #define chSTR2(x)   TMNchSTR(x)
! #define TMN_FILE_LINE_MESSAGE(desc) message(__FILE__ "(" chSTR2(__LINE__) "):" desc)
! #pragma TMN_FILE_LINE_MESSAGE("TODO: Make porthandle a SOCKET on Win32")
! #undef TMN_FILE_LINE_MESSAGE
! #undef chSTR2
! #undef TMNchSTR
! 
! 	FD_CLR ((SOCKET)port->port_handle, &selct->slct_fdset);
          --selct->slct_count;
          STOP_PORT_CRITICAL;
***************
*** 3419,3423 ****
--- 3487,3495 ----
                  {
                  for (port = main_port; port; port = port->port_next)
+ #ifdef WIN_NT
+                     FD_CLR ((SOCKET)port->port_handle, &selct->slct_fdset);
+ #else
                      FD_CLR (port->port_handle, &selct->slct_fdset);
+ #endif
                  }
  	    THREAD_ENTER;
***************
*** 3536,3540 ****
  xdrs->x_base = xdrs->x_private = (SCHAR*) buffer;
  xdrs->x_handy = length;
! xdrs->x_ops = &inet_ops;
  xdrs->x_op = x_op;
  
--- 3608,3612 ----
  xdrs->x_base = xdrs->x_private = (SCHAR*) buffer;
  xdrs->x_handy = length;
! xdrs->x_ops = (struct xdr_ops*)&inet_ops;
  xdrs->x_op = x_op;
  
***************
*** 3616,3623 ****
  
  status_vector = NULL;
! if (port->port_context != NULL)
      status_vector = port->port_context->rdb_status_vector;
! if (status_vector == NULL)
      status_vector = port->port_status_vector;
  if (status_vector != NULL)
      {
--- 3688,3697 ----
  
  status_vector = NULL;
! 	if (port->port_context != NULL) {
      status_vector = port->port_context->rdb_status_vector;
! 	}
! 	if (status_vector == NULL) {
      status_vector = port->port_status_vector;
+ 	}
  if (status_vector != NULL)
      {
***************
*** 3823,3827 ****
   **************************************/
  
! if (bytecount > xdrs->x_handy)
      return FALSE;
  
--- 3897,3901 ----
   **************************************/
  
! if (bytecount > (u_int)xdrs->x_handy)
      return FALSE;
  
***************
*** 4056,4060 ****
   **************************************/
  
! if (bytecount > xdrs->x_handy)
      return FALSE;
  
--- 4130,4134 ----
   **************************************/
  
! if (bytecount > (u_int)xdrs->x_handy)
      return FALSE;
  
***************
*** 4162,4168 ****
      {
      port->port_misc1 = (port->port_misc1 + 1) % MAX_SEQUENCE;
!     l = MIN (length, INET_max_data);
      length -= l;
!     if (!packet_send (port, p, (length) ? -l : l))
  	 return FALSE;
      p += l;
--- 4236,4242 ----
      {
      port->port_misc1 = (port->port_misc1 + 1) % MAX_SEQUENCE;
!     l = (SSHORT)MIN (length, INET_max_data);
      length -= l;
!     if (!packet_send (port, p, (SSHORT)((length) ? -l : l)))
  	 return FALSE;
      p += l;

Index: property.c
===================================================================
RCS file: /cvsroot/firebird/interbase/remote/property.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** property.c	2000/09/02 07:54:24	1.2
--- property.c	2001/04/05 17:05:43	1.3
***************
*** 1,27 ****
! /*************  history ************
! *
! *       COMPONENT: REMOTE       MODULE: PROPERTY.C
! *       generated by Marion V2.5     2/6/90
! *       from dev              db        on 1-FEB-1996
! *****************************************************************
! *
! *       20959   RCURRY  1-FEB-1996
! *       Add missing break before case WM_HELP
! *
! *       20950   RMIDEKE 31-JAN-1996
! *       add whats this
! *
! *       20909   RCURRY  24-JAN-1996
! *       Move HelpCmd() from here to ibconfig.c
! *
! *       20903   RCURRY  24-JAN-1996
! *       Add a nice little help button for confused users
! *
! *       20861   jmayer  17-JAN-1996
! *       Restore code that was removed by previous change.
! *
! *       0       JKONERU 5-JAN-1996 
! *       history begins
! *
   * The contents of this file are subject to the Interbase Public
   * License Version 1.0 (the "License"); you may not use this file
--- 1,3 ----
! /*
   * The contents of this file are subject to the Interbase Public
   * License Version 1.0 (the "License"); you may not use this file
***************
*** 47,51 ****
   *      DESCRIPTION:    Property sheet implementation for WIN32 server
   *
-  * copyright (c) Borland International
   */
  
--- 23,26 ----

Index: property.rc
===================================================================
RCS file: /cvsroot/firebird/interbase/remote/property.rc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** property.rc	2000/08/03 20:54:09	1.1.1.1
--- property.rc	2001/04/05 17:05:43	1.2
***************
*** 47,51 ****
   IDS_IPC, "Local Client Support"
   IDS_NP, "NetBEUI Client Support"
!  IDS_SERVERPROD_NAME, "InterBase SQL Server for Windows 95/NT"
   IDS_LOCALPROD_NAME, "Local InterBase Server"
   IDS_STARTUP_NODLL, "REGCFG.DLL not found"
--- 47,51 ----
   IDS_IPC, "Local Client Support"
   IDS_NP, "NetBEUI Client Support"
!  IDS_SERVERPROD_NAME, "InterBase SQL Server for Windows"
   IDS_LOCALPROD_NAME, "Local InterBase Server"
   IDS_STARTUP_NODLL, "REGCFG.DLL not found"

[Firebird-checkins] CVS: interbase ChangeLog,1.20,1.21

[Frank Schlottmann-G. <fs...@us...>]

Update of /cvsroot/firebird/interbase
In directory usw-pr-cvs1:/tmp/cvs-serv3670/interbase

Modified Files:
	ChangeLog 
Log Message:
Marked *.gbak files as binaries

fsg
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/firebird/interbase/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** ChangeLog	2001/03/23 08:20:10	1.20
--- ChangeLog	2001/03/27 13:04:17	1.21
***************
*** 1,2 ****
--- 1,20 ----
+ 2001-03-26 00:29  nmcc
+ 
+ 	* interbase/builds/original/prefix.solx86:
+ 	
+ 	Changes based on port to Solaris x86 by Konstantin Kuznetsov.
+ 
+ 2001-03-26 00:24  nmcc
+ 
+ 	* interbase/jrd/ib_stdio.c:
+ 	
+ 	Fixes for gcc compiling and add Solaris x86 support.
+ 
+ 2001-03-26 00:21  nmcc
+ 
+ 	* interbase/: gpre/cob.c, jrd/isc.c, jrd/isc_ipc.c, pipe/head.c:
+ 	
+ 	Changes based on port to Solaris x86 by Konstantin Kuznetsov.
+ 
  2001-03-23 09:14  fsg
  
***************
*** 522,527 ****
  	
  	Changed all $Log$
! 	Changed all Revision 1.20  2001/03/23 08:20:10  fsg
! 	Changed all Updated ChangeLog
  	Changed all tags to $Id$ BTW this will hopefully set
  	this_build to 2 :-)
--- 540,547 ----
  	
  	Changed all $Log$
! 	Changed all Revision 1.21  2001/03/27 13:04:17  fsg
! 	Changed all Marked *.gbak files as binaries
! 	Changed all
! 	Changed all fsg
  	Changed all tags to $Id$ BTW this will hopefully set
  	this_build to 2 :-)

[Firebird-checkins] CVS: interbase/builds/original prefix.solx86,NONE,1.1

[Neil M. <nm...@us...>]

Update of /cvsroot/firebird/interbase/builds/original
In directory usw-pr-cvs1:/tmp/cvs-serv4914/builds/original

Added Files:
	prefix.solx86 
Log Message:
Changes based on port to Solaris x86 by Konstantin Kuznetsov.


***** Error reading new file: [Errno 2] No such file or directory: 'prefix.solx86'

[Firebird-checkins] CVS: interbase/jrd ib_stdio.c,1.2,1.3

[Neil M. <nm...@us...>]

Update of /cvsroot/firebird/interbase/jrd
In directory usw-pr-cvs1:/tmp/cvs-serv4412/jrd

Modified Files:
	ib_stdio.c 
Log Message:
Fixes for gcc compiling and add Solaris x86 support.


Index: ib_stdio.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/ib_stdio.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ib_stdio.c	2000/08/15 18:38:24	1.2
--- ib_stdio.c	2001/03/25 22:24:20	1.3
***************
*** 82,85 ****
--- 82,90 ----
   */
  
+ /* Firebird changes:-
+  * Small fixes to get gcc to compile module on Solaris sparc - Neil McCalden
+  * Add support for Solaris x86  - Neil McCalden
+  */
+  
  /*
  $Id$
***************
*** 182,186 ****
  	int	niobs;
  	IB_FILE	*iobs;
! } ib__sglue;
  
  /* The following 2 defines are taken from stdio/floatio.h in BSD */
--- 187,191 ----
  	int	niobs;
  	IB_FILE	*iobs;
! } ;
  
  /* The following 2 defines are taken from stdio/floatio.h in BSD */
***************
*** 207,211 ****
  static void      ib__smakebuf (IB_FILE *);
  static char     *ib__dtoa     (double, int, int, int *, int *, char **);
! 
  
  /*
--- 212,216 ----
  static void      ib__smakebuf (IB_FILE *);
  static char     *ib__dtoa     (double, int, int, int *, int *, char **);
! int ib__sflush(register IB_FILE *fp);
  
  /*
***************
*** 605,608 ****
--- 610,614 ----
  	std(IB__SWR|IB__SNBF, IB_STDERR_FILENO)	/* stderr */
  };
+ 	
  struct glue ib__sglue = { &uglue, 3, ib__sF };
  
***************
*** 4209,4213 ****
--- 4215,4224 ----
  
  #ifdef SOLARIS
+ #ifdef sparc
  #define IEEE_BIG_ENDIAN
+ #else
+ #define IEEE_LITTLE_ENDIAN
+ #undef VAX
+ #endif
  #define IEEE_ARITHMETIC
  #endif

[Firebird-checkins] CVS: interbase/gpre cob.c,1.5,1.6

[Neil M. <nm...@us...>]

Update of /cvsroot/firebird/interbase/gpre
In directory usw-pr-cvs1:/tmp/cvs-serv4100/gpre

Modified Files:
	cob.c 
Log Message:
Changes based on port to Solaris x86 by Konstantin Kuznetsov.


Index: cob.c
===================================================================
RCS file: /cvsroot/firebird/interbase/gpre/cob.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** cob.c	2001/01/06 15:36:35	1.5
--- cob.c	2001/03/25 22:21:33	1.6
***************
*** 20,25 ****
--- 20,28 ----
   * All Rights Reserved.
   * Contributor(s): ______________________________________.
+  * Solaris x86 changes - Konstantin Kuznetsov, Neil McCalden
   */
  
+  /* $Id$ */
+  
  #include "../jrd/ib_stdio.h"
  #include "../jrd/common.h"
***************
*** 124,128 ****
  #define MICROFOCUS
  #endif
! #ifdef sparc
  #define MICROFOCUS
  #endif
--- 127,131 ----
  #define MICROFOCUS
  #endif
! #if (defined sparc || defined SOLX86 )
  #define MICROFOCUS
  #endif
***************
*** 279,283 ****
  #endif
  
! #ifdef sparc
  #define USAGE_COMP		" USAGE IS COMP"
  #endif
--- 282,286 ----
  #endif
  
! #if (defined sparc || defined SOLX86 )
  #define USAGE_COMP		" USAGE IS COMP"
  #endif

[Firebird-checkins] CVS: interbase/pipe head.c,1.1.1.1,1.2

[Neil M. <nm...@us...>]

Update of /cvsroot/firebird/interbase/pipe
In directory usw-pr-cvs1:/tmp/cvs-serv4100/pipe

Modified Files:
	head.c 
Log Message:
Changes based on port to Solaris x86 by Konstantin Kuznetsov.


Index: head.c
===================================================================
RCS file: /cvsroot/firebird/interbase/pipe/head.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** head.c	2000/08/03 20:53:43	1.1.1.1
--- head.c	2001/03/25 22:21:34	1.2
***************
*** 20,25 ****
   * All Rights Reserved.
   * Contributor(s): ______________________________________.
   */
! 
  #include "../jrd/ib_stdio.h"
  #include <stdlib.h>
--- 20,28 ----
   * All Rights Reserved.
   * Contributor(s): ______________________________________.
+  * Solaris x86 changes - Konstantin Kuznetsov, Neil McCalden 
   */
!  
!  /* $Id$ */
!  
  #include "../jrd/ib_stdio.h"
  #include <stdlib.h>
***************
*** 45,48 ****
--- 48,55 ----
  #include <vfork.h>
  #endif
+ #endif
+ 
+ #ifdef SOLX86
+ #include <fcntl.h>
  #endif
  

[Firebird-checkins] CVS: interbase/jrd isc_ipc.c,1.2,1.3 isc.c,1.3,1.4

[Neil M. <nm...@us...>]

Update of /cvsroot/firebird/interbase/jrd
In directory usw-pr-cvs1:/tmp/cvs-serv4100/jrd

Modified Files:
	isc_ipc.c isc.c 
Log Message:
Changes based on port to Solaris x86 by Konstantin Kuznetsov.


Index: isc_ipc.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/isc_ipc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** isc_ipc.c	2000/10/12 02:52:17	1.2
--- isc_ipc.c	2001/03/25 22:21:34	1.3
***************
*** 20,25 ****
--- 20,28 ----
   * All Rights Reserved.
   * Contributor(s): ______________________________________.
+  * Solaris x86 changes - Konstantin Kuznetsov, Neil McCalden
   */
  
+  /* $Id$ */
+  
  #ifdef SHLIB_DEFS
  #define LOCAL_SHLIB_DEFS
***************
*** 42,45 ****
--- 45,52 ----
  #include <vfork.h>
  #endif
+ #endif
+ 
+ #ifdef SOLX86
+ #define HANDLER_ADDR_ARG
  #endif
  

Index: isc.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/isc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** isc.c	2001/03/16 14:55:31	1.3
--- isc.c	2001/03/25 22:21:34	1.4
***************
*** 22,25 ****
--- 22,26 ----
   * Added TCP_NO_DELAY option for superserver on Linux
   * FSG 16.03.2001 
+  * Solaris x86 changes - Konstantin Kuznetsov, Neil McCalden
   */
  /*
***************
*** 92,99 ****
  /* End of temporary file management specific stuff */
  
- #ifdef sparc
  #ifdef SOLARIS
  #include <sys/utsname.h>
- #endif
  #endif
  
--- 93,98 ----

[Firebird-checkins] CVS: interbase ChangeLog,1.19,1.20

[Frank Schlottmann-G. <fs...@us...>]

Update of /cvsroot/firebird/interbase
In directory usw-pr-cvs1:/tmp/cvs-serv16111/interbase

Modified Files:
	ChangeLog 
Log Message:
Updated ChangeLog


Index: ChangeLog
===================================================================
RCS file: /cvsroot/firebird/interbase/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** ChangeLog	2001/03/16 15:00:13	1.19
--- ChangeLog	2001/03/23 08:20:10	1.20
***************
*** 1,2 ****
--- 1,26 ----
+ 2001-03-23 09:14  fsg
+ 
+ 	* interbase/remote/inet.c:
+ 	
+ 	Comitted changes made by Lukas Zeller. INET_connect will now fall
+ 	back to 3050 if no entry in the services file is found (allowing a
+ 	client installation without changing the services  file)
+ 	
+ 	I added a small modification to allow the usage of a port number
+ 	instead of a service name in the connect string.
+ 	
+ 	Commited the changes to inet.c from the Borland tree.  These should
+ 	solve the start up errors on Linux (and so make the -signore switch
+ 	obsolete)
+ 	
+ 	fsg
+ 
+ 2001-03-18 16:42  skywalker
+ 
+ 	* interbase/burp/: backup.e, restore.e:
+ 	
+ 	Comitted changes made by Toni Martir that will print a progress
+ 	trace when doing a backup and restore.
+ 
  2001-03-16 15:55  fsg
  
***************
*** 498,502 ****
  	
  	Changed all $Log$
! 	Changed all Revision 1.19  2001/03/16 15:00:13  fsg
  	Changed all Updated ChangeLog
  	Changed all tags to $Id$ BTW this will hopefully set
--- 522,526 ----
  	
  	Changed all $Log$
! 	Changed all Revision 1.20  2001/03/23 08:20:10  fsg
  	Changed all Updated ChangeLog
  	Changed all tags to $Id$ BTW this will hopefully set

[Firebird-checkins] CVS: interbase/remote inet.c,1.3,1.4

[Frank Schlottmann-G. <fs...@us...>]

Update of /cvsroot/firebird/interbase/remote
In directory usw-pr-cvs1:/tmp/cvs-serv10657/interbase/remote

Modified Files:
	inet.c 
Log Message:
Comitted changes made by Lukas Zeller. INET_connect will now
fall back to 3050 if no entry in the services file is found 
(allowing a client installation without changing the services 
 file)

I added a small modification to allow the usage of a port
number instead of a service name in the connect string. 
 

Commited the changes to inet.c from the Borland tree.
These should solve the start up errors on Linux (and so make the
-signore switch obsolete)

fsg
 

Index: inet.c
===================================================================
RCS file: /cvsroot/firebird/interbase/remote/inet.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** inet.c	2001/03/16 14:55:31	1.3
--- inet.c	2001/03/23 08:14:01	1.4
***************
*** 177,180 ****
--- 177,182 ----
  #define SYS_ERR		gds_arg_win32
  #define INET_RETRY_ERRNO	WSAEINPROGRESS
+ #define INET_ADDR_IN_USE	WSAEADDRINUSE
+ #define sleep(seconds)  Sleep ((seconds) * 1000)
  #endif
  
***************
*** 228,231 ****
--- 230,237 ----
[...1005 lines suppressed...]
      PORT        port,
--- 4801,4805 ----
  }
  #endif /* WINDOWS_ONLY */
! 
  static void unhook_port (
      PORT        port,
***************
*** 4767,4771 ****
          }
  }
! 
  #ifdef  SUPERSERVER
  static void unhook_disconnected_ports (
--- 4829,4833 ----
          }
  }
! 
  #ifdef  SUPERSERVER
  static void unhook_disconnected_ports (

[Firebird-checkins] CVS: interbase/burp backup.e,1.4,1.5 restore.e,1.2,1.3

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/burp
In directory usw-pr-cvs1:/tmp/cvs-serv6578

Modified Files:
	backup.e restore.e 
Log Message:
Comitted changes made by Toni Martir that will print a progress
trace when doing a backup and restore.


Index: backup.e
===================================================================
RCS file: /cvsroot/firebird/interbase/burp/backup.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** backup.e	2000/09/04 16:04:21	1.4
--- backup.e	2001/03/18 15:42:39	1.5
***************
*** 20,23 ****
--- 20,24 ----
   * All Rights Reserved.
   * Contributor(s): ______________________________________.
+  * Toni Martir: Added verbose backup records as BACKUP_VERBOSE_INTERVAL
   */
  /*
***************
*** 59,62 ****
--- 60,66 ----
  */
  
+ /* VERBOSE INTERVAL WHEN BACKING RECORDS */
+ #define BACKUP_VERBOSE_INTERVAL		20000
+ 
  #define STUFF(byte)		*blr++ = (SCHAR) (byte)
  #define STUFF_WORD(word)	{STUFF (word); STUFF ((word) >> 8);}
***************
*** 1735,1738 ****
--- 1739,1746 ----
  	break;
      records++;
+ 	/* Verbose records */
+ 	if ((records % BACKUP_VERBOSE_INTERVAL)==0)
+ 		BURP_verbose (108, (TEXT*) records, NULL, NULL, NULL, NULL);
+ 
      PUT (rec_data);
      PUT_NUMERIC (att_data_length, record_length);

Index: restore.e
===================================================================
RCS file: /cvsroot/firebird/interbase/burp/restore.e,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** restore.e	2000/08/15 18:39:39	1.2
--- restore.e	2001/03/18 15:42:39	1.3
***************
*** 20,23 ****
--- 20,25 ----
   * All Rights Reserved.
   * Contributor(s): ______________________________________.
+  * Toni Martir: Verbose records restored as RESTORE_VERBOSE_INTERVAL,
+  * also verbose restoring indexes as DEFERRED when verbose
   */
  /*
***************
*** 88,91 ****
--- 90,94 ----
  				    */
  
+ #define RESTORE_VERBOSE_INTERVAL	10000
  #define	cvtbl_len	28
  static CONST struct s_t_cvtbl {
***************
*** 287,291 ****
--- 290,297 ----
                  FOR (REQUEST_HANDLE req_handle3)
                   IDX IN RDB$INDICES WITH IDX.RDB$INDEX_NAME EQ index_name
+                  {
+                     BURP_verbose(243,index_name,NULL_PTR,NULL_PTR,NULL_PTR,NULL_PTR);
                      MODIFY IDX USING IDX.RDB$INDEX_INACTIVE = TRUE;
+                  }
                      BURP_print(240, index_name, NULL_PTR, NULL_PTR, NULL_PTR, NULL_PTR);
                      /* msg 240 Index \"%s\" failed to activate because: */
***************
*** 325,328 ****
--- 331,377 ----
      {
  
+     /* Block added to verbose index creation by Toni Martir */
+ 	if (tdgbl->gbl_sw_verbose)
+ 	{
+ 		EXEC SQL SET TRANSACTION ISOLATION LEVEL READ COMMITTED NO_AUTO_UNDO;
+ 		if (gds__status [1]) 
+ 			EXEC SQL SET TRANSACTION;
+ 
+ 	    /* Activate first indexes that are not foreign keys */
+ 	    FOR (REQUEST_HANDLE req_handle1) IDS IN RDB$INDICES WITH
+ 	        IDS.RDB$INDEX_INACTIVE EQ DEFERRED_ACTIVE AND
+             IDS.RDB$FOREIGN_KEY MISSING
+ 	     		MODIFY IDS USING IDS.RDB$INDEX_INACTIVE=FALSE;
+ 	     	END_MODIFY;
+ 	     	ON_ERROR
+ 	      		general_on_error();
+ 	     	END_ERROR;
+ 	     
+ 	     	SAVE
+ 	     	/* existing ON_ERROR continues past error, beck */
+ 	     	ON_ERROR
+ 	      		BURP_print (173, IDS.RDB$INDEX_NAME, NULL_PTR, NULL_PTR, NULL_PTR, NULL_PTR);
+ 	      		BURP_print_status (tdgbl->status);
+ 	      		MODIFY IDS USING 
+ 	       			IDS.RDB$INDEX_INACTIVE = TRUE;
+ 	      		END_MODIFY;
+ 	      		ON_ERROR
+ 	         		general_on_error ();
+ 	            END_ERROR;
+ 	        END_ERROR;
+ 	        BURP_verbose(122,IDS.RDB$INDEX_NAME,NULL_PTR,NULL_PTR,NULL_PTR,NULL_PTR);
+ 	    END_FOR;
+ 	    ON_ERROR
+ 	        general_on_error ();
+ 	    END_ERROR;
+     	if (req_handle1)
+         	isc_release_request (req_status, &req_handle1);
+     	COMMIT;
+ 	    ON_ERROR
+         	general_on_error ();
+     	END_ERROR;
+  	}    
+  
+ 
      EXEC SQL SET TRANSACTION ISOLATION LEVEL READ COMMITTED NO_AUTO_UNDO;
      if (gds__status [1]) 
***************
*** 360,364 ****
              END_ERROR;
          END_ERROR;
! 
      END_FOR;
      ON_ERROR
--- 409,413 ----
              END_ERROR;
          END_ERROR;
!         BURP_verbose(122,IDS.RDB$INDEX_NAME,NULL_PTR,NULL_PTR,NULL_PTR,NULL_PTR);
      END_FOR;
      ON_ERROR
***************
*** 2527,2530 ****
--- 2576,2583 ----
  	
      records++;
+     
+     if ((records % RESTORE_VERBOSE_INTERVAL)==0) 
+      BURP_verbose(107,(TEXT*) records,NULL_PTR,NULL_PTR,NULL_PTR,NULL_PTR);
+     
      for (field = relation->rel_fields; field; field = field->fld_next)
  	if ((field->fld_type == blr_blob) || (field->fld_flags & FLD_array))
***************
*** 4243,4248 ****
--- 4296,4310 ----
  		X.RDB$INDEX_INACTIVE = get_numeric();
  		/* Defer foreign key index activation */
+ 		/* Modified by Toni Martir, all index deferred when verbose */
+ 		if (tdgbl->gbl_sw_verbose)
+         {
+         	if (X.RDB$INDEX_INACTIVE == FALSE) 
+ 		 		X.RDB$INDEX_INACTIVE = DEFERRED_ACTIVE;
+ 		} 
+ 		else
+         { 
  		if (X.RDB$INDEX_INACTIVE == FALSE && foreign_index)
  		    X.RDB$INDEX_INACTIVE = DEFERRED_ACTIVE;
+ 		}
  		if (tdgbl->gbl_sw_deactivate_indexes)
  		    X.RDB$INDEX_INACTIVE = TRUE;

[Firebird-checkins] CVS: interbase ChangeLog,1.18,1.19

[Frank Schlottmann-G. <fs...@us...>]

Update of /cvsroot/firebird/interbase
In directory usw-pr-cvs1:/tmp/cvs-serv22658/interbase

Modified Files:
	ChangeLog 
Log Message:
Updated ChangeLog


Index: ChangeLog
===================================================================
RCS file: /cvsroot/firebird/interbase/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** ChangeLog	2001/03/16 14:55:30	1.18
--- ChangeLog	2001/03/16 15:00:13	1.19
***************
*** 1,2 ****
--- 1,14 ----
+ 2001-03-16 15:55  fsg
+ 
+ 	* interbase/: jrd/common.h, jrd/ibase.h, jrd/isc.c, jrd/isc.h,
+ 	lock/config_params, remote/inet.c, remote/inet_server.c,
+ 	remote/protocol.h, utilities/guard.c, utilities/ibmgr.c,
+ 	utilities/ibmgr.h, utilities/ibmgrswi.h, utilities/srvrmgr.c,
+ 	utilities/tcp_nd.h:
+ 	
+ 	Second attempt to enable TCP_NO_DELAY for superserver on linux
+ 	
+ 	fsg
+ 
  2001-02-04 06:35  bellardo
  
***************
*** 486,493 ****
  	
  	Changed all $Log$
! 	Changed all Revision 1.18  2001/03/16 14:55:30  fsg
! 	Changed all Second attempt to enable TCP_NO_DELAY for superserver on linux
! 	Changed all
! 	Changed all fsg
  	Changed all tags to $Id$ BTW this will hopefully set
  	this_build to 2 :-)
--- 498,503 ----
  	
  	Changed all $Log$
! 	Changed all Revision 1.19  2001/03/16 15:00:13  fsg
! 	Changed all Updated ChangeLog
  	Changed all tags to $Id$ BTW this will hopefully set
  	this_build to 2 :-)

[Firebird-checkins] CVS: interbase/utilities guard.c,1.4,1.5 ibmgr.c,1.4,1.5 ibmgr.h,1.4,1.5 ibmgrswi.h,1.3,1.4 srvrmgr.c,1.3,1.4 tcp_nd.h,1.1,NONE

[Frank Schlottmann-G. <fs...@us...>]

Update of /cvsroot/firebird/interbase/utilities
In directory usw-pr-cvs1:/tmp/cvs-serv21967/interbase/utilities

Modified Files:
	guard.c ibmgr.c ibmgr.h ibmgrswi.h srvrmgr.c 
Removed Files:
	tcp_nd.h 
Log Message:
Second attempt to enable TCP_NO_DELAY for superserver on linux

fsg
 

Index: guard.c
===================================================================
RCS file: /cvsroot/firebird/interbase/utilities/guard.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** guard.c	2000/12/27 16:47:14	1.4
--- guard.c	2001/03/16 14:55:31	1.5
***************
*** 33,43 ****
  #include "../jrd/ib_stdio.h"
  #include <sys/types.h>
- #include "../utilities/tcp_nd.h"
  
- #ifdef SET_TCP_NODELAY
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <netinet/tcp.h>
- #endif
  
  
--- 33,37 ----
***************
*** 68,74 ****
  TEXT	**end, *p, c;
  USHORT	 option = FOREVER; /* holds FOREVER or ONETIME */
- #ifdef SET_TCP_NODELAY
- USHORT  no_nagle = FALSE;
- #endif
  TEXT	user_name[256]; /* holds the user name */
  USHORT	done = TRUE, fd_guard;
--- 62,65 ----
***************
*** 98,106 ****
                  option = IGNORE;
                  break;
- #ifdef SET_TCP_NODELAY
-             case 'N':
-                 no_nagle=TRUE;
-                 break;
- #endif
              default  :
  		ib_fprintf (ib_stderr, "Usage: %s [-signore | -onetime | -forever (default)]\n",
--- 89,92 ----
***************
*** 150,165 ****
      gds__log ("%s: guardian starting %s\n",
  			prog_name, SUPER_SERVER_BINARY); 
- #ifdef SET_TCP_NODELAY
-      if (no_nagle)
-      {
-         int value = 1;
-         setsockopt(0, IPPROTO_TCP, TCP_NODELAY, (char *)&value,sizeof(int));
-         setsockopt(1, IPPROTO_TCP, TCP_NODELAY, (char *)&value,sizeof(int));
-         setsockopt(2, IPPROTO_TCP, TCP_NODELAY, (char *)&value,sizeof(int));
-         gds__log ("%s: disabled Nagle algorithm for %s\n", prog_name, 
- 			server_args [1] ? server_args [1] : SUPER_SERVER_BINARY); 
- 
-      }
- #endif
      child_pid = UTIL_start_process (SUPER_SERVER_BINARY, server_args);
      if (child_pid == -1)
--- 136,139 ----

Index: ibmgr.c
===================================================================
RCS file: /cvsroot/firebird/interbase/utilities/ibmgr.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ibmgr.c	2000/12/27 16:47:14	1.4
--- ibmgr.c	2001/03/16 14:55:31	1.5
***************
*** 35,39 ****
  #include "../jrd/license.h"
  #include "../utilities/srvrmgr_proto.h"
- #include "../utilities/tcp_nd.h"
  
  
--- 35,38 ----
***************
*** 163,169 ****
  ibmgr_data.reattach |= (REA_HOST | REA_USER | REA_PASSWORD);
  
- #ifdef SET_TCP_NODELAY
-   ibmgr_data.nonagle = FALSE;
- #endif
  
  
--- 162,165 ----
***************
*** 434,440 ****
  	    case IN_SW_IBMGR_HELP:
  	    case IN_SW_IBMGR_Z:
- #ifdef SET_TCP_NODELAY
-             case IN_SW_IBMGR_NONAGLE:
- #endif
  		SRVRMGR_msg_get (MSG_SWNOPAR, msg);
  		ib_fprintf (OUTFILE, "%s\n", msg); 
--- 430,433 ----
***************
*** 721,731 ****
  		break;
  	  
- #ifdef SET_TCP_NODELAY
- 	
- 	    case IN_SW_IBMGR_NONAGLE:	
-                  ibmgr_data->nonagle = TRUE;
- 
-             break; 
- #endif
  	    case IN_SW_IBMGR_0:
  		SRVRMGR_msg_get (MSG_INVSW, msg);
--- 714,717 ----
***************
*** 822,830 ****
  ib_fprintf (OUTFILE, "or		ibmgr<RETURN>\n");
  ib_fprintf (OUTFILE, "		IBMGR> command [-option [parameter]]\n\n");
- #ifdef SET_TCP_NODELAY
- ib_fprintf (OUTFILE, "Commands are:	start [-once|-signore|-forever]	[-nonagle] start server\n");
- #else
- ib_fprintf (OUTFILE, "Commands are:	start [-once|-signore|-forever] start server\n");
- #endif
  ib_fprintf (OUTFILE, "		shut  [-now]		shutdown server\n");
  ib_fprintf (OUTFILE, "		show			show host and user\n");
--- 808,811 ----

Index: ibmgr.h
===================================================================
RCS file: /cvsroot/firebird/interbase/utilities/ibmgr.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ibmgr.h	2000/12/27 16:47:14	1.4
--- ibmgr.h	2001/03/16 14:55:31	1.5
***************
*** 26,30 ****
  #define _UTILITIES_IBMGR_H_
  
- #include "../utilities/tcp_nd.h"
  
  #ifdef APOLLO
--- 26,29 ----
***************
*** 106,112 ****
      TEXT		password[32];	/* user's passwd */
      BOOLEAN		shutdown;	/* shutdown is in progress */
- #ifdef SET_TCP_NODELAY
-     BOOLEAN		nonagle;	/*disable Nagle algorithm */
- #endif
      USHORT		reattach;	/* need to reattach because host,
  					   passwd or user has been changed */
--- 105,108 ----

Index: ibmgrswi.h
===================================================================
RCS file: /cvsroot/firebird/interbase/utilities/ibmgrswi.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ibmgrswi.h	2000/12/27 16:47:14	1.3
--- ibmgrswi.h	2001/03/16 14:55:31	1.4
***************
*** 27,31 ****
  
  #include "../jrd/common.h"
- #include "../utilities/tcp_nd.h"
  
  /* Switch constants */
--- 27,30 ----
***************
*** 57,68 ****
  #define IN_SW_IBMGR_SIGNORE     19      /* start server, restart when it dies, even if it was a start up error */
  
- #ifdef SET_TCP_NODELAY
- /* as some Linux users report that disabling Nagle algorithm will result in
-    better performance, I decided to add this option to ibmgr and ibguard
-    on Linux
-    FSG 26.Dez.2000
- */
- #define IN_SW_IBMGR_NONAGLE     20      /* disable Nagle algorithm */
- #endif
  
  #define IN_SW_IBMGR_AMBIG	99	/* ambiguous switch */
--- 56,59 ----
***************
*** 73,79 ****
      IN_SW_IBMGR_FOREVER,	0,	"FOREVER",	0, 0, 0, FALSE,	0,	1,	NULL,	/* restart when server dies */
      IN_SW_IBMGR_SIGNORE,        0,      "SIGNORE",      0, 0, 0, FALSE, 0,      1,      NULL,   /* dito, ignore start up error */
- #ifdef SET_TCP_NODELAY
-     IN_SW_IBMGR_NONAGLE,        0,      "NONAGLE",      0, 0, 0, FALSE, 0,      3,      NULL,   /* disable Nagle algorithm */
- #endif
      IN_SW_IBMGR_SHUT,		0,	"SHUT",		0, 0, 0, FALSE,	0,	3,      NULL,   /* shutdown server */
      IN_SW_IBMGR_NOW,		0,	"NOW",		0, 0, 0, FALSE,	0,	3,      NULL,   /* immidiate shutdown */
--- 64,67 ----

Index: srvrmgr.c
===================================================================
RCS file: /cvsroot/firebird/interbase/utilities/srvrmgr.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** srvrmgr.c	2000/12/27 16:47:14	1.3
--- srvrmgr.c	2001/03/16 14:55:31	1.4
***************
*** 31,35 ****
  #include <sys/types.h>
  #include <sys/wait.h>
- #include "../utilities/tcp_nd.h"
  
  
--- 31,34 ----
***************
*** 493,505 ****
  else
      argv[1] = "-f";
- 
- #ifdef SET_TCP_NODELAY
- if (data->nonagle)
- {
-     argv[2] = "-n"; /*tell ibguard to disable Nagle algorithm FSG 27.Dez.2000*/
-     argv[3] = NULL; 
- }
- else
- #endif
      argv[2] = NULL;
  
--- 492,495 ----

--- tcp_nd.h DELETED ---

[Firebird-checkins] CVS: interbase/remote inet.c,1.2,1.3 inet_server.c,1.4,1.5 protocol.h,1.3,1.4

[Frank Schlottmann-G. <fs...@us...>]

Update of /cvsroot/firebird/interbase/remote
In directory usw-pr-cvs1:/tmp/cvs-serv21967/interbase/remote

Modified Files:
	inet.c inet_server.c protocol.h 
Log Message:
Second attempt to enable TCP_NO_DELAY for superserver on linux

fsg
 

Index: inet.c
===================================================================
RCS file: /cvsroot/firebird/interbase/remote/inet.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** inet.c	2000/09/30 12:03:56	1.2
--- inet.c	2001/03/16 14:55:31	1.3
***************
*** 20,25 ****
   * All Rights Reserved.
   * Contributor(s): ______________________________________.
   */
! 
  #include "../jrd/ib_stdio.h"
  #include <errno.h>
--- 20,29 ----
   * All Rights Reserved.
   * Contributor(s): ______________________________________.
+  * Added TCP_NO_DELAY option for superserver on Linux
+  * FSG 16.03.2001 
   */
! /*
! $Id$
! */
  #include "../jrd/ib_stdio.h"
  #include <errno.h>
***************
*** 36,39 ****
--- 40,48 ----
  #define FD_SETSIZE 1024
  #endif
+ 
+ #ifdef SET_TCP_NO_DELAY
+ #include <netinet/tcp.h>
+ #endif
+ 
  #endif /* SUPERSERVER */
  
***************
*** 248,251 ****
--- 257,270 ----
  };
  
+ 
+ 
+ #ifdef SET_TCP_NO_DELAY
+ USHORT      INET_no_nagle;
+  
+ static struct ipccfg   INET_tcp_delay [] = {
+    ISCCFG_NO_NAGLE, 0, &INET_no_nagle, 0, 0,
+    NULL,                0, NULL,            0, 0
+ };
+ #endif
  /*
  #define DEBUG	1
***************
*** 1059,1063 ****
      USHORT	flag,
      SCHAR       *dpb, 
!     SSHORT      dpb_length)
  {
  /**************************************
--- 1078,1083 ----
      USHORT	flag,
      SCHAR       *dpb, 
!     SSHORT      dpb_length
!     )
  {
  /**************************************
***************
*** 1088,1091 ****
--- 1108,1113 ----
  int			optval;
  #endif
+ 
+ 
   
  #ifdef DEBUG
***************
*** 1352,1355 ****
--- 1374,1404 ----
          return NULL;
          }
+ 
+ #ifdef SET_TCP_NO_DELAY
+ 
+      ISC_get_config (LOCK_HEADER, INET_tcp_delay);
+      if (INET_no_nagle)
+         {
+         
+          optval = TRUE;
+          n = setsockopt ((SOCKET) port->port_handle, SOL_SOCKET, TCP_NODELAY,
+ 		         (SCHAR*) &optval, sizeof (optval));
+         
+          gds__log ("inet log: disabled Nagle algorithm \n");
+                                         
+         
+         
+          if (n == -1)
+              {
+               inet_error (port, "setsockopt TCP_NODELAY", isc_net_connect_listen_err, ERRNO);
+               disconnect (port);
+               return NULL;
+              }
+        }      
+ #endif
+ 
+ 
+ 
+ 
      }
  

Index: inet_server.c
===================================================================
RCS file: /cvsroot/firebird/interbase/remote/inet_server.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** inet_server.c	2000/12/17 16:37:42	1.4
--- inet_server.c	2001/03/16 14:55:31	1.5
***************
*** 20,25 ****
   * All Rights Reserved.
   * Contributor(s): ______________________________________.
   */
! 
  #include "../jrd/ib_stdio.h"
  #include <stdlib.h>
--- 20,29 ----
   * All Rights Reserved.
   * Contributor(s): ______________________________________.
+  * Added TCP_NO_DELAY option for superserver on Linux
+  * FSG 16.03.2001 
   */
! /*
! $Id$
! */
  #include "../jrd/ib_stdio.h"
  #include <stdlib.h>
***************
*** 139,143 ****
  static int	INET_SERVER_start = 0;
  static USHORT	INET_SERVER_flag = 0;
! 
  #ifdef WINDOWS_ROUTER
  int PASCAL WinMain (
--- 143,147 ----
  static int	INET_SERVER_start = 0;
  static USHORT	INET_SERVER_flag = 0;
! 
  #ifdef WINDOWS_ROUTER
  int PASCAL WinMain (
***************
*** 196,199 ****
--- 200,205 ----
  multi_client = multi_threaded = FALSE;
  
+ 
+ 
  #ifdef APOLLO
  standalone = TRUE;
***************
*** 244,247 ****
--- 250,254 ----
  		    break;
  
+ 
  		case 'I':
  		    standalone = FALSE;
***************
*** 352,356 ****
      THREAD_ENTER;
      port = INET_connect (protocol, NULL_PTR, status_vector, INET_SERVER_flag,
! 			 NULL_PTR, 0);
      THREAD_EXIT;
      if (!port)
--- 359,364 ----
      THREAD_ENTER;
      port = INET_connect (protocol, NULL_PTR, status_vector, INET_SERVER_flag,
! 			 NULL_PTR, 0
! 			 );
      THREAD_EXIT;
      if (!port)

Index: protocol.h
===================================================================
RCS file: /cvsroot/firebird/interbase/remote/protocol.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** protocol.h	2000/10/12 02:52:18	1.3
--- protocol.h	2001/03/16 14:55:31	1.4
***************
*** 20,25 ****
   * All Rights Reserved.
   * Contributor(s): ______________________________________.
   */
! 
  #ifndef _REMOTE_PROTOCOL_H_
  #define _REMOTE_PROTOCOL_H_
--- 20,29 ----
   * All Rights Reserved.
   * Contributor(s): ______________________________________.
+  * Added TCP_NO_DELAY option for superserver on Linux
+  * FSG 16.03.2001 
   */
! /*
! $Id$
! */
  #ifndef _REMOTE_PROTOCOL_H_
  #define _REMOTE_PROTOCOL_H_

[Firebird-checkins] CVS: interbase/lock config_params,1.1.1.1,1.2

[Frank Schlottmann-G. <fs...@us...>]

Update of /cvsroot/firebird/interbase/lock
In directory usw-pr-cvs1:/tmp/cvs-serv21967/interbase/lock

Modified Files:
	config_params 
Log Message:
Second attempt to enable TCP_NO_DELAY for superserver on linux

fsg
 

Index: config_params
===================================================================
RCS file: /cvsroot/firebird/interbase/lock/config_params,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** config_params	2000/08/03 20:52:00	1.1.1.1
--- config_params	2001/03/16 14:55:31	1.2
***************
*** 7,8 ****
--- 7,9 ----
  #V4_EVENT_MEM_SIZE	32768
  #ANY_EVENT_MEM_SIZE	32768
+ #TCP_NO_NAGLE           0