mirror of
https://github.com/python/cpython.git
synced 2024-11-25 10:54:51 +08:00
00ee7baf49
which unfortunately means the errors from the bytes type change somewhat: bytes([300]) still raises a ValueError, but bytes([10**100]) now raises a TypeError (either that, or bytes(1.0) also raises a ValueError -- PyNumber_AsSsize_t() can only raise one type of exception.) Merged revisions 51188-51433 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r51189 | kurt.kaiser | 2006-08-10 19:11:09 +0200 (Thu, 10 Aug 2006) | 4 lines Retrieval of previous shell command was not always preserving indentation since 1.2a1) Patch 1528468 Tal Einat. ........ r51190 | guido.van.rossum | 2006-08-10 19:41:07 +0200 (Thu, 10 Aug 2006) | 3 lines Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. SF bug #1112549. ........ r51191 | guido.van.rossum | 2006-08-10 19:42:50 +0200 (Thu, 10 Aug 2006) | 2 lines News item for SF bug 1112549. ........ r51192 | guido.van.rossum | 2006-08-10 20:09:25 +0200 (Thu, 10 Aug 2006) | 2 lines Fix title -- it's rc1, not beta3. ........ r51194 | martin.v.loewis | 2006-08-10 21:04:00 +0200 (Thu, 10 Aug 2006) | 3 lines Update dangling references to the 3.2 database to mention that this is UCD 4.1 now. ........ r51195 | tim.peters | 2006-08-11 00:45:34 +0200 (Fri, 11 Aug 2006) | 6 lines Followup to bug #1069160. PyThreadState_SetAsyncExc(): internal correctness changes wrt refcount safety and deadlock avoidance. Also added a basic test case (relying on ctypes) and repaired the docs. ........ r51196 | tim.peters | 2006-08-11 00:48:45 +0200 (Fri, 11 Aug 2006) | 2 lines Whitespace normalization. ........ r51197 | tim.peters | 2006-08-11 01:22:13 +0200 (Fri, 11 Aug 2006) | 5 lines Whitespace normalization broke test_cgi, because a line of quoted test data relied on preserving a single trailing blank. Changed the string from raw to regular, and forced in the trailing blank via an explicit \x20 escape. ........ r51198 | tim.peters | 2006-08-11 02:49:01 +0200 (Fri, 11 Aug 2006) | 10 lines test_PyThreadState_SetAsyncExc(): This is failing on some 64-bit boxes. I have no idea what the ctypes docs mean by "integers", and blind-guessing here that it intended to mean the signed C "int" type, in which case perhaps I can repair this by feeding the thread id argument to type ctypes.c_long(). Also made the worker thread daemonic, so it doesn't hang Python shutdown if the test continues to fail. ........ r51199 | tim.peters | 2006-08-11 05:49:10 +0200 (Fri, 11 Aug 2006) | 6 lines force_test_exit(): This has been completely ineffective at stopping test_signal from hanging forever on the Tru64 buildbot. That could be because there's no such thing as signal.SIGALARM. Changed to the idiotic (but standard) signal.SIGALRM instead, and added some more debug output. ........ r51202 | neal.norwitz | 2006-08-11 08:09:41 +0200 (Fri, 11 Aug 2006) | 6 lines Fix the failures on cygwin (2006-08-10 fixed the actual locking issue). The first hunk changes the colon to an ! like other Windows variants. We need to always wait on the child so the lock gets released and no other tests fail. This is the try/finally in the second hunk. ........ r51205 | georg.brandl | 2006-08-11 09:15:38 +0200 (Fri, 11 Aug 2006) | 3 lines Add Chris McDonough (latest cgi.py patch) ........ r51206 | georg.brandl | 2006-08-11 09:26:10 +0200 (Fri, 11 Aug 2006) | 3 lines logging's atexit hook now runs even if the rest of the module has already been cleaned up. ........ r51212 | thomas.wouters | 2006-08-11 17:02:39 +0200 (Fri, 11 Aug 2006) | 4 lines Add ignore of *.pyc and *.pyo to Lib/xml/etree/. ........ r51215 | thomas.heller | 2006-08-11 21:55:35 +0200 (Fri, 11 Aug 2006) | 7 lines When a ctypes C callback function is called, zero out the result storage before converting the result to C data. See the comment in the code for details. Provide a better context for errors when the conversion of a callback function's result cannot be converted. ........ r51218 | neal.norwitz | 2006-08-12 03:43:40 +0200 (Sat, 12 Aug 2006) | 6 lines Klocwork made another run and found a bunch more problems. This is the first batch of fixes that should be easy to verify based on context. This fixes problem numbers: 220 (ast), 323-324 (symtable), 321-322 (structseq), 215 (array), 210 (hotshot), 182 (codecs), 209 (etree). ........ r51219 | neal.norwitz | 2006-08-12 03:45:47 +0200 (Sat, 12 Aug 2006) | 9 lines Even though _Py_Mangle() isn't truly public anyone can call it and there was no verification that privateobj was a PyString. If it wasn't a string, this could have allowed a NULL pointer to creep in below and crash. I wonder if this should be PyString_CheckExact? Must identifiers be strings or can they be subclasses? Klocwork #275 ........ r51220 | neal.norwitz | 2006-08-12 03:46:42 +0200 (Sat, 12 Aug 2006) | 5 lines It's highly unlikely, though possible for PyEval_Get*() to return NULLs. So be safe and do an XINCREF. Klocwork # 221-222. ........ r51221 | neal.norwitz | 2006-08-12 03:47:59 +0200 (Sat, 12 Aug 2006) | 7 lines This code is actually not used unless WITHOUT_COMPLEX is defined. However, there was no error checking that PyFloat_FromDouble returned a valid pointer. I believe this change is correct as it seemed to follow other code in the area. Klocwork # 292. ........ r51222 | neal.norwitz | 2006-08-12 03:49:12 +0200 (Sat, 12 Aug 2006) | 5 lines Handle NULL nodes while parsing. I'm not entirely sure this is correct. There might be something else that needs to be done to setup the error. Klocwork #295. ........ r51223 | neal.norwitz | 2006-08-12 03:50:38 +0200 (Sat, 12 Aug 2006) | 6 lines If _stat_float_times is false, we will try to INCREF ival which could be NULL. Return early in that case. The caller checks for PyErr_Occurred so this should be ok. Klocwork #297 ........ r51224 | neal.norwitz | 2006-08-12 03:51:12 +0200 (Sat, 12 Aug 2006) | 3 lines Move the assert which checks for a NULL pointer first. Klocwork #274. ........ r51225 | neal.norwitz | 2006-08-12 03:53:28 +0200 (Sat, 12 Aug 2006) | 5 lines Try to handle a malloc failure. I'm not entirely sure this is correct. There might be something else we need to do to handle the exception. Klocwork # 212-213 ........ r51226 | neal.norwitz | 2006-08-12 03:57:47 +0200 (Sat, 12 Aug 2006) | 6 lines I'm not sure why this code allocates this string for the error message. I think it would be better to always use snprintf and have the format limit the size of the name appropriately (like %.200s). Klocwork #340 ........ r51227 | neal.norwitz | 2006-08-12 04:06:34 +0200 (Sat, 12 Aug 2006) | 3 lines Check returned pointer is valid. Klocwork #233 ........ r51228 | neal.norwitz | 2006-08-12 04:12:30 +0200 (Sat, 12 Aug 2006) | 1 line Whoops, how did that get in there. :-) Revert all the parts of 51227 that were not supposed to go it. Only Modules/_ctypes/cfields.c was supposed to be changed ........ r51229 | neal.norwitz | 2006-08-12 04:33:36 +0200 (Sat, 12 Aug 2006) | 4 lines Don't deref v if it's NULL. Klocwork #214 ........ r51230 | neal.norwitz | 2006-08-12 05:16:54 +0200 (Sat, 12 Aug 2006) | 5 lines Check return of PyMem_MALLOC (garbage) is non-NULL. Check seq in both portions of if/else. Klocwork #289-290. ........ r51231 | neal.norwitz | 2006-08-12 05:17:41 +0200 (Sat, 12 Aug 2006) | 4 lines PyModule_GetDict() can fail, produce fatal errors if this happens on startup. Klocwork #298-299. ........ r51232 | neal.norwitz | 2006-08-12 05:18:50 +0200 (Sat, 12 Aug 2006) | 5 lines Verify verdat which is returned from malloc is not NULL. Ensure we don't pass NULL to free. Klocwork #306 (at least the first part, checking malloc) ........ r51233 | tim.peters | 2006-08-12 06:42:47 +0200 (Sat, 12 Aug 2006) | 35 lines test_signal: Signal handling on the Tru64 buildbot appears to be utterly insane. Plug some theoretical insecurities in the test script: - Verify that the SIGALRM handler was actually installed. - Don't call alarm() before the handler is installed. - Move everything that can fail inside the try/finally, so the test cleans up after itself more often. - Try sending all the expected signals in force_test_exit(), not just SIGALRM. Since that was fixed to actually send SIGALRM (instead of invisibly dying with an AttributeError), we've seen that sending SIGALRM alone does not stop this from hanging. - Move the "kill the child" business into the finally clause, so the child doesn't survive test failure to send SIGALRM to other tests later (there are also baffling SIGALRM-related failures in test_socket). - Cancel the alarm in the finally clause -- if the test dies early, we again don't want SIGALRM showing up to confuse a later test. Alas, this still relies on timing luck wrt the spawned script that sends the test signals, but it's hard to see how waiting for seconds can so often be so unlucky. test_threadedsignals: curiously, this test never fails on Tru64, but doesn't normally signal SIGALRM. Anyway, fixed an obvious (but probably inconsequential) logic error. ........ r51234 | tim.peters | 2006-08-12 07:17:41 +0200 (Sat, 12 Aug 2006) | 8 lines Ah, fudge. One of the prints here actually "shouldn't be" protected by "if verbose:", which caused the test to fail on all non-Windows boxes. Note that I deliberately didn't convert this to unittest yet, because I expect it would be even harder to debug this on Tru64 after conversion. ........ r51235 | georg.brandl | 2006-08-12 10:32:02 +0200 (Sat, 12 Aug 2006) | 3 lines Repair logging test spew caused by rev. 51206. ........ r51236 | neal.norwitz | 2006-08-12 19:03:09 +0200 (Sat, 12 Aug 2006) | 8 lines Patch #1538606, Patch to fix __index__() clipping. I modified this patch some by fixing style, some error checking, and adding XXX comments. This patch requires review and some changes are to be expected. I'm checking in now to get the greatest possible review and establish a baseline for moving forward. I don't want this to hold up release if possible. ........ r51238 | neal.norwitz | 2006-08-12 20:44:06 +0200 (Sat, 12 Aug 2006) | 10 lines Fix a couple of bugs exposed by the new __index__ code. The 64-bit buildbots were failing due to inappropriate clipping of numbers larger than 2**31 with new-style classes. (typeobject.c) In reviewing the code for classic classes, there were 2 problems. Any negative value return could be returned. Always return -1 if there was an error. Also make the checks similar with the new-style classes. I believe this is correct for 32 and 64 bit boxes, including Windows64. Add a test of classic classes too. ........ r51240 | neal.norwitz | 2006-08-13 02:20:49 +0200 (Sun, 13 Aug 2006) | 1 line SF bug #1539336, distutils example code missing ........ r51245 | neal.norwitz | 2006-08-13 20:10:10 +0200 (Sun, 13 Aug 2006) | 6 lines Move/copy assert for tstate != NULL before first use. Verify that PyEval_Get{Globals,Locals} returned valid pointers. Klocwork 231-232 ........ r51246 | neal.norwitz | 2006-08-13 20:10:28 +0200 (Sun, 13 Aug 2006) | 5 lines Handle a whole lot of failures from PyString_FromInternedString(). Should fix most of Klocwork 234-272. ........ r51247 | neal.norwitz | 2006-08-13 20:10:47 +0200 (Sun, 13 Aug 2006) | 8 lines cpathname could be NULL if it was longer than MAXPATHLEN. Don't try to write the .pyc to NULL. Check results of PyList_GetItem() and PyModule_GetDict() are not NULL. Klocwork 282, 283, 285 ........ r51248 | neal.norwitz | 2006-08-13 20:11:08 +0200 (Sun, 13 Aug 2006) | 6 lines Fix segfault when doing string formatting on subclasses of long if __oct__, __hex__ don't return a string. Klocwork 308 ........ r51250 | neal.norwitz | 2006-08-13 20:11:27 +0200 (Sun, 13 Aug 2006) | 5 lines Check return result of PyModule_GetDict(). Fix a bunch of refleaks in the init of the module. This would only be found when running python -v. ........ r51251 | neal.norwitz | 2006-08-13 20:11:43 +0200 (Sun, 13 Aug 2006) | 5 lines Handle malloc and fopen failures more gracefully. Klocwork 180-181 ........ r51252 | neal.norwitz | 2006-08-13 20:12:03 +0200 (Sun, 13 Aug 2006) | 7 lines It's very unlikely, though possible that source is not a string. Verify that PyString_AsString() returns a valid pointer. (The problem can arise when zlib.decompress doesn't return a string.) Klocwork 346 ........ r51253 | neal.norwitz | 2006-08-13 20:12:26 +0200 (Sun, 13 Aug 2006) | 5 lines Handle failures from lookup. Klocwork 341-342 ........ r51254 | neal.norwitz | 2006-08-13 20:12:45 +0200 (Sun, 13 Aug 2006) | 6 lines Handle failure from PyModule_GetDict() (Klocwork 208). Fix a bunch of refleaks in the init of the module. This would only be found when running python -v. ........ r51255 | neal.norwitz | 2006-08-13 20:13:02 +0200 (Sun, 13 Aug 2006) | 4 lines Really address the issue of where to place the assert for leftblock. (Followup of Klocwork 274) ........ r51256 | neal.norwitz | 2006-08-13 20:13:36 +0200 (Sun, 13 Aug 2006) | 4 lines Handle malloc failure. Klocwork 281 ........ r51258 | neal.norwitz | 2006-08-13 20:40:39 +0200 (Sun, 13 Aug 2006) | 4 lines Handle alloca failures. Klocwork 225-228 ........ r51259 | neal.norwitz | 2006-08-13 20:41:15 +0200 (Sun, 13 Aug 2006) | 1 line Get rid of compiler warning ........ r51261 | neal.norwitz | 2006-08-14 02:51:15 +0200 (Mon, 14 Aug 2006) | 1 line Ignore pgen.exe and kill_python.exe for cygwin ........ r51262 | neal.norwitz | 2006-08-14 02:59:03 +0200 (Mon, 14 Aug 2006) | 4 lines Can't return NULL from a void function. If there is a memory error, about the best we can do is call PyErr_WriteUnraisable and go on. We won't be able to do the call below either, so verify delstr is valid. ........ r51263 | neal.norwitz | 2006-08-14 03:49:54 +0200 (Mon, 14 Aug 2006) | 1 line Update purify doc some. ........ r51264 | thomas.heller | 2006-08-14 09:13:05 +0200 (Mon, 14 Aug 2006) | 2 lines Remove unused, buggy test function. Fixes klockwork issue #207. ........ r51265 | thomas.heller | 2006-08-14 09:14:09 +0200 (Mon, 14 Aug 2006) | 2 lines Check for NULL return value from new_CArgObject(). Fixes klockwork issues #183, #184, #185. ........ r51266 | thomas.heller | 2006-08-14 09:50:14 +0200 (Mon, 14 Aug 2006) | 2 lines Check for NULL return value of GenericCData_new(). Fixes klockwork issues #188, #189. ........ r51274 | thomas.heller | 2006-08-14 12:02:24 +0200 (Mon, 14 Aug 2006) | 2 lines Revert the change that tries to zero out a closure's result storage area because the size if unknown in source/callproc.c. ........ r51276 | marc-andre.lemburg | 2006-08-14 12:55:19 +0200 (Mon, 14 Aug 2006) | 11 lines Slightly revised version of patch #1538956: Replace UnicodeDecodeErrors raised during == and != compares of Unicode and other objects with a new UnicodeWarning. All other comparisons continue to raise exceptions. Exceptions other than UnicodeDecodeErrors are also left untouched. ........ r51277 | thomas.heller | 2006-08-14 13:17:48 +0200 (Mon, 14 Aug 2006) | 13 lines Apply the patch #1532975 plus ideas from the patch #1533481. ctypes instances no longer have the internal and undocumented '_as_parameter_' attribute which was used to adapt them to foreign function calls; this mechanism is replaced by a function pointer in the type's stgdict. In the 'from_param' class methods, try the _as_parameter_ attribute if other conversions are not possible. This makes the documented _as_parameter_ mechanism work as intended. Change the ctypes version number to 1.0.1. ........ r51278 | marc-andre.lemburg | 2006-08-14 13:44:34 +0200 (Mon, 14 Aug 2006) | 3 lines Readd NEWS items that were accidentally removed by r51276. ........ r51279 | georg.brandl | 2006-08-14 14:36:06 +0200 (Mon, 14 Aug 2006) | 3 lines Improve markup in PyUnicode_RichCompare. ........ r51280 | marc-andre.lemburg | 2006-08-14 14:57:27 +0200 (Mon, 14 Aug 2006) | 3 lines Correct an accidentally removed previous patch. ........ r51281 | thomas.heller | 2006-08-14 18:17:41 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1536908: Add support for AMD64 / OpenBSD. Remove the -no-stack-protector compiler flag for OpenBSD as it has been reported to be unneeded. ........ r51282 | thomas.heller | 2006-08-14 18:20:04 +0200 (Mon, 14 Aug 2006) | 1 line News item for rev 51281. ........ r51283 | georg.brandl | 2006-08-14 22:25:39 +0200 (Mon, 14 Aug 2006) | 3 lines Fix refleak introduced in rev. 51248. ........ r51284 | georg.brandl | 2006-08-14 23:34:08 +0200 (Mon, 14 Aug 2006) | 5 lines Make tabnanny recognize IndentationErrors raised by tokenize. Add a test to test_inspect to make sure indented source is recognized correctly. (fixes #1224621) ........ r51285 | georg.brandl | 2006-08-14 23:42:55 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1535500: fix segfault in BZ2File.writelines and make sure it raises the correct exceptions. ........ r51287 | georg.brandl | 2006-08-14 23:45:32 +0200 (Mon, 14 Aug 2006) | 3 lines Add an additional test: BZ2File write methods should raise IOError when file is read-only. ........ r51289 | georg.brandl | 2006-08-14 23:55:28 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1536071: trace.py should now find the full module name of a file correctly even on Windows. ........ r51290 | georg.brandl | 2006-08-15 00:01:24 +0200 (Tue, 15 Aug 2006) | 3 lines Cookie.py shouldn't "bogusly" use string._idmap. ........ r51291 | georg.brandl | 2006-08-15 00:10:24 +0200 (Tue, 15 Aug 2006) | 3 lines Patch #1511317: don't crash on invalid hostname info ........ r51292 | tim.peters | 2006-08-15 02:25:04 +0200 (Tue, 15 Aug 2006) | 2 lines Whitespace normalization. ........ r51293 | neal.norwitz | 2006-08-15 06:14:57 +0200 (Tue, 15 Aug 2006) | 3 lines Georg fixed one of my bugs, so I'll repay him with 2 NEWS entries. Now we're even. :-) ........ r51295 | neal.norwitz | 2006-08-15 06:58:28 +0200 (Tue, 15 Aug 2006) | 8 lines Fix the test for SocketServer so it should pass on cygwin and not fail sporadically on other platforms. This is really a band-aid that doesn't fix the underlying issue in SocketServer. It's not clear if it's worth it to fix SocketServer, however, I opened a bug to track it: http://python.org/sf/1540386 ........ r51296 | neal.norwitz | 2006-08-15 06:59:30 +0200 (Tue, 15 Aug 2006) | 3 lines Update the docstring to use a version a little newer than 1999. This was taken from a Debian patch. Should we update the version for each release? ........ r51298 | neal.norwitz | 2006-08-15 08:29:03 +0200 (Tue, 15 Aug 2006) | 2 lines Subclasses of int/long are allowed to define an __index__. ........ r51300 | thomas.heller | 2006-08-15 15:07:21 +0200 (Tue, 15 Aug 2006) | 1 line Check for NULL return value from new_CArgObject calls. ........ r51303 | kurt.kaiser | 2006-08-16 05:15:26 +0200 (Wed, 16 Aug 2006) | 2 lines The 'with' statement is now a Code Context block opener ........ r51304 | anthony.baxter | 2006-08-16 05:42:26 +0200 (Wed, 16 Aug 2006) | 1 line preparing for 2.5c1 ........ r51305 | anthony.baxter | 2006-08-16 05:58:37 +0200 (Wed, 16 Aug 2006) | 1 line preparing for 2.5c1 - no, really this time ........ r51306 | kurt.kaiser | 2006-08-16 07:01:42 +0200 (Wed, 16 Aug 2006) | 9 lines Patch #1540892: site.py Quitter() class attempts to close sys.stdin before raising SystemExit, allowing IDLE to honor quit() and exit(). M Lib/site.py M Lib/idlelib/PyShell.py M Lib/idlelib/CREDITS.txt M Lib/idlelib/NEWS.txt M Misc/NEWS ........ r51307 | ka-ping.yee | 2006-08-16 09:02:50 +0200 (Wed, 16 Aug 2006) | 6 lines Update code and tests to support the 'bytes_le' attribute (for little-endian byte order on Windows), and to work around clocks with low resolution yielding duplicate UUIDs. Anthony Baxter has approved this change. ........ r51308 | kurt.kaiser | 2006-08-16 09:04:17 +0200 (Wed, 16 Aug 2006) | 2 lines Get quit() and exit() to work cleanly when not using subprocess. ........ r51309 | marc-andre.lemburg | 2006-08-16 10:13:26 +0200 (Wed, 16 Aug 2006) | 2 lines Revert to having static version numbers again. ........ r51310 | martin.v.loewis | 2006-08-16 14:55:10 +0200 (Wed, 16 Aug 2006) | 2 lines Build _hashlib on Windows. Build OpenSSL with masm assembler code. Fixes #1535502. ........ r51311 | thomas.heller | 2006-08-16 15:03:11 +0200 (Wed, 16 Aug 2006) | 6 lines Add commented assert statements to check that the result of PyObject_stgdict() and PyType_stgdict() calls are non-NULL before dereferencing the result. Hopefully this fixes what klocwork is complaining about. Fix a few other nits as well. ........ r51312 | anthony.baxter | 2006-08-16 15:08:25 +0200 (Wed, 16 Aug 2006) | 1 line news entry for 51307 ........ r51313 | andrew.kuchling | 2006-08-16 15:22:20 +0200 (Wed, 16 Aug 2006) | 1 line Add UnicodeWarning ........ r51314 | andrew.kuchling | 2006-08-16 15:41:52 +0200 (Wed, 16 Aug 2006) | 1 line Bump document version to 1.0; remove pystone paragraph ........ r51315 | andrew.kuchling | 2006-08-16 15:51:32 +0200 (Wed, 16 Aug 2006) | 1 line Link to docs; remove an XXX comment ........ r51316 | martin.v.loewis | 2006-08-16 15:58:51 +0200 (Wed, 16 Aug 2006) | 1 line Make cl build step compile-only (/c). Remove libs from source list. ........ r51317 | thomas.heller | 2006-08-16 16:07:44 +0200 (Wed, 16 Aug 2006) | 5 lines The __repr__ method of a NULL py_object does no longer raise an exception. Remove a stray '?' character from the exception text when the value is retrieved of such an object. Includes tests. ........ r51318 | andrew.kuchling | 2006-08-16 16:18:23 +0200 (Wed, 16 Aug 2006) | 1 line Update bug/patch counts ........ r51319 | andrew.kuchling | 2006-08-16 16:21:14 +0200 (Wed, 16 Aug 2006) | 1 line Wording/typo fixes ........ r51320 | thomas.heller | 2006-08-16 17:10:12 +0200 (Wed, 16 Aug 2006) | 9 lines Remove the special casing of Py_None when converting the return value of the Python part of a callback function to C. If it cannot be converted, call PyErr_WriteUnraisable with the exception we got. Before, arbitrary data has been passed to the calling C code in this case. (I'm not really sure the NEWS entry is understandable, but I cannot find better words) ........ r51321 | marc-andre.lemburg | 2006-08-16 18:11:01 +0200 (Wed, 16 Aug 2006) | 2 lines Add NEWS item mentioning the reverted distutils version number patch. ........ r51322 | fredrik.lundh | 2006-08-16 18:47:07 +0200 (Wed, 16 Aug 2006) | 5 lines SF#1534630 ignore data that arrives before the opening start tag ........ r51324 | andrew.kuchling | 2006-08-16 19:11:18 +0200 (Wed, 16 Aug 2006) | 1 line Grammar fix ........ r51328 | thomas.heller | 2006-08-16 20:02:11 +0200 (Wed, 16 Aug 2006) | 12 lines Tutorial: Clarify somewhat how parameters are passed to functions (especially explain what integer means). Correct the table - Python integers and longs can both be used. Further clarification to the table comparing ctypes types, Python types, and C types. Reference: Replace integer by C ``int`` where it makes sense. ........ r51329 | kurt.kaiser | 2006-08-16 23:45:59 +0200 (Wed, 16 Aug 2006) | 8 lines File menu hotkeys: there were three 'p' assignments. Reassign the 'Save Copy As' and 'Print' hotkeys to 'y' and 't'. Change the Shell menu hotkey from 's' to 'l'. M Bindings.py M PyShell.py M NEWS.txt ........ r51330 | neil.schemenauer | 2006-08-17 01:38:05 +0200 (Thu, 17 Aug 2006) | 3 lines Fix a bug in the ``compiler`` package that caused invalid code to be generated for generator expressions. ........ r51342 | martin.v.loewis | 2006-08-17 21:19:32 +0200 (Thu, 17 Aug 2006) | 3 lines Merge 51340 and 51341 from 2.5 branch: Leave tk build directory to restore original path. Invoke debug mk1mf.pl after running Configure. ........ r51354 | martin.v.loewis | 2006-08-18 05:47:18 +0200 (Fri, 18 Aug 2006) | 3 lines Bug #1541863: uuid.uuid1 failed to generate unique identifiers on systems with low clock resolution. ........ r51355 | neal.norwitz | 2006-08-18 05:57:54 +0200 (Fri, 18 Aug 2006) | 1 line Add template for 2.6 on HEAD ........ r51356 | neal.norwitz | 2006-08-18 06:01:38 +0200 (Fri, 18 Aug 2006) | 1 line More post-release wibble ........ r51357 | neal.norwitz | 2006-08-18 06:58:33 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Windows bots working again ........ r51358 | neal.norwitz | 2006-08-18 07:10:00 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Windows bots working again. Take 2 ........ r51359 | neal.norwitz | 2006-08-18 07:39:20 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Unix bots install working again. ........ r51360 | neal.norwitz | 2006-08-18 07:41:46 +0200 (Fri, 18 Aug 2006) | 1 line Set version to 2.6a0, seems more consistent. ........ r51362 | neal.norwitz | 2006-08-18 08:14:52 +0200 (Fri, 18 Aug 2006) | 1 line More version wibble ........ r51364 | georg.brandl | 2006-08-18 09:27:59 +0200 (Fri, 18 Aug 2006) | 4 lines Bug #1541682: Fix example in the "Refcount details" API docs. Additionally, remove a faulty example showing PySequence_SetItem applied to a newly created list object and add notes that this isn't a good idea. ........ r51366 | anthony.baxter | 2006-08-18 09:29:02 +0200 (Fri, 18 Aug 2006) | 3 lines Updating IDLE's version number to match Python's (as per python-dev discussion). ........ r51367 | anthony.baxter | 2006-08-18 09:30:07 +0200 (Fri, 18 Aug 2006) | 1 line RPM specfile updates ........ r51368 | georg.brandl | 2006-08-18 09:35:47 +0200 (Fri, 18 Aug 2006) | 2 lines Typo in tp_clear docs. ........ r51378 | andrew.kuchling | 2006-08-18 15:57:13 +0200 (Fri, 18 Aug 2006) | 1 line Minor edits ........ r51379 | thomas.heller | 2006-08-18 16:38:46 +0200 (Fri, 18 Aug 2006) | 6 lines Add asserts to check for 'impossible' NULL values, with comments. In one place where I'n not 1000% sure about the non-NULL, raise a RuntimeError for safety. This should fix the klocwork issues that Neal sent me. If so, it should be applied to the release25-maint branch also. ........ r51400 | neal.norwitz | 2006-08-19 06:22:33 +0200 (Sat, 19 Aug 2006) | 5 lines Move initialization of interned strings to before allocating the object so we don't leak op. (Fixes an earlier patch to this code) Klockwork #350 ........ r51401 | neal.norwitz | 2006-08-19 06:23:04 +0200 (Sat, 19 Aug 2006) | 4 lines Move assert to after NULL check, otherwise we deref NULL in the assert. Klocwork #307 ........ r51402 | neal.norwitz | 2006-08-19 06:25:29 +0200 (Sat, 19 Aug 2006) | 2 lines SF #1542693: Remove semi-colon at end of PyImport_ImportModuleEx macro ........ r51403 | neal.norwitz | 2006-08-19 06:28:55 +0200 (Sat, 19 Aug 2006) | 6 lines Move initialization to after the asserts for non-NULL values. Klocwork 286-287. (I'm not backporting this, but if someone wants to, feel free.) ........ r51404 | neal.norwitz | 2006-08-19 06:52:03 +0200 (Sat, 19 Aug 2006) | 6 lines Handle PyString_FromInternedString() failing (unlikely, but possible). Klocwork #325 (I'm not backporting this, but if someone wants to, feel free.) ........ r51416 | georg.brandl | 2006-08-20 15:15:39 +0200 (Sun, 20 Aug 2006) | 2 lines Patch #1542948: fix urllib2 header casing issue. With new test. ........ r51428 | jeremy.hylton | 2006-08-21 18:19:37 +0200 (Mon, 21 Aug 2006) | 3 lines Move peephole optimizer to separate file. ........ r51429 | jeremy.hylton | 2006-08-21 18:20:29 +0200 (Mon, 21 Aug 2006) | 2 lines Move peephole optimizer to separate file. (Forgot .h in previous checkin.) ........ r51432 | neal.norwitz | 2006-08-21 19:59:46 +0200 (Mon, 21 Aug 2006) | 5 lines Fix bug #1543303, tarfile adds padding that breaks gunzip. Patch # 1543897. Will backport to 2.5 ........ r51433 | neal.norwitz | 2006-08-21 20:01:30 +0200 (Mon, 21 Aug 2006) | 2 lines Add assert to make Klocwork happy (#276) ........
1648 lines
45 KiB
C
1648 lines
45 KiB
C
/*
|
|
* This is the High Performance Python Profiler portion of HotShot.
|
|
*/
|
|
|
|
#include "Python.h"
|
|
#include "code.h"
|
|
#include "eval.h"
|
|
#include "frameobject.h"
|
|
#include "structmember.h"
|
|
|
|
/*
|
|
* Which timer to use should be made more configurable, but that should not
|
|
* be difficult. This will do for now.
|
|
*/
|
|
#ifdef MS_WINDOWS
|
|
#include <windows.h>
|
|
|
|
#ifdef HAVE_DIRECT_H
|
|
#include <direct.h> /* for getcwd() */
|
|
#endif
|
|
|
|
typedef __int64 hs_time;
|
|
#define GETTIMEOFDAY(P_HS_TIME) \
|
|
{ LARGE_INTEGER _temp; \
|
|
QueryPerformanceCounter(&_temp); \
|
|
*(P_HS_TIME) = _temp.QuadPart; }
|
|
|
|
|
|
#else
|
|
#ifndef HAVE_GETTIMEOFDAY
|
|
#error "This module requires gettimeofday() on non-Windows platforms!"
|
|
#endif
|
|
#if (defined(PYOS_OS2) && defined(PYCC_GCC)) || defined(__QNX__)
|
|
#include <sys/time.h>
|
|
#else
|
|
#include <sys/resource.h>
|
|
#include <sys/times.h>
|
|
#endif
|
|
typedef struct timeval hs_time;
|
|
#endif
|
|
|
|
#if !defined(__cplusplus) && !defined(inline)
|
|
#ifdef __GNUC__
|
|
#define inline __inline
|
|
#endif
|
|
#endif
|
|
|
|
#ifndef inline
|
|
#define inline
|
|
#endif
|
|
|
|
#define BUFFERSIZE 10240
|
|
|
|
#if defined(PYOS_OS2) && defined(PYCC_GCC)
|
|
#define PATH_MAX 260
|
|
#endif
|
|
|
|
#if defined(__sgi) && _COMPILER_VERSION>700 && !defined(PATH_MAX)
|
|
/* fix PATH_MAX not being defined with MIPSPro 7.x
|
|
if mode is ANSI C (default) */
|
|
#define PATH_MAX 1024
|
|
#endif
|
|
|
|
#ifndef PATH_MAX
|
|
# ifdef MAX_PATH
|
|
# define PATH_MAX MAX_PATH
|
|
# elif defined (_POSIX_PATH_MAX)
|
|
# define PATH_MAX _POSIX_PATH_MAX
|
|
# else
|
|
# error "Need a defn. for PATH_MAX in _hotshot.c"
|
|
# endif
|
|
#endif
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
PyObject *filemap;
|
|
PyObject *logfilename;
|
|
Py_ssize_t index;
|
|
unsigned char buffer[BUFFERSIZE];
|
|
FILE *logfp;
|
|
int lineevents;
|
|
int linetimings;
|
|
int frametimings;
|
|
/* size_t filled; */
|
|
int active;
|
|
int next_fileno;
|
|
hs_time prev_timeofday;
|
|
} ProfilerObject;
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
PyObject *info;
|
|
FILE *logfp;
|
|
int linetimings;
|
|
int frametimings;
|
|
} LogReaderObject;
|
|
|
|
static PyObject * ProfilerError = NULL;
|
|
|
|
|
|
#ifndef MS_WINDOWS
|
|
#ifdef GETTIMEOFDAY_NO_TZ
|
|
#define GETTIMEOFDAY(ptv) gettimeofday((ptv))
|
|
#else
|
|
#define GETTIMEOFDAY(ptv) gettimeofday((ptv), (struct timezone *)NULL)
|
|
#endif
|
|
#endif
|
|
|
|
|
|
/* The log reader... */
|
|
|
|
PyDoc_STRVAR(logreader_close__doc__,
|
|
"close()\n"
|
|
"Close the log file, preventing additional records from being read.");
|
|
|
|
static PyObject *
|
|
logreader_close(LogReaderObject *self, PyObject *args)
|
|
{
|
|
if (self->logfp != NULL) {
|
|
fclose(self->logfp);
|
|
self->logfp = NULL;
|
|
}
|
|
Py_INCREF(Py_None);
|
|
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(logreader_fileno__doc__,
|
|
"fileno() -> file descriptor\n"
|
|
"Returns the file descriptor for the log file, if open.\n"
|
|
"Raises ValueError if the log file is closed.");
|
|
|
|
static PyObject *
|
|
logreader_fileno(LogReaderObject *self)
|
|
{
|
|
if (self->logfp == NULL) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"logreader's file object already closed");
|
|
return NULL;
|
|
}
|
|
return PyInt_FromLong(fileno(self->logfp));
|
|
}
|
|
|
|
|
|
/* Log File Format
|
|
* ---------------
|
|
*
|
|
* The log file consists of a sequence of variable-length records.
|
|
* Each record is identified with a record type identifier in two
|
|
* bits of the first byte. The two bits are the "least significant"
|
|
* bits of the byte.
|
|
*
|
|
* Low bits: Opcode: Meaning:
|
|
* 0x00 ENTER enter a frame
|
|
* 0x01 EXIT exit a frame
|
|
* 0x02 LINENO execution moved onto a different line
|
|
* 0x03 OTHER more bits are needed to deecode
|
|
*
|
|
* If the type is OTHER, the record is not packed so tightly, and the
|
|
* remaining bits are used to disambiguate the record type. These
|
|
* records are not used as frequently so compaction is not an issue.
|
|
* Each of the first three record types has a highly tailored
|
|
* structure that allows it to be packed tightly.
|
|
*
|
|
* The OTHER records have the following identifiers:
|
|
*
|
|
* First byte: Opcode: Meaning:
|
|
* 0x13 ADD_INFO define a key/value pair
|
|
* 0x23 DEFINE_FILE define an int->filename mapping
|
|
* 0x33 LINE_TIMES indicates if LINENO events have tdeltas
|
|
* 0x43 DEFINE_FUNC define a (fileno,lineno)->funcname mapping
|
|
* 0x53 FRAME_TIMES indicates if ENTER/EXIT events have tdeltas
|
|
*
|
|
* Packed Integers
|
|
*
|
|
* "Packed integers" are non-negative integer values encoded as a
|
|
* sequence of bytes. Each byte is encoded such that the most
|
|
* significant bit is set if the next byte is also part of the
|
|
* integer. Each byte provides bits to the least-significant end of
|
|
* the result; the accumulated value must be shifted up to place the
|
|
* new bits into the result.
|
|
*
|
|
* "Modified packed integers" are packed integers where only a portion
|
|
* of the first byte is used. In the rest of the specification, these
|
|
* are referred to as "MPI(n,name)", where "n" is the number of bits
|
|
* discarded from the least-signicant positions of the byte, and
|
|
* "name" is a name being given to those "discarded" bits, since they
|
|
* are a field themselves.
|
|
*
|
|
* ENTER records:
|
|
*
|
|
* MPI(2,type) fileno -- type is 0x00
|
|
* PI lineno
|
|
* PI tdelta -- iff frame times are enabled
|
|
*
|
|
* EXIT records
|
|
*
|
|
* MPI(2,type) tdelta -- type is 0x01; tdelta will be 0
|
|
* if frame times are disabled
|
|
*
|
|
* LINENO records
|
|
*
|
|
* MPI(2,type) lineno -- type is 0x02
|
|
* PI tdelta -- iff LINENO includes it
|
|
*
|
|
* ADD_INFO records
|
|
*
|
|
* BYTE type -- always 0x13
|
|
* PI len1 -- length of first string
|
|
* BYTE string1[len1] -- len1 bytes of string data
|
|
* PI len2 -- length of second string
|
|
* BYTE string2[len2] -- len2 bytes of string data
|
|
*
|
|
* DEFINE_FILE records
|
|
*
|
|
* BYTE type -- always 0x23
|
|
* PI fileno
|
|
* PI len -- length of filename
|
|
* BYTE filename[len] -- len bytes of string data
|
|
*
|
|
* DEFINE_FUNC records
|
|
*
|
|
* BYTE type -- always 0x43
|
|
* PI fileno
|
|
* PI lineno
|
|
* PI len -- length of funcname
|
|
* BYTE funcname[len] -- len bytes of string data
|
|
*
|
|
* LINE_TIMES records
|
|
*
|
|
* This record can be used only before the start of ENTER/EXIT/LINENO
|
|
* records. If have_tdelta is true, LINENO records will include the
|
|
* tdelta field, otherwise it will be omitted. If this record is not
|
|
* given, LINENO records will not contain the tdelta field.
|
|
*
|
|
* BYTE type -- always 0x33
|
|
* BYTE have_tdelta -- 0 if LINENO does *not* have
|
|
* timing information
|
|
* FRAME_TIMES records
|
|
*
|
|
* This record can be used only before the start of ENTER/EXIT/LINENO
|
|
* records. If have_tdelta is true, ENTER and EXIT records will
|
|
* include the tdelta field, otherwise it will be omitted. If this
|
|
* record is not given, ENTER and EXIT records will contain the tdelta
|
|
* field.
|
|
*
|
|
* BYTE type -- always 0x53
|
|
* BYTE have_tdelta -- 0 if ENTER/EXIT do *not* have
|
|
* timing information
|
|
*/
|
|
|
|
#define WHAT_ENTER 0x00
|
|
#define WHAT_EXIT 0x01
|
|
#define WHAT_LINENO 0x02
|
|
#define WHAT_OTHER 0x03 /* only used in decoding */
|
|
#define WHAT_ADD_INFO 0x13
|
|
#define WHAT_DEFINE_FILE 0x23
|
|
#define WHAT_LINE_TIMES 0x33
|
|
#define WHAT_DEFINE_FUNC 0x43
|
|
#define WHAT_FRAME_TIMES 0x53
|
|
|
|
#define ERR_NONE 0
|
|
#define ERR_EOF -1
|
|
#define ERR_EXCEPTION -2
|
|
#define ERR_BAD_RECTYPE -3
|
|
|
|
#define PISIZE (sizeof(int) + 1)
|
|
#define MPISIZE (PISIZE + 1)
|
|
|
|
/* Maximum size of "normal" events -- nothing that contains string data */
|
|
#define MAXEVENTSIZE (MPISIZE + PISIZE*2)
|
|
|
|
|
|
/* Unpack a packed integer; if "discard" is non-zero, unpack a modified
|
|
* packed integer with "discard" discarded bits.
|
|
*/
|
|
static int
|
|
unpack_packed_int(LogReaderObject *self, int *pvalue, int discard)
|
|
{
|
|
int c;
|
|
int accum = 0;
|
|
int bits = 0;
|
|
int cont;
|
|
|
|
do {
|
|
/* read byte */
|
|
if ((c = fgetc(self->logfp)) == EOF)
|
|
return ERR_EOF;
|
|
accum |= ((c & 0x7F) >> discard) << bits;
|
|
bits += (7 - discard);
|
|
cont = c & 0x80;
|
|
discard = 0;
|
|
} while (cont);
|
|
|
|
*pvalue = accum;
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Unpack a string, which is encoded as a packed integer giving the
|
|
* length of the string, followed by the string data.
|
|
*/
|
|
static int
|
|
unpack_string(LogReaderObject *self, PyObject **pvalue)
|
|
{
|
|
int i;
|
|
int len;
|
|
int err;
|
|
int ch;
|
|
char *buf;
|
|
|
|
if ((err = unpack_packed_int(self, &len, 0)))
|
|
return err;
|
|
|
|
buf = (char *)malloc(len);
|
|
if (!buf) {
|
|
PyErr_NoMemory();
|
|
return ERR_EXCEPTION;
|
|
}
|
|
|
|
for (i=0; i < len; i++) {
|
|
ch = fgetc(self->logfp);
|
|
buf[i] = ch;
|
|
if (ch == EOF) {
|
|
free(buf);
|
|
return ERR_EOF;
|
|
}
|
|
}
|
|
*pvalue = PyString_FromStringAndSize(buf, len);
|
|
free(buf);
|
|
if (*pvalue == NULL) {
|
|
return ERR_EXCEPTION;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int
|
|
unpack_add_info(LogReaderObject *self)
|
|
{
|
|
PyObject *key;
|
|
PyObject *value = NULL;
|
|
int err;
|
|
|
|
err = unpack_string(self, &key);
|
|
if (!err) {
|
|
err = unpack_string(self, &value);
|
|
if (err)
|
|
Py_DECREF(key);
|
|
else {
|
|
PyObject *list = PyDict_GetItem(self->info, key);
|
|
if (list == NULL) {
|
|
list = PyList_New(0);
|
|
if (list == NULL) {
|
|
err = ERR_EXCEPTION;
|
|
goto finally;
|
|
}
|
|
if (PyDict_SetItem(self->info, key, list)) {
|
|
Py_DECREF(list);
|
|
err = ERR_EXCEPTION;
|
|
goto finally;
|
|
}
|
|
Py_DECREF(list);
|
|
}
|
|
if (PyList_Append(list, value))
|
|
err = ERR_EXCEPTION;
|
|
}
|
|
}
|
|
finally:
|
|
Py_XDECREF(key);
|
|
Py_XDECREF(value);
|
|
return err;
|
|
}
|
|
|
|
|
|
static void
|
|
eof_error(LogReaderObject *self)
|
|
{
|
|
fclose(self->logfp);
|
|
self->logfp = NULL;
|
|
PyErr_SetString(PyExc_EOFError,
|
|
"end of file with incomplete profile record");
|
|
}
|
|
|
|
static PyObject *
|
|
logreader_tp_iternext(LogReaderObject *self)
|
|
{
|
|
int c;
|
|
int what;
|
|
int err = ERR_NONE;
|
|
int lineno = -1;
|
|
int fileno = -1;
|
|
int tdelta = -1;
|
|
PyObject *s1 = NULL, *s2 = NULL;
|
|
PyObject *result = NULL;
|
|
#if 0
|
|
unsigned char b0, b1;
|
|
#endif
|
|
|
|
if (self->logfp == NULL) {
|
|
PyErr_SetString(ProfilerError,
|
|
"cannot iterate over closed LogReader object");
|
|
return NULL;
|
|
}
|
|
|
|
restart:
|
|
/* decode the record type */
|
|
if ((c = fgetc(self->logfp)) == EOF) {
|
|
fclose(self->logfp);
|
|
self->logfp = NULL;
|
|
return NULL;
|
|
}
|
|
what = c & WHAT_OTHER;
|
|
if (what == WHAT_OTHER)
|
|
what = c; /* need all the bits for type */
|
|
else
|
|
ungetc(c, self->logfp); /* type byte includes packed int */
|
|
|
|
switch (what) {
|
|
case WHAT_ENTER:
|
|
err = unpack_packed_int(self, &fileno, 2);
|
|
if (!err) {
|
|
err = unpack_packed_int(self, &lineno, 0);
|
|
if (self->frametimings && !err)
|
|
err = unpack_packed_int(self, &tdelta, 0);
|
|
}
|
|
break;
|
|
case WHAT_EXIT:
|
|
err = unpack_packed_int(self, &tdelta, 2);
|
|
break;
|
|
case WHAT_LINENO:
|
|
err = unpack_packed_int(self, &lineno, 2);
|
|
if (self->linetimings && !err)
|
|
err = unpack_packed_int(self, &tdelta, 0);
|
|
break;
|
|
case WHAT_ADD_INFO:
|
|
err = unpack_add_info(self);
|
|
break;
|
|
case WHAT_DEFINE_FILE:
|
|
err = unpack_packed_int(self, &fileno, 0);
|
|
if (!err) {
|
|
err = unpack_string(self, &s1);
|
|
if (!err) {
|
|
Py_INCREF(Py_None);
|
|
s2 = Py_None;
|
|
}
|
|
}
|
|
break;
|
|
case WHAT_DEFINE_FUNC:
|
|
err = unpack_packed_int(self, &fileno, 0);
|
|
if (!err) {
|
|
err = unpack_packed_int(self, &lineno, 0);
|
|
if (!err)
|
|
err = unpack_string(self, &s1);
|
|
}
|
|
break;
|
|
case WHAT_LINE_TIMES:
|
|
if ((c = fgetc(self->logfp)) == EOF)
|
|
err = ERR_EOF;
|
|
else {
|
|
self->linetimings = c ? 1 : 0;
|
|
goto restart;
|
|
}
|
|
break;
|
|
case WHAT_FRAME_TIMES:
|
|
if ((c = fgetc(self->logfp)) == EOF)
|
|
err = ERR_EOF;
|
|
else {
|
|
self->frametimings = c ? 1 : 0;
|
|
goto restart;
|
|
}
|
|
break;
|
|
default:
|
|
err = ERR_BAD_RECTYPE;
|
|
}
|
|
if (err == ERR_BAD_RECTYPE) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"unknown record type in log file");
|
|
}
|
|
else if (err == ERR_EOF) {
|
|
eof_error(self);
|
|
}
|
|
else if (!err) {
|
|
result = PyTuple_New(4);
|
|
if (result == NULL)
|
|
return NULL;
|
|
PyTuple_SET_ITEM(result, 0, PyInt_FromLong(what));
|
|
PyTuple_SET_ITEM(result, 2, PyInt_FromLong(fileno));
|
|
if (s1 == NULL)
|
|
PyTuple_SET_ITEM(result, 1, PyInt_FromLong(tdelta));
|
|
else
|
|
PyTuple_SET_ITEM(result, 1, s1);
|
|
if (s2 == NULL)
|
|
PyTuple_SET_ITEM(result, 3, PyInt_FromLong(lineno));
|
|
else
|
|
PyTuple_SET_ITEM(result, 3, s2);
|
|
}
|
|
/* The only other case is err == ERR_EXCEPTION, in which case the
|
|
* exception is already set.
|
|
*/
|
|
#if 0
|
|
b0 = self->buffer[self->index];
|
|
b1 = self->buffer[self->index + 1];
|
|
if (b0 & 1) {
|
|
/* This is a line-number event. */
|
|
what = PyTrace_LINE;
|
|
lineno = ((b0 & ~1) << 7) + b1;
|
|
self->index += 2;
|
|
}
|
|
else {
|
|
what = (b0 & 0x0E) >> 1;
|
|
tdelta = ((b0 & 0xF0) << 4) + b1;
|
|
if (what == PyTrace_CALL) {
|
|
/* we know there's a 2-byte file ID & 2-byte line number */
|
|
fileno = ((self->buffer[self->index + 2] << 8)
|
|
+ self->buffer[self->index + 3]);
|
|
lineno = ((self->buffer[self->index + 4] << 8)
|
|
+ self->buffer[self->index + 5]);
|
|
self->index += 6;
|
|
}
|
|
else
|
|
self->index += 2;
|
|
}
|
|
#endif
|
|
return result;
|
|
}
|
|
|
|
static void
|
|
logreader_dealloc(LogReaderObject *self)
|
|
{
|
|
if (self->logfp != NULL) {
|
|
fclose(self->logfp);
|
|
self->logfp = NULL;
|
|
}
|
|
Py_XDECREF(self->info);
|
|
PyObject_Del(self);
|
|
}
|
|
|
|
static PyObject *
|
|
logreader_sq_item(LogReaderObject *self, Py_ssize_t index)
|
|
{
|
|
PyObject *result = logreader_tp_iternext(self);
|
|
if (result == NULL && !PyErr_Occurred()) {
|
|
PyErr_SetString(PyExc_IndexError, "no more events in log");
|
|
return NULL;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
static void
|
|
do_stop(ProfilerObject *self);
|
|
|
|
static int
|
|
flush_data(ProfilerObject *self)
|
|
{
|
|
/* Need to dump data to the log file... */
|
|
size_t written = fwrite(self->buffer, 1, self->index, self->logfp);
|
|
if (written == (size_t)self->index)
|
|
self->index = 0;
|
|
else {
|
|
memmove(self->buffer, &self->buffer[written],
|
|
self->index - written);
|
|
self->index -= written;
|
|
if (written == 0) {
|
|
char *s = PyString_AsString(self->logfilename);
|
|
PyErr_SetFromErrnoWithFilename(PyExc_IOError, s);
|
|
do_stop(self);
|
|
return -1;
|
|
}
|
|
}
|
|
if (written > 0) {
|
|
if (fflush(self->logfp)) {
|
|
char *s = PyString_AsString(self->logfilename);
|
|
PyErr_SetFromErrnoWithFilename(PyExc_IOError, s);
|
|
do_stop(self);
|
|
return -1;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static inline int
|
|
pack_packed_int(ProfilerObject *self, int value)
|
|
{
|
|
unsigned char partial;
|
|
|
|
do {
|
|
partial = value & 0x7F;
|
|
value >>= 7;
|
|
if (value)
|
|
partial |= 0x80;
|
|
self->buffer[self->index] = partial;
|
|
self->index++;
|
|
} while (value);
|
|
return 0;
|
|
}
|
|
|
|
/* Encode a modified packed integer, with a subfield of modsize bits
|
|
* containing the value "subfield". The value of subfield is not
|
|
* checked to ensure it actually fits in modsize bits.
|
|
*/
|
|
static inline int
|
|
pack_modified_packed_int(ProfilerObject *self, int value,
|
|
int modsize, int subfield)
|
|
{
|
|
const int maxvalues[] = {-1, 1, 3, 7, 15, 31, 63, 127};
|
|
|
|
int bits = 7 - modsize;
|
|
int partial = value & maxvalues[bits];
|
|
unsigned char b = subfield | (partial << modsize);
|
|
|
|
if (partial != value) {
|
|
b |= 0x80;
|
|
self->buffer[self->index] = b;
|
|
self->index++;
|
|
return pack_packed_int(self, value >> bits);
|
|
}
|
|
self->buffer[self->index] = b;
|
|
self->index++;
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
pack_string(ProfilerObject *self, const char *s, Py_ssize_t len)
|
|
{
|
|
if (len + PISIZE + self->index >= BUFFERSIZE) {
|
|
if (flush_data(self) < 0)
|
|
return -1;
|
|
}
|
|
assert(len < INT_MAX);
|
|
if (pack_packed_int(self, (int)len) < 0)
|
|
return -1;
|
|
memcpy(self->buffer + self->index, s, len);
|
|
self->index += len;
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
pack_add_info(ProfilerObject *self, const char *s1, const char *s2)
|
|
{
|
|
Py_ssize_t len1 = strlen(s1);
|
|
Py_ssize_t len2 = strlen(s2);
|
|
|
|
if (len1 + len2 + PISIZE*2 + 1 + self->index >= BUFFERSIZE) {
|
|
if (flush_data(self) < 0)
|
|
return -1;
|
|
}
|
|
self->buffer[self->index] = WHAT_ADD_INFO;
|
|
self->index++;
|
|
if (pack_string(self, s1, len1) < 0)
|
|
return -1;
|
|
return pack_string(self, s2, len2);
|
|
}
|
|
|
|
static int
|
|
pack_define_file(ProfilerObject *self, int fileno, const char *filename)
|
|
{
|
|
Py_ssize_t len = strlen(filename);
|
|
|
|
if (len + PISIZE*2 + 1 + self->index >= BUFFERSIZE) {
|
|
if (flush_data(self) < 0)
|
|
return -1;
|
|
}
|
|
self->buffer[self->index] = WHAT_DEFINE_FILE;
|
|
self->index++;
|
|
if (pack_packed_int(self, fileno) < 0)
|
|
return -1;
|
|
return pack_string(self, filename, len);
|
|
}
|
|
|
|
static int
|
|
pack_define_func(ProfilerObject *self, int fileno, int lineno,
|
|
const char *funcname)
|
|
{
|
|
Py_ssize_t len = strlen(funcname);
|
|
|
|
if (len + PISIZE*3 + 1 + self->index >= BUFFERSIZE) {
|
|
if (flush_data(self) < 0)
|
|
return -1;
|
|
}
|
|
self->buffer[self->index] = WHAT_DEFINE_FUNC;
|
|
self->index++;
|
|
if (pack_packed_int(self, fileno) < 0)
|
|
return -1;
|
|
if (pack_packed_int(self, lineno) < 0)
|
|
return -1;
|
|
return pack_string(self, funcname, len);
|
|
}
|
|
|
|
static int
|
|
pack_line_times(ProfilerObject *self)
|
|
{
|
|
if (2 + self->index >= BUFFERSIZE) {
|
|
if (flush_data(self) < 0)
|
|
return -1;
|
|
}
|
|
self->buffer[self->index] = WHAT_LINE_TIMES;
|
|
self->buffer[self->index + 1] = self->linetimings ? 1 : 0;
|
|
self->index += 2;
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
pack_frame_times(ProfilerObject *self)
|
|
{
|
|
if (2 + self->index >= BUFFERSIZE) {
|
|
if (flush_data(self) < 0)
|
|
return -1;
|
|
}
|
|
self->buffer[self->index] = WHAT_FRAME_TIMES;
|
|
self->buffer[self->index + 1] = self->frametimings ? 1 : 0;
|
|
self->index += 2;
|
|
return 0;
|
|
}
|
|
|
|
static inline int
|
|
pack_enter(ProfilerObject *self, int fileno, int tdelta, int lineno)
|
|
{
|
|
if (MPISIZE + PISIZE*2 + self->index >= BUFFERSIZE) {
|
|
if (flush_data(self) < 0)
|
|
return -1;
|
|
}
|
|
pack_modified_packed_int(self, fileno, 2, WHAT_ENTER);
|
|
pack_packed_int(self, lineno);
|
|
if (self->frametimings)
|
|
return pack_packed_int(self, tdelta);
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
static inline int
|
|
pack_exit(ProfilerObject *self, int tdelta)
|
|
{
|
|
if (MPISIZE + self->index >= BUFFERSIZE) {
|
|
if (flush_data(self) < 0)
|
|
return -1;
|
|
}
|
|
if (self->frametimings)
|
|
return pack_modified_packed_int(self, tdelta, 2, WHAT_EXIT);
|
|
self->buffer[self->index] = WHAT_EXIT;
|
|
self->index++;
|
|
return 0;
|
|
}
|
|
|
|
static inline int
|
|
pack_lineno(ProfilerObject *self, int lineno)
|
|
{
|
|
if (MPISIZE + self->index >= BUFFERSIZE) {
|
|
if (flush_data(self) < 0)
|
|
return -1;
|
|
}
|
|
return pack_modified_packed_int(self, lineno, 2, WHAT_LINENO);
|
|
}
|
|
|
|
static inline int
|
|
pack_lineno_tdelta(ProfilerObject *self, int lineno, int tdelta)
|
|
{
|
|
if (MPISIZE + PISIZE + self->index >= BUFFERSIZE) {
|
|
if (flush_data(self) < 0)
|
|
return 0;
|
|
}
|
|
if (pack_modified_packed_int(self, lineno, 2, WHAT_LINENO) < 0)
|
|
return -1;
|
|
return pack_packed_int(self, tdelta);
|
|
}
|
|
|
|
static inline int
|
|
get_fileno(ProfilerObject *self, PyCodeObject *fcode)
|
|
{
|
|
/* This is only used for ENTER events. */
|
|
|
|
PyObject *obj;
|
|
PyObject *dict;
|
|
int fileno;
|
|
|
|
obj = PyDict_GetItem(self->filemap, fcode->co_filename);
|
|
if (obj == NULL) {
|
|
/* first sighting of this file */
|
|
dict = PyDict_New();
|
|
if (dict == NULL) {
|
|
return -1;
|
|
}
|
|
fileno = self->next_fileno;
|
|
obj = Py_BuildValue("iN", fileno, dict);
|
|
if (obj == NULL) {
|
|
return -1;
|
|
}
|
|
if (PyDict_SetItem(self->filemap, fcode->co_filename, obj)) {
|
|
Py_DECREF(obj);
|
|
return -1;
|
|
}
|
|
self->next_fileno++;
|
|
Py_DECREF(obj);
|
|
if (pack_define_file(self, fileno,
|
|
PyString_AS_STRING(fcode->co_filename)) < 0)
|
|
return -1;
|
|
}
|
|
else {
|
|
/* already know this ID */
|
|
fileno = PyInt_AS_LONG(PyTuple_GET_ITEM(obj, 0));
|
|
dict = PyTuple_GET_ITEM(obj, 1);
|
|
}
|
|
/* make sure we save a function name for this (fileno, lineno) */
|
|
obj = PyInt_FromLong(fcode->co_firstlineno);
|
|
if (obj == NULL) {
|
|
/* We just won't have it saved; too bad. */
|
|
PyErr_Clear();
|
|
}
|
|
else {
|
|
PyObject *name = PyDict_GetItem(dict, obj);
|
|
if (name == NULL) {
|
|
if (pack_define_func(self, fileno, fcode->co_firstlineno,
|
|
PyString_AS_STRING(fcode->co_name)) < 0) {
|
|
Py_DECREF(obj);
|
|
return -1;
|
|
}
|
|
if (PyDict_SetItem(dict, obj, fcode->co_name)) {
|
|
Py_DECREF(obj);
|
|
return -1;
|
|
}
|
|
}
|
|
Py_DECREF(obj);
|
|
}
|
|
return fileno;
|
|
}
|
|
|
|
static inline int
|
|
get_tdelta(ProfilerObject *self)
|
|
{
|
|
int tdelta;
|
|
#ifdef MS_WINDOWS
|
|
hs_time tv;
|
|
hs_time diff;
|
|
|
|
GETTIMEOFDAY(&tv);
|
|
diff = tv - self->prev_timeofday;
|
|
tdelta = (int)diff;
|
|
#else
|
|
struct timeval tv;
|
|
|
|
GETTIMEOFDAY(&tv);
|
|
|
|
tdelta = tv.tv_usec - self->prev_timeofday.tv_usec;
|
|
if (tv.tv_sec != self->prev_timeofday.tv_sec)
|
|
tdelta += (tv.tv_sec - self->prev_timeofday.tv_sec) * 1000000;
|
|
#endif
|
|
/* time can go backwards on some multiprocessor systems or by NTP */
|
|
if (tdelta < 0)
|
|
return 0;
|
|
|
|
self->prev_timeofday = tv;
|
|
return tdelta;
|
|
}
|
|
|
|
|
|
/* The workhorse: the profiler callback function. */
|
|
|
|
static int
|
|
tracer_callback(ProfilerObject *self, PyFrameObject *frame, int what,
|
|
PyObject *arg)
|
|
{
|
|
int fileno;
|
|
|
|
switch (what) {
|
|
case PyTrace_CALL:
|
|
fileno = get_fileno(self, frame->f_code);
|
|
if (fileno < 0)
|
|
return -1;
|
|
return pack_enter(self, fileno,
|
|
self->frametimings ? get_tdelta(self) : -1,
|
|
frame->f_code->co_firstlineno);
|
|
|
|
case PyTrace_RETURN:
|
|
return pack_exit(self, get_tdelta(self));
|
|
|
|
case PyTrace_LINE: /* we only get these events if we asked for them */
|
|
if (self->linetimings)
|
|
return pack_lineno_tdelta(self, frame->f_lineno,
|
|
get_tdelta(self));
|
|
else
|
|
return pack_lineno(self, frame->f_lineno);
|
|
|
|
default:
|
|
/* ignore PyTrace_EXCEPTION */
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* A couple of useful helper functions. */
|
|
|
|
#ifdef MS_WINDOWS
|
|
static LARGE_INTEGER frequency = {0, 0};
|
|
#endif
|
|
|
|
static unsigned long timeofday_diff = 0;
|
|
static unsigned long rusage_diff = 0;
|
|
|
|
static void
|
|
calibrate(void)
|
|
{
|
|
hs_time tv1, tv2;
|
|
|
|
#ifdef MS_WINDOWS
|
|
hs_time diff;
|
|
QueryPerformanceFrequency(&frequency);
|
|
#endif
|
|
|
|
GETTIMEOFDAY(&tv1);
|
|
while (1) {
|
|
GETTIMEOFDAY(&tv2);
|
|
#ifdef MS_WINDOWS
|
|
diff = tv2 - tv1;
|
|
if (diff != 0) {
|
|
timeofday_diff = (unsigned long)diff;
|
|
break;
|
|
}
|
|
#else
|
|
if (tv1.tv_sec != tv2.tv_sec || tv1.tv_usec != tv2.tv_usec) {
|
|
if (tv1.tv_sec == tv2.tv_sec)
|
|
timeofday_diff = tv2.tv_usec - tv1.tv_usec;
|
|
else
|
|
timeofday_diff = (1000000 - tv1.tv_usec) + tv2.tv_usec;
|
|
break;
|
|
}
|
|
#endif
|
|
}
|
|
#if defined(MS_WINDOWS) || defined(PYOS_OS2) || \
|
|
defined(__VMS) || defined (__QNX__)
|
|
rusage_diff = -1;
|
|
#else
|
|
{
|
|
struct rusage ru1, ru2;
|
|
|
|
getrusage(RUSAGE_SELF, &ru1);
|
|
while (1) {
|
|
getrusage(RUSAGE_SELF, &ru2);
|
|
if (ru1.ru_utime.tv_sec != ru2.ru_utime.tv_sec) {
|
|
rusage_diff = ((1000000 - ru1.ru_utime.tv_usec)
|
|
+ ru2.ru_utime.tv_usec);
|
|
break;
|
|
}
|
|
else if (ru1.ru_utime.tv_usec != ru2.ru_utime.tv_usec) {
|
|
rusage_diff = ru2.ru_utime.tv_usec - ru1.ru_utime.tv_usec;
|
|
break;
|
|
}
|
|
else if (ru1.ru_stime.tv_sec != ru2.ru_stime.tv_sec) {
|
|
rusage_diff = ((1000000 - ru1.ru_stime.tv_usec)
|
|
+ ru2.ru_stime.tv_usec);
|
|
break;
|
|
}
|
|
else if (ru1.ru_stime.tv_usec != ru2.ru_stime.tv_usec) {
|
|
rusage_diff = ru2.ru_stime.tv_usec - ru1.ru_stime.tv_usec;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
|
|
static void
|
|
do_start(ProfilerObject *self)
|
|
{
|
|
self->active = 1;
|
|
GETTIMEOFDAY(&self->prev_timeofday);
|
|
if (self->lineevents)
|
|
PyEval_SetTrace((Py_tracefunc) tracer_callback, (PyObject *)self);
|
|
else
|
|
PyEval_SetProfile((Py_tracefunc) tracer_callback, (PyObject *)self);
|
|
}
|
|
|
|
static void
|
|
do_stop(ProfilerObject *self)
|
|
{
|
|
if (self->active) {
|
|
self->active = 0;
|
|
if (self->lineevents)
|
|
PyEval_SetTrace(NULL, NULL);
|
|
else
|
|
PyEval_SetProfile(NULL, NULL);
|
|
}
|
|
if (self->index > 0) {
|
|
/* Best effort to dump out any remaining data. */
|
|
flush_data(self);
|
|
}
|
|
}
|
|
|
|
static int
|
|
is_available(ProfilerObject *self)
|
|
{
|
|
if (self->active) {
|
|
PyErr_SetString(ProfilerError, "profiler already active");
|
|
return 0;
|
|
}
|
|
if (self->logfp == NULL) {
|
|
PyErr_SetString(ProfilerError, "profiler already closed");
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
|
|
/* Profiler object interface methods. */
|
|
|
|
PyDoc_STRVAR(addinfo__doc__,
|
|
"addinfo(key, value)\n"
|
|
"Insert an ADD_INFO record into the log.");
|
|
|
|
static PyObject *
|
|
profiler_addinfo(ProfilerObject *self, PyObject *args)
|
|
{
|
|
PyObject *result = NULL;
|
|
char *key, *value;
|
|
|
|
if (PyArg_ParseTuple(args, "ss:addinfo", &key, &value)) {
|
|
if (self->logfp == NULL)
|
|
PyErr_SetString(ProfilerError, "profiler already closed");
|
|
else {
|
|
if (pack_add_info(self, key, value) == 0) {
|
|
result = Py_None;
|
|
Py_INCREF(result);
|
|
}
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
PyDoc_STRVAR(close__doc__,
|
|
"close()\n"
|
|
"Shut down this profiler and close the log files, even if its active.");
|
|
|
|
static PyObject *
|
|
profiler_close(ProfilerObject *self)
|
|
{
|
|
do_stop(self);
|
|
if (self->logfp != NULL) {
|
|
fclose(self->logfp);
|
|
self->logfp = NULL;
|
|
}
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
#define fileno__doc__ logreader_fileno__doc__
|
|
|
|
static PyObject *
|
|
profiler_fileno(ProfilerObject *self)
|
|
{
|
|
if (self->logfp == NULL) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"profiler's file object already closed");
|
|
return NULL;
|
|
}
|
|
return PyInt_FromLong(fileno(self->logfp));
|
|
}
|
|
|
|
PyDoc_STRVAR(runcall__doc__,
|
|
"runcall(callable[, args[, kw]]) -> callable()\n"
|
|
"Profile a specific function call, returning the result of that call.");
|
|
|
|
static PyObject *
|
|
profiler_runcall(ProfilerObject *self, PyObject *args)
|
|
{
|
|
PyObject *result = NULL;
|
|
PyObject *callargs = NULL;
|
|
PyObject *callkw = NULL;
|
|
PyObject *callable;
|
|
|
|
if (PyArg_UnpackTuple(args, "runcall", 1, 3,
|
|
&callable, &callargs, &callkw)) {
|
|
if (is_available(self)) {
|
|
do_start(self);
|
|
result = PyEval_CallObjectWithKeywords(callable, callargs, callkw);
|
|
do_stop(self);
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
PyDoc_STRVAR(runcode__doc__,
|
|
"runcode(code, globals[, locals])\n"
|
|
"Execute a code object while collecting profile data. If locals is\n"
|
|
"omitted, globals is used for the locals as well.");
|
|
|
|
static PyObject *
|
|
profiler_runcode(ProfilerObject *self, PyObject *args)
|
|
{
|
|
PyObject *result = NULL;
|
|
PyCodeObject *code;
|
|
PyObject *globals;
|
|
PyObject *locals = NULL;
|
|
|
|
if (PyArg_ParseTuple(args, "O!O!|O:runcode",
|
|
&PyCode_Type, &code,
|
|
&PyDict_Type, &globals,
|
|
&locals)) {
|
|
if (is_available(self)) {
|
|
if (locals == NULL || locals == Py_None)
|
|
locals = globals;
|
|
else if (!PyDict_Check(locals)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"locals must be a dictionary or None");
|
|
return NULL;
|
|
}
|
|
do_start(self);
|
|
result = PyEval_EvalCode(code, globals, locals);
|
|
do_stop(self);
|
|
#if 0
|
|
if (!PyErr_Occurred()) {
|
|
result = Py_None;
|
|
Py_INCREF(result);
|
|
}
|
|
#endif
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
PyDoc_STRVAR(start__doc__,
|
|
"start()\n"
|
|
"Install this profiler for the current thread.");
|
|
|
|
static PyObject *
|
|
profiler_start(ProfilerObject *self, PyObject *args)
|
|
{
|
|
PyObject *result = NULL;
|
|
|
|
if (is_available(self)) {
|
|
do_start(self);
|
|
result = Py_None;
|
|
Py_INCREF(result);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
PyDoc_STRVAR(stop__doc__,
|
|
"stop()\n"
|
|
"Remove this profiler from the current thread.");
|
|
|
|
static PyObject *
|
|
profiler_stop(ProfilerObject *self, PyObject *args)
|
|
{
|
|
PyObject *result = NULL;
|
|
|
|
if (!self->active)
|
|
PyErr_SetString(ProfilerError, "profiler not active");
|
|
else {
|
|
do_stop(self);
|
|
result = Py_None;
|
|
Py_INCREF(result);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
|
|
/* Python API support. */
|
|
|
|
static void
|
|
profiler_dealloc(ProfilerObject *self)
|
|
{
|
|
do_stop(self);
|
|
if (self->logfp != NULL)
|
|
fclose(self->logfp);
|
|
Py_XDECREF(self->filemap);
|
|
Py_XDECREF(self->logfilename);
|
|
PyObject_Del((PyObject *)self);
|
|
}
|
|
|
|
static PyMethodDef profiler_methods[] = {
|
|
{"addinfo", (PyCFunction)profiler_addinfo, METH_VARARGS, addinfo__doc__},
|
|
{"close", (PyCFunction)profiler_close, METH_NOARGS, close__doc__},
|
|
{"fileno", (PyCFunction)profiler_fileno, METH_NOARGS, fileno__doc__},
|
|
{"runcall", (PyCFunction)profiler_runcall, METH_VARARGS, runcall__doc__},
|
|
{"runcode", (PyCFunction)profiler_runcode, METH_VARARGS, runcode__doc__},
|
|
{"start", (PyCFunction)profiler_start, METH_NOARGS, start__doc__},
|
|
{"stop", (PyCFunction)profiler_stop, METH_NOARGS, stop__doc__},
|
|
{NULL, NULL}
|
|
};
|
|
|
|
static PyMemberDef profiler_members[] = {
|
|
{"frametimings", T_LONG, offsetof(ProfilerObject, linetimings), READONLY},
|
|
{"lineevents", T_LONG, offsetof(ProfilerObject, lineevents), READONLY},
|
|
{"linetimings", T_LONG, offsetof(ProfilerObject, linetimings), READONLY},
|
|
{NULL}
|
|
};
|
|
|
|
static PyObject *
|
|
profiler_get_closed(ProfilerObject *self, void *closure)
|
|
{
|
|
PyObject *result = (self->logfp == NULL) ? Py_True : Py_False;
|
|
Py_INCREF(result);
|
|
return result;
|
|
}
|
|
|
|
static PyGetSetDef profiler_getsets[] = {
|
|
{"closed", (getter)profiler_get_closed, NULL,
|
|
PyDoc_STR("True if the profiler's output file has already been closed.")},
|
|
{NULL}
|
|
};
|
|
|
|
|
|
PyDoc_STRVAR(profiler_object__doc__,
|
|
"High-performance profiler object.\n"
|
|
"\n"
|
|
"Methods:\n"
|
|
"\n"
|
|
"close(): Stop the profiler and close the log files.\n"
|
|
"fileno(): Returns the file descriptor of the log file.\n"
|
|
"runcall(): Run a single function call with profiling enabled.\n"
|
|
"runcode(): Execute a code object with profiling enabled.\n"
|
|
"start(): Install the profiler and return.\n"
|
|
"stop(): Remove the profiler.\n"
|
|
"\n"
|
|
"Attributes (read-only):\n"
|
|
"\n"
|
|
"closed: True if the profiler has already been closed.\n"
|
|
"frametimings: True if ENTER/EXIT events collect timing information.\n"
|
|
"lineevents: True if line events are reported to the profiler.\n"
|
|
"linetimings: True if line events collect timing information.");
|
|
|
|
static PyTypeObject ProfilerType = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0, /* ob_size */
|
|
"_hotshot.ProfilerType", /* tp_name */
|
|
(int) sizeof(ProfilerObject), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
(destructor)profiler_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
0, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
0, /* tp_hash */
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT, /* tp_flags */
|
|
profiler_object__doc__, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
profiler_methods, /* tp_methods */
|
|
profiler_members, /* tp_members */
|
|
profiler_getsets, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
};
|
|
|
|
|
|
static PyMethodDef logreader_methods[] = {
|
|
{"close", (PyCFunction)logreader_close, METH_NOARGS,
|
|
logreader_close__doc__},
|
|
{"fileno", (PyCFunction)logreader_fileno, METH_NOARGS,
|
|
logreader_fileno__doc__},
|
|
{NULL, NULL}
|
|
};
|
|
|
|
static PyMemberDef logreader_members[] = {
|
|
{"info", T_OBJECT, offsetof(LogReaderObject, info), RO,
|
|
PyDoc_STR("Dictionary mapping informational keys to lists of values.")},
|
|
{NULL}
|
|
};
|
|
|
|
|
|
PyDoc_STRVAR(logreader__doc__,
|
|
"logreader(filename) --> log-iterator\n\
|
|
Create a log-reader for the timing information file.");
|
|
|
|
static PySequenceMethods logreader_as_sequence = {
|
|
0, /* sq_length */
|
|
0, /* sq_concat */
|
|
0, /* sq_repeat */
|
|
(ssizeargfunc)logreader_sq_item, /* sq_item */
|
|
0, /* sq_slice */
|
|
0, /* sq_ass_item */
|
|
0, /* sq_ass_slice */
|
|
0, /* sq_contains */
|
|
0, /* sq_inplace_concat */
|
|
0, /* sq_inplace_repeat */
|
|
};
|
|
|
|
static PyObject *
|
|
logreader_get_closed(LogReaderObject *self, void *closure)
|
|
{
|
|
PyObject *result = (self->logfp == NULL) ? Py_True : Py_False;
|
|
Py_INCREF(result);
|
|
return result;
|
|
}
|
|
|
|
static PyGetSetDef logreader_getsets[] = {
|
|
{"closed", (getter)logreader_get_closed, NULL,
|
|
PyDoc_STR("True if the logreader's input file has already been closed.")},
|
|
{NULL}
|
|
};
|
|
|
|
static PyTypeObject LogReaderType = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0, /* ob_size */
|
|
"_hotshot.LogReaderType", /* tp_name */
|
|
(int) sizeof(LogReaderObject), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
(destructor)logreader_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
0, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
&logreader_as_sequence, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
0, /* tp_hash */
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT, /* tp_flags */
|
|
logreader__doc__, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
PyObject_SelfIter, /* tp_iter */
|
|
(iternextfunc)logreader_tp_iternext,/* tp_iternext */
|
|
logreader_methods, /* tp_methods */
|
|
logreader_members, /* tp_members */
|
|
logreader_getsets, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
};
|
|
|
|
static PyObject *
|
|
hotshot_logreader(PyObject *unused, PyObject *args)
|
|
{
|
|
LogReaderObject *self = NULL;
|
|
char *filename;
|
|
int c;
|
|
int err = 0;
|
|
|
|
if (PyArg_ParseTuple(args, "s:logreader", &filename)) {
|
|
self = PyObject_New(LogReaderObject, &LogReaderType);
|
|
if (self != NULL) {
|
|
self->frametimings = 1;
|
|
self->linetimings = 0;
|
|
self->info = NULL;
|
|
self->logfp = fopen(filename, "rb");
|
|
if (self->logfp == NULL) {
|
|
PyErr_SetFromErrnoWithFilename(PyExc_IOError, filename);
|
|
Py_DECREF(self);
|
|
self = NULL;
|
|
goto finally;
|
|
}
|
|
self->info = PyDict_New();
|
|
if (self->info == NULL) {
|
|
Py_DECREF(self);
|
|
goto finally;
|
|
}
|
|
/* read initial info */
|
|
for (;;) {
|
|
if ((c = fgetc(self->logfp)) == EOF) {
|
|
eof_error(self);
|
|
break;
|
|
}
|
|
if (c != WHAT_ADD_INFO) {
|
|
ungetc(c, self->logfp);
|
|
break;
|
|
}
|
|
err = unpack_add_info(self);
|
|
if (err) {
|
|
if (err == ERR_EOF)
|
|
eof_error(self);
|
|
else
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
"unexpected error");
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
finally:
|
|
return (PyObject *) self;
|
|
}
|
|
|
|
|
|
/* Return a Python string that represents the version number without the
|
|
* extra cruft added by revision control, even if the right options were
|
|
* given to the "cvs export" command to make it not include the extra
|
|
* cruft.
|
|
*/
|
|
static char *
|
|
get_version_string(void)
|
|
{
|
|
static char *rcsid = "$Revision$";
|
|
char *rev = rcsid;
|
|
char *buffer;
|
|
int i = 0;
|
|
|
|
while (*rev && !isdigit(Py_CHARMASK(*rev)))
|
|
++rev;
|
|
while (rev[i] != ' ' && rev[i] != '\0')
|
|
++i;
|
|
buffer = (char *)malloc(i + 1);
|
|
if (buffer != NULL) {
|
|
memmove(buffer, rev, i);
|
|
buffer[i] = '\0';
|
|
}
|
|
return buffer;
|
|
}
|
|
|
|
/* Write out a RFC 822-style header with various useful bits of
|
|
* information to make the output easier to manage.
|
|
*/
|
|
static int
|
|
write_header(ProfilerObject *self)
|
|
{
|
|
char *buffer;
|
|
char cwdbuffer[PATH_MAX];
|
|
PyObject *temp;
|
|
Py_ssize_t i, len;
|
|
|
|
buffer = get_version_string();
|
|
if (buffer == NULL) {
|
|
PyErr_NoMemory();
|
|
return -1;
|
|
}
|
|
pack_add_info(self, "hotshot-version", buffer);
|
|
pack_add_info(self, "requested-frame-timings",
|
|
(self->frametimings ? "yes" : "no"));
|
|
pack_add_info(self, "requested-line-events",
|
|
(self->lineevents ? "yes" : "no"));
|
|
pack_add_info(self, "requested-line-timings",
|
|
(self->linetimings ? "yes" : "no"));
|
|
pack_add_info(self, "platform", Py_GetPlatform());
|
|
pack_add_info(self, "executable", Py_GetProgramFullPath());
|
|
free(buffer);
|
|
buffer = (char *) Py_GetVersion();
|
|
if (buffer == NULL)
|
|
PyErr_Clear();
|
|
else
|
|
pack_add_info(self, "executable-version", buffer);
|
|
|
|
#ifdef MS_WINDOWS
|
|
PyOS_snprintf(cwdbuffer, sizeof(cwdbuffer), "%I64d", frequency.QuadPart);
|
|
pack_add_info(self, "reported-performance-frequency", cwdbuffer);
|
|
#else
|
|
PyOS_snprintf(cwdbuffer, sizeof(cwdbuffer), "%lu", rusage_diff);
|
|
pack_add_info(self, "observed-interval-getrusage", cwdbuffer);
|
|
PyOS_snprintf(cwdbuffer, sizeof(cwdbuffer), "%lu", timeofday_diff);
|
|
pack_add_info(self, "observed-interval-gettimeofday", cwdbuffer);
|
|
#endif
|
|
|
|
pack_add_info(self, "current-directory",
|
|
getcwd(cwdbuffer, sizeof cwdbuffer));
|
|
|
|
temp = PySys_GetObject("path");
|
|
if (temp == NULL || !PyList_Check(temp)) {
|
|
PyErr_SetString(PyExc_RuntimeError, "sys.path must be a list");
|
|
return -1;
|
|
}
|
|
len = PyList_GET_SIZE(temp);
|
|
for (i = 0; i < len; ++i) {
|
|
PyObject *item = PyList_GET_ITEM(temp, i);
|
|
buffer = PyString_AsString(item);
|
|
if (buffer == NULL) {
|
|
pack_add_info(self, "sys-path-entry", "<non-string-path-entry>");
|
|
PyErr_Clear();
|
|
}
|
|
else {
|
|
pack_add_info(self, "sys-path-entry", buffer);
|
|
}
|
|
}
|
|
pack_frame_times(self);
|
|
pack_line_times(self);
|
|
|
|
return 0;
|
|
}
|
|
|
|
PyDoc_STRVAR(profiler__doc__,
|
|
"profiler(logfilename[, lineevents[, linetimes]]) -> profiler\n\
|
|
Create a new profiler object.");
|
|
|
|
static PyObject *
|
|
hotshot_profiler(PyObject *unused, PyObject *args)
|
|
{
|
|
char *logfilename;
|
|
ProfilerObject *self = NULL;
|
|
int lineevents = 0;
|
|
int linetimings = 1;
|
|
|
|
if (PyArg_ParseTuple(args, "s|ii:profiler", &logfilename,
|
|
&lineevents, &linetimings)) {
|
|
self = PyObject_New(ProfilerObject, &ProfilerType);
|
|
if (self == NULL)
|
|
return NULL;
|
|
self->frametimings = 1;
|
|
self->lineevents = lineevents ? 1 : 0;
|
|
self->linetimings = (lineevents && linetimings) ? 1 : 0;
|
|
self->index = 0;
|
|
self->active = 0;
|
|
self->next_fileno = 0;
|
|
self->logfp = NULL;
|
|
self->logfilename = PyTuple_GET_ITEM(args, 0);
|
|
Py_INCREF(self->logfilename);
|
|
self->filemap = PyDict_New();
|
|
if (self->filemap == NULL) {
|
|
Py_DECREF(self);
|
|
return NULL;
|
|
}
|
|
self->logfp = fopen(logfilename, "wb");
|
|
if (self->logfp == NULL) {
|
|
Py_DECREF(self);
|
|
PyErr_SetFromErrnoWithFilename(PyExc_IOError, logfilename);
|
|
return NULL;
|
|
}
|
|
if (timeofday_diff == 0) {
|
|
/* Run this several times since sometimes the first
|
|
* doesn't give the lowest values, and we're really trying
|
|
* to determine the lowest.
|
|
*/
|
|
calibrate();
|
|
calibrate();
|
|
calibrate();
|
|
}
|
|
if (write_header(self)) {
|
|
/* some error occurred, exception has been set */
|
|
Py_DECREF(self);
|
|
self = NULL;
|
|
}
|
|
}
|
|
return (PyObject *) self;
|
|
}
|
|
|
|
PyDoc_STRVAR(coverage__doc__,
|
|
"coverage(logfilename) -> profiler\n\
|
|
Returns a profiler that doesn't collect any timing information, which is\n\
|
|
useful in building a coverage analysis tool.");
|
|
|
|
static PyObject *
|
|
hotshot_coverage(PyObject *unused, PyObject *args)
|
|
{
|
|
char *logfilename;
|
|
PyObject *result = NULL;
|
|
|
|
if (PyArg_ParseTuple(args, "s:coverage", &logfilename)) {
|
|
result = hotshot_profiler(unused, args);
|
|
if (result != NULL) {
|
|
ProfilerObject *self = (ProfilerObject *) result;
|
|
self->frametimings = 0;
|
|
self->linetimings = 0;
|
|
self->lineevents = 1;
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
PyDoc_VAR(resolution__doc__) =
|
|
#ifdef MS_WINDOWS
|
|
PyDoc_STR(
|
|
"resolution() -> (performance-counter-ticks, update-frequency)\n"
|
|
"Return the resolution of the timer provided by the QueryPerformanceCounter()\n"
|
|
"function. The first value is the smallest observed change, and the second\n"
|
|
"is the result of QueryPerformanceFrequency()."
|
|
)
|
|
#else
|
|
PyDoc_STR(
|
|
"resolution() -> (gettimeofday-usecs, getrusage-usecs)\n"
|
|
"Return the resolution of the timers provided by the gettimeofday() and\n"
|
|
"getrusage() system calls, or -1 if the call is not supported."
|
|
)
|
|
#endif
|
|
;
|
|
|
|
static PyObject *
|
|
hotshot_resolution(PyObject *self, PyObject *unused)
|
|
{
|
|
if (timeofday_diff == 0) {
|
|
calibrate();
|
|
calibrate();
|
|
calibrate();
|
|
}
|
|
#ifdef MS_WINDOWS
|
|
return Py_BuildValue("ii", timeofday_diff, frequency.LowPart);
|
|
#else
|
|
return Py_BuildValue("ii", timeofday_diff, rusage_diff);
|
|
#endif
|
|
}
|
|
|
|
|
|
static PyMethodDef functions[] = {
|
|
{"coverage", hotshot_coverage, METH_VARARGS, coverage__doc__},
|
|
{"profiler", hotshot_profiler, METH_VARARGS, profiler__doc__},
|
|
{"logreader", hotshot_logreader, METH_VARARGS, logreader__doc__},
|
|
{"resolution", hotshot_resolution, METH_NOARGS, resolution__doc__},
|
|
{NULL, NULL}
|
|
};
|
|
|
|
|
|
void
|
|
init_hotshot(void)
|
|
{
|
|
PyObject *module;
|
|
|
|
LogReaderType.ob_type = &PyType_Type;
|
|
ProfilerType.ob_type = &PyType_Type;
|
|
module = Py_InitModule("_hotshot", functions);
|
|
if (module != NULL) {
|
|
char *s = get_version_string();
|
|
|
|
PyModule_AddStringConstant(module, "__version__", s);
|
|
free(s);
|
|
Py_INCREF(&LogReaderType);
|
|
PyModule_AddObject(module, "LogReaderType",
|
|
(PyObject *)&LogReaderType);
|
|
Py_INCREF(&ProfilerType);
|
|
PyModule_AddObject(module, "ProfilerType",
|
|
(PyObject *)&ProfilerType);
|
|
|
|
if (ProfilerError == NULL)
|
|
ProfilerError = PyErr_NewException("hotshot.ProfilerError",
|
|
NULL, NULL);
|
|
if (ProfilerError != NULL) {
|
|
Py_INCREF(ProfilerError);
|
|
PyModule_AddObject(module, "ProfilerError", ProfilerError);
|
|
}
|
|
PyModule_AddIntConstant(module, "WHAT_ENTER", WHAT_ENTER);
|
|
PyModule_AddIntConstant(module, "WHAT_EXIT", WHAT_EXIT);
|
|
PyModule_AddIntConstant(module, "WHAT_LINENO", WHAT_LINENO);
|
|
PyModule_AddIntConstant(module, "WHAT_OTHER", WHAT_OTHER);
|
|
PyModule_AddIntConstant(module, "WHAT_ADD_INFO", WHAT_ADD_INFO);
|
|
PyModule_AddIntConstant(module, "WHAT_DEFINE_FILE", WHAT_DEFINE_FILE);
|
|
PyModule_AddIntConstant(module, "WHAT_DEFINE_FUNC", WHAT_DEFINE_FUNC);
|
|
PyModule_AddIntConstant(module, "WHAT_LINE_TIMES", WHAT_LINE_TIMES);
|
|
}
|
|
}
|