[Python-checkins] python/dist/src/Modules _hotshot.c,1.25,1.26

[mwh@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv10908/Modules

Modified Files:
	_hotshot.c 
Log Message:
This is my patch

[ 587993 ] SET_LINENO killer

Remove SET_LINENO.  Tracing is now supported by inspecting co_lnotab.

Many sundry changes to document and adapt to this change.


Index: _hotshot.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_hotshot.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** _hotshot.c	8 Aug 2002 19:46:15 -0000	1.25
--- _hotshot.c	15 Aug 2002 14:59:01 -0000	1.26
***************
*** 153,157 ****
   *       0x00         ENTER     enter a frame
   *       0x01          EXIT     exit a frame
!  *       0x02        LINENO     SET_LINENO instruction was executed
   *       0x03         OTHER     more bits are needed to deecode
   *
--- 153,157 ----
   *       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
   *
***************
*** 889,895 ****
      case PyTrace_LINE:
          if (self->linetimings)
!             return pack_lineno_tdelta(self, frame->f_lineno, get_tdelta(self));
          else
!             return pack_lineno(self, frame->f_lineno);
  
      default:
--- 889,898 ----
      case PyTrace_LINE:
          if (self->linetimings)
!             return pack_lineno_tdelta(self, PyCode_Addr2Line(frame->f_code, 
! 							     frame->f_lasti),
! 				      get_tdelta(self));
          else
!             return pack_lineno(self, PyCode_Addr2Line(frame->f_code,
! 						      frame->f_lasti));
  
      default:
***************
*** 1228,1233 ****
  "closed:       True if the profiler has already been closed.\n"
  "frametimings: True if ENTER/EXIT events collect timing information.\n"
! "lineevents:   True if SET_LINENO events are reported to the profiler.\n"
! "linetimings:  True if SET_LINENO events collect timing information.");
  
  static PyTypeObject ProfilerType = {
--- 1231,1236 ----
  "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 = {