Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch early-binding Excluding Merge-Ins
This is equivalent to a diff from 90fd7599e7 to c200c4219b
2011-08-02
| ||
22:55 | Mark all functions in generic/mysqlNative.c as inline In early-binding build mode all the functions in this module perform nothing more than simple accessing so they are good candidates for inlining. Leaf check-in: c200c4219b user: kostix tags: early-binding | |
22:53 | Provide support for the "inline" C compiler keyword check-in: 37b9b61af4 user: kostix tags: early-binding | |
2011-08-01
| ||
14:50 | Extend support to MSVC10. Thanks to Twylite. check-in: 9972d7cf7d user: dgp tags: trunk | |
2011-07-30
| ||
18:30 | Create new branch named "early-binding" check-in: b5ef47ad0a user: kostix tags: early-binding | |
2011-07-27
| ||
14:27 | Missed bit of updating to TEA 3.9/latest sampleextension check-in: 90fd7599e7 user: dgp tags: trunk | |
2011-07-19
| ||
14:16 | fix typos in ChangeLogs. check-in: 7799d26ac9 user: kennykb tags: trunk | |
Changes to tdbcmysql/configure.
more than 10,000 changes
Changes to tdbcmysql/configure.in.
︙ | ︙ | |||
90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 | AC_C_INLINE AC_CHECK_TYPE([long long],[ AC_DEFINE([HAVE_LONG_LONG],[1]) AC_CHECK_SIZEOF([long long]) ],[],[]) AC_CHECK_SIZEOF([long]) AC_DEFINE([DONT_TD_VOID],[1]) #----------------------------------------------------------------------- # Specify the C source files to compile in TEA_ADD_SOURCES, # public headers that need to be installed in TEA_ADD_HEADERS, # stub library C source files to compile in TEA_ADD_STUB_SOURCES, # and runtime Tcl library files in TEA_ADD_TCL_SOURCES. # This defines PKG(_STUB)_SOURCES, PKG(_STUB)_OBJECTS, PKG_HEADERS # and PKG_TCL_SOURCES. #----------------------------------------------------------------------- | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > | > > > > > > > | 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 | AC_C_INLINE AC_CHECK_TYPE([long long],[ AC_DEFINE([HAVE_LONG_LONG],[1]) AC_CHECK_SIZEOF([long long]) ],[],[]) AC_CHECK_SIZEOF([long]) AC_DEFINE([DONT_TD_VOID],[1]) #----------------------------------------------------------------------- # Check if we need to enable early binding to the MySQL client # library in the driver. #----------------------------------------------------------------------- AC_DEFUN(TDBC_CHECK_EARLY_BINDING, [ AC_MSG_CHECKING([whether to enable early binding to the client library]) AC_ARG_ENABLE([early-binding], AC_HELP_STRING([--enable-early-binding], [Link database access library to the driver (deault: no). By default, the driver attempts to load the database access library at runtime using a set of well-known filenames. If this option is set to "yes", the database access library will instead be linked to the driver in a usual way.]), [TDBC_EARLY_BINDING=$enableval], [TDBC_EARLY_BINDING=no]) echo "${TDBC_EARLY_BINDING}" AC_SUBST(TDBC_EARLY_BINDING) ]) TDBC_CHECK_EARLY_BINDING #----------------------------------------------------------------------- # Allow the user to specify where the MySQL include files # and libraries are located. This is not used when building # normally, using database library stubs. #----------------------------------------------------------------------- AC_ARG_WITH([mysql-includes], AC_HELP_STRING([--with-mysql-includes], [location of MySQL include files. Only used when configuring with the "--enable-early-binding" option.]), [TEA_ADD_INCLUDES(-I$withval)]) AC_ARG_WITH([mysql-libs], AC_HELP_STRING([--with-mysql-libs], [location of MySQL client libraries. Only used when configuring with the "--enable-early-binding" option.]), [TEA_ADD_LIBS(-L$withval)]) #----------------------------------------------------------------------- # Check for inlining #----------------------------------------------------------------------- AC_DEFUN(TDBC_C_INLINE, [ AC_C_INLINE case $ac_cv_c_inline in inline|yes) # Do nothing, the compiler supports the "inline" keyword ;; no) TEA_ADD_CFLAGS([-Dinline=]) ;; *) TEA_ADD_CFLAGS([-Dinline=$ac_cv_c_inline]) ;; esac ]) TDBC_C_INLINE #----------------------------------------------------------------------- # Specify the C source files to compile in TEA_ADD_SOURCES, # public headers that need to be installed in TEA_ADD_HEADERS, # stub library C source files to compile in TEA_ADD_STUB_SOURCES, # and runtime Tcl library files in TEA_ADD_TCL_SOURCES. # This defines PKG(_STUB)_SOURCES, PKG(_STUB)_OBJECTS, PKG_HEADERS # and PKG_TCL_SOURCES. #----------------------------------------------------------------------- TEA_ADD_SOURCES(generic/tdbcmysql.c) TEA_ADD_HEADERS(generic/mysqlStubs.h) if test "x$TDBC_EARLY_BINDING" == "xno" ; then TEA_ADD_SOURCES(generic/mysqlStubInit.c) TEA_ADD_HEADERS(generic/fakemysql.h) TEA_ADD_CFLAGS([-DUSE_DBLIB_STUBS]) else AC_CHECK_LIB([mysqlclient], [mysql_server_init], [TEA_ADD_LIBS([-lmysqlclient])], [AC_MSG_ERROR("ouch!")]) dnl AC_CHECK_HEADER([mysql.h]) fi if test "${TCL_MAJOR_VERSION}" -eq 8 ; then if test "${TCL_MINOR_VERSION}" -eq 5 ; then TEA_ADD_INCLUDES([${TCLOO_INCLUDE_SPEC}]) TEA_ADD_LIBS([${TCLOO_STUB_LIB_SPEC}]) fi fi TEA_ADD_CFLAGS([${TCLOO_CFLAGS}]) |
︙ | ︙ |
Added tdbcmysql/generic/mysqlCompat.c.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 | static unsigned long mysqlClientVersion; /* Version number of MySQL */ /* *----------------------------------------------------------------------------- * * MysqlSaveClientVersion -- * * Store version number of the client library for future use * by the functions in this module * *----------------------------------------------------------------------------- */ static void MysqlSaveClientVersion(unsigned long ver) { mysqlClientVersion = ver; } /* *----------------------------------------------------------------------------- * * MysqlGetBindSize -- * * Returns the size of an instance of a MYSQL_BIND object * depending on the version of the client library loaded * *----------------------------------------------------------------------------- */ static size_t MysqlGetBindSize() { if (mysqlClientVersion >= 50100) { return sizeof(struct st_mysql_bind_51); } else { return sizeof(struct st_mysql_bind_50); } } /* *----------------------------------------------------------------------------- * * MysqlBindIndex -- * * Returns a pointer to one of an array of MYSQL_BIND objects * *----------------------------------------------------------------------------- */ static MYSQL_BIND* MysqlBindIndex( MYSQL_BIND* b, /* Binding array to alter */ int i /* Index in the binding array */ ) { if (mysqlClientVersion >= 50100) { return (MYSQL_BIND*)(((struct st_mysql_bind_51*) b) + i); } else { return (MYSQL_BIND*)(((struct st_mysql_bind_50*) b) + i); } } /* *----------------------------------------------------------------------------- * * MysqlFieldIndex -- * * Return a pointer to a given MYSQL_FIELD structure in an array * * The MYSQL_FIELD structure grows by one pointer between 5.0 and 5.1. * Our code never creates a MYSQL_FIELD, nor does it try to access that * pointer, so we handle things simply by casting the types. * *----------------------------------------------------------------------------- */ static MYSQL_FIELD* MysqlFieldIndex(MYSQL_FIELD* fields, /* Pointer to the array*/ int i) /* Index in the array */ { MYSQL_FIELD* retval; if (mysqlClientVersion >= 50100) { retval = (MYSQL_FIELD*)(((struct st_mysql_field_51*) fields)+i); } else { retval = (MYSQL_FIELD*)(((struct st_mysql_field_50*) fields)+i); } return retval; } /* *----------------------------------------------------------------------------- * * MysqlBindAllocBuffer -- * * Allocates the buffer in a MYSQL_BIND object * * Results: * Returns a pointer to the allocated buffer * *----------------------------------------------------------------------------- */ static void* MysqlBindAllocBuffer( MYSQL_BIND* b, /* Pointer to a binding array */ int i, /* Index into the array */ unsigned long len /* Length of the buffer to allocate or 0 */ ) { void* block = NULL; if (len != 0) { block = ckalloc(len); } if (mysqlClientVersion >= 50100) { ((struct st_mysql_bind_51*) b)[i].buffer = block; ((struct st_mysql_bind_51*) b)[i].buffer_length = len; } else { ((struct st_mysql_bind_50*) b)[i].buffer = block; ((struct st_mysql_bind_50*) b)[i].buffer_length = len; } return block; } /* *----------------------------------------------------------------------------- * * MysqlBindFreeBuffer -- * * Frees trhe buffer in a MYSQL_BIND object * * Results: * None. * * Side effects: * Buffer is returned to the system. * *----------------------------------------------------------------------------- */ static void MysqlBindFreeBuffer( MYSQL_BIND* b, /* Pointer to a binding array */ int i /* Index into the array */ ) { if (mysqlClientVersion >= 50100) { struct st_mysql_bind_51* bindings = (struct st_mysql_bind_51*) b; if (bindings[i].buffer) { ckfree(bindings[i].buffer); bindings[i].buffer = NULL; } bindings[i].buffer_length = 0; } else { struct st_mysql_bind_50* bindings = (struct st_mysql_bind_50*) b; if (bindings[i].buffer) { ckfree(bindings[i].buffer); bindings[i].buffer = NULL; } bindings[i].buffer_length = 0; } } /* *----------------------------------------------------------------------------- * * MysqlBindGetBufferLength, MysqlBindSetBufferType, MysqlBindGetBufferType, * MysqlBindSetLength, MysqlBindSetIsNull, * MysqlBindSetError -- * * Access the fields of a MYSQL_BIND object * *----------------------------------------------------------------------------- */ static void* MysqlBindGetBuffer( MYSQL_BIND* b, /* Binding array to alter */ int i /* Index in the binding array */ ) { if (mysqlClientVersion >= 50100) { return ((struct st_mysql_bind_51*) b)[i].buffer; } else { return ((struct st_mysql_bind_50*) b)[i].buffer; } } static unsigned long MysqlBindGetBufferLength( MYSQL_BIND* b, /* Binding array to alter */ int i /* Index in the binding array */ ) { if (mysqlClientVersion >= 50100) { return ((struct st_mysql_bind_51*) b)[i].buffer_length; } else { return ((struct st_mysql_bind_50*) b)[i].buffer_length; } } static enum enum_field_types MysqlBindGetBufferType( MYSQL_BIND* b, /* Binding array to alter */ int i /* Index in the binding array */ ) { if (mysqlClientVersion >= 50100) { return ((struct st_mysql_bind_51*) b)[i].buffer_type; } else { return ((struct st_mysql_bind_50*) b)[i].buffer_type; } } static void MysqlBindSetBufferType( MYSQL_BIND* b, /* Binding array to alter */ int i, /* Index in the binding array */ enum enum_field_types t /* Buffer type to assign */ ) { if (mysqlClientVersion >= 50100) { ((struct st_mysql_bind_51*) b)[i].buffer_type = t; } else { ((struct st_mysql_bind_50*) b)[i].buffer_type = t; } } static void MysqlBindSetLength( MYSQL_BIND* b, /* Binding array to alter */ int i, /* Index in the binding array */ unsigned long* p /* Length pointer to assign */ ) { if (mysqlClientVersion >= 50100) { ((struct st_mysql_bind_51*) b)[i].length = p; } else { ((struct st_mysql_bind_50*) b)[i].length = p; } } static void MysqlBindSetIsNull( MYSQL_BIND* b, /* Binding array to alter */ int i, /* Index in the binding array */ my_bool* p /* "Is null" indicator pointer to assign */ ) { if (mysqlClientVersion >= 50100) { ((struct st_mysql_bind_51*) b)[i].is_null = p; } else { ((struct st_mysql_bind_50*) b)[i].is_null = p; } } static void MysqlBindSetError( MYSQL_BIND* b, /* Binding array to alter */ int i, /* Index in the binding array */ my_bool* p /* Error indicator pointer to assign */ ) { if (mysqlClientVersion >= 50100) { ((struct st_mysql_bind_51*) b)[i].error = p; } else { ((struct st_mysql_bind_50*) b)[i].error = p; } } /* vim: set ts=8 sw=4 sts=4 noet: */ |
Added tdbcmysql/generic/mysqlNative.c.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 | static inline void MysqlSaveClientVersion(unsigned long ver) { /* Intentionally does nothing */ } static inline size_t MysqlGetBindSize() { return sizeof(MYSQL_BIND); } static inline MYSQL_BIND* MysqlBindIndex( MYSQL_BIND* b, int i ) { return b + i; } static inline MYSQL_FIELD* MysqlFieldIndex( MYSQL_FIELD* fields, int i) { return fields + i; } static inline void* MysqlBindAllocBuffer( MYSQL_BIND* b, /* Pointer to a binding array */ int i, /* Index into the array */ unsigned long len /* Length of the buffer to allocate or 0 */ ) { void* block = NULL; if (len != 0) { block = ckalloc(len); } b[i].buffer = block; b[i].buffer_length = len; return block; } static inline void MysqlBindFreeBuffer( MYSQL_BIND* b, /* Pointer to a binding array */ int i /* Index into the array */ ) { if (b[i].buffer) { ckfree(b[i].buffer); b[i].buffer = NULL; } b[i].buffer_length = 0; } static inline void* MysqlBindGetBuffer( MYSQL_BIND* b, /* Binding array to alter */ int i /* Index in the binding array */ ) { return b[i].buffer; } static inline unsigned long MysqlBindGetBufferLength( MYSQL_BIND* b, /* Binding array to alter */ int i /* Index in the binding array */ ) { return b[i].buffer_length; } static inline enum enum_field_types MysqlBindGetBufferType( MYSQL_BIND* b, /* Binding array to alter */ int i /* Index in the binding array */ ) { return b[i].buffer_type; } static inline void MysqlBindSetBufferType( MYSQL_BIND* b, /* Binding array to alter */ int i, /* Index in the binding array */ enum enum_field_types t /* Buffer type to assign */ ) { b[i].buffer_type = t; } static inline void MysqlBindSetLength( MYSQL_BIND* b, /* Binding array to alter */ int i, /* Index in the binding array */ unsigned long* p /* Length pointer to assign */ ) { b[i].length = p; } static inline void MysqlBindSetIsNull( MYSQL_BIND* b, /* Binding array to alter */ int i, /* Index in the binding array */ my_bool* p /* "Is null" indicator pointer to assign */ ) { b[i].is_null = p; } static inline void MysqlBindSetError( MYSQL_BIND* b, /* Binding array to alter */ int i, /* Index in the binding array */ my_bool* p /* Error indicator pointer to assign */ ) { b[i].error = p; } /* vim: set ts=8 sw=4 sts=4 noet: */ |
Changes to tdbcmysql/generic/tdbcmysql.c.
︙ | ︙ | |||
20 21 22 23 24 25 26 | #include <tcl.h> #include <tclOO.h> #include <tdbc.h> #include <stdio.h> #include <string.h> | > | > > > > > < < | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 | #include <tcl.h> #include <tclOO.h> #include <tdbc.h> #include <stdio.h> #include <string.h> #ifdef USE_DBLIB_STUBS # include "fakemysql.h" # include "mysqlCompat.c" #else # include <mysql.h> # include "mysqlNative.c" #endif /* USE_DBLIB_STUBS */ /* Static data contained in this file */ TCL_DECLARE_MUTEX(mysqlMutex); /* Mutex protecting the global environment * and its reference count */ static int mysqlRefCount = 0; /* Reference count on the global environment */ Tcl_LoadHandle mysqlLoadHandle = NULL; /* Handle to the MySQL library */ /* * Objects to create within the literal pool */ const char* LiteralValues[] = { "", |
︙ | ︙ | |||
384 385 386 387 388 389 390 | ISOL_SERIALIZABLE, ISOL_NONE = -1 }; /* Declarations of static functions appearing in this file */ static MYSQL_BIND* MysqlBindAlloc(int nBindings); | < < < < < < | 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 | ISOL_SERIALIZABLE, ISOL_NONE = -1 }; /* Declarations of static functions appearing in this file */ static MYSQL_BIND* MysqlBindAlloc(int nBindings); static void MysqlBindSetBufferType(MYSQL_BIND* b, int i, enum enum_field_types t); static unsigned long MysqlBindGetBufferLength(MYSQL_BIND* b, int i); static void MysqlBindSetLength(MYSQL_BIND* b, int i, unsigned long* p); static void MysqlBindSetIsNull(MYSQL_BIND* b, int i, my_bool* p); static void MysqlBindSetError(MYSQL_BIND* b, int i, my_bool* p); static void TransferMysqlError(Tcl_Interp* interp, MYSQL* mysqlPtr); static void TransferMysqlStmtError(Tcl_Interp* interp, MYSQL_STMT* mysqlPtr); static Tcl_Obj* QueryConnectionOption(ConnectionData* cdata, Tcl_Interp* interp, int optionNum); static int ConfigureConnection(ConnectionData* cdata, Tcl_Interp* interp, int objc, Tcl_Obj *const objv[], int skip); |
︙ | ︙ | |||
714 715 716 717 718 719 720 | * *----------------------------------------------------------------------------- */ static MYSQL_BIND* MysqlBindAlloc(int nBindings) { | < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 | * *----------------------------------------------------------------------------- */ static MYSQL_BIND* MysqlBindAlloc(int nBindings) { void* retval = NULL; int size = nBindings * MysqlGetBindSize(); if (size != 0) { retval = ckalloc(size); memset(retval, 0, size); } return (MYSQL_BIND*) retval; } /* *----------------------------------------------------------------------------- * * TransferMysqlError -- * * Obtains the error message, SQL state, and error number from the |
︙ | ︙ | |||
3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 | /* * Initialize the MySQL library if this is the first interp using it */ Tcl_MutexLock(&mysqlMutex); if (mysqlRefCount == 0) { if ((mysqlLoadHandle = MysqlInitStubs(interp)) == NULL) { Tcl_MutexUnlock(&mysqlMutex); return TCL_ERROR; } mysql_library_init(0, NULL, NULL); | > > | | 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 | /* * Initialize the MySQL library if this is the first interp using it */ Tcl_MutexLock(&mysqlMutex); if (mysqlRefCount == 0) { #ifdef USE_DBLIB_STUBS if ((mysqlLoadHandle = MysqlInitStubs(interp)) == NULL) { Tcl_MutexUnlock(&mysqlMutex); return TCL_ERROR; } #endif /* USE_DBLIB_STUBS */ mysql_library_init(0, NULL, NULL); MysqlSaveClientVersion(mysql_get_client_version()); } ++mysqlRefCount; Tcl_MutexUnlock(&mysqlMutex); /* * TODO: mysql_thread_init, and keep a TSD reference count of users. */ |
︙ | ︙ | |||
3754 3755 3756 3757 3758 3759 3760 | Tcl_MutexLock(&mysqlMutex); if (--mysqlRefCount == 0) { mysql_library_end(); Tcl_FSUnloadFile(NULL, mysqlLoadHandle); } Tcl_MutexUnlock(&mysqlMutex); } | > > > | 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 | Tcl_MutexLock(&mysqlMutex); if (--mysqlRefCount == 0) { mysql_library_end(); Tcl_FSUnloadFile(NULL, mysqlLoadHandle); } Tcl_MutexUnlock(&mysqlMutex); } /* vim: set ts=8 sw=4 sts=4 noet: */ |