Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Get main.c to compile when HAVE_USLEEP is 0. (CVS 4245) |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
b27f022fb924709f1c5e4642d5d59cab |
User & Date: | drh 2007-08-20 11:12:41 |
Context
2007-08-20
| ||
13:14 | Bug fix in BTree shared cache locking code. (CVS 4246) check-in: 399d3e75 user: drh tags: trunk | |
11:12 | Get main.c to compile when HAVE_USLEEP is 0. (CVS 4245) check-in: b27f022f user: drh tags: trunk | |
06:44 | Update the locking-style code in os_unix.c. The updates are as yet untested. (CVS 4244) check-in: 41f2175b user: danielk1977 tags: trunk | |
Changes
Changes to src/main.c.
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
...
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
|
** ************************************************************************* ** Main file for the SQLite library. The routines in this file ** implement the programmer interface to the library. Routines in ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** ** $Id: main.c,v 1.385 2007/08/18 10:59:20 danielk1977 Exp $ */ #include "sqliteInt.h" #include "os.h" #include <ctype.h> /* ** The version of the library ................................................................................ if( prior + delay > timeout ){ delay = timeout - prior; if( delay<=0 ) return 0; } sqlite3OsSleep(db->pVfs, delay); return 1; #else int timeout = ((sqlite3 *)ptr)->busyTimeout; if( (count+1)*1000 > timeout ){ return 0; } sqlite3OsSleep(1000); return 1; #endif } /* ** Invoke the given busy handler. ** |
|
>
|
|
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
...
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
|
** ************************************************************************* ** Main file for the SQLite library. The routines in this file ** implement the programmer interface to the library. Routines in ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** ** $Id: main.c,v 1.386 2007/08/20 11:12:41 drh Exp $ */ #include "sqliteInt.h" #include "os.h" #include <ctype.h> /* ** The version of the library ................................................................................ if( prior + delay > timeout ){ delay = timeout - prior; if( delay<=0 ) return 0; } sqlite3OsSleep(db->pVfs, delay); return 1; #else sqlite3 *db = (sqlite3 *)ptr; int timeout = ((sqlite3 *)ptr)->busyTimeout; if( (count+1)*1000 > timeout ){ return 0; } sqlite3OsSleep(db->pVfs, 1000000); return 1; #endif } /* ** Invoke the given busy handler. ** |