jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Argh. cdebug was slowing down the program too much. 

* Change: In Hurricane Commons.h, even when cdebug print nothing, it slow
    down the program (three times for Kite!). Create a macro cdebug_log
    which calls cdebug *only* if the debug level is active.
This commit is contained in:
Jean-Paul Chaput 2016-06-11 21:56:12 +02:00
parent d729321091
commit f68ac4d0e6
172 changed files with 2133 additions and 2144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bootstrap/refactor.sed Normal file
View File

@ -0,0 +1,3 @@
s|cdebug\.log(\([0-9]*\),\([0-9]*\))|cdebug_log(\1,\2)|
s|cdebug\.log(\([0-9]*\))|cdebug_log(\1,0)|
s|cdebug\.tabw(\([0-9]*\),\(-*[0-9]*\))|cdebug_tabw(\1,\2)|

4
crlcore/src/ccore/AllianceLibrary.cpp
View File

@ -132,7 +132,7 @@ namespace CRL {
, DataBase::CreateLib|DataBase::WarnCreateLib ); , DataBase::CreateLib|DataBase::WarnCreateLib );
AllianceLibrary* aLibrary = NULL; AllianceLibrary* aLibrary = NULL;
cdebug.log(19) << "| " << libDbPath << " : " << library << endl; cdebug_log(19,0) << "| " << libDbPath << " : " << library << endl;
if (library) { if (library) {
aLibrary = af->getAllianceLibrary( library ); aLibrary = af->getAllianceLibrary( library );
@ -151,7 +151,7 @@ namespace CRL {
if (not library) library = aLibrary->getLibrary(); if (not library) library = aLibrary->getLibrary();
} }
cdebug.log(19) << "| Associates to: " << aLibrary << endl; cdebug_log(19,0) << "| Associates to: " << aLibrary << endl;
if (aLibrary->getLibrary() != library) { if (aLibrary->getLibrary() != library) {
cerr << Warning( "JsonAllianceLibrary::toData(): Underlying Hurricane Library discrepency for \"%s\".\n" cerr << Warning( "JsonAllianceLibrary::toData(): Underlying Hurricane Library discrepency for \"%s\".\n"

2
crlcore/src/ccore/Catalog.cpp
View File

@ -436,7 +436,7 @@ namespace CRL {
Catalog::State* state = get<Catalog::State*>( stack, "_state" ); Catalog::State* state = get<Catalog::State*>( stack, "_state" );
CatalogProperty* property = NULL; CatalogProperty* property = NULL;
cdebug.log(19) << "topDBo:" << dbo << endl; cdebug_log(19,0) << "topDBo:" << dbo << endl;
Cell* cell = dynamic_cast<Cell*>( dbo ); Cell* cell = dynamic_cast<Cell*>( dbo );
if (cell) { if (cell) {

10
crlcore/src/ccore/RoutingLayerGauge.cpp
View File

@ -207,17 +207,17 @@ namespace CRL {
unsigned RoutingLayerGauge::getTrackIndex ( DbU::Unit start, DbU::Unit stop, DbU::Unit position, unsigned mode ) const unsigned RoutingLayerGauge::getTrackIndex ( DbU::Unit start, DbU::Unit stop, DbU::Unit position, unsigned mode ) const
{ {
cdebug.log(100,1) << "RoutingLayerGauge::getTrackIndex ( " << position << " )" << endl; cdebug_log(100,1) << "RoutingLayerGauge::getTrackIndex ( " << position << " )" << endl;
long modulo; long modulo;
long depth; long depth;
divide ( position-start, depth, modulo ); divide ( position-start, depth, modulo );
cdebug.log(100) << "depth := " << depth << endl; cdebug_log(100,0) << "depth := " << depth << endl;
if ( depth < 0 ) { if ( depth < 0 ) {
cdebug.tabw(100,-1); cdebug_tabw(100,-1);
return 0; return 0;
// throw Error ( negativeIndex // throw Error ( negativeIndex
@ -239,7 +239,7 @@ namespace CRL {
unsigned int tracksNumber = getTrackNumber(start,stop); unsigned int tracksNumber = getTrackNumber(start,stop);
if ( (unsigned)depth >= tracksNumber ) { if ( (unsigned)depth >= tracksNumber ) {
cdebug.tabw(100,-1); cdebug_tabw(100,-1);
return (tracksNumber > 0) ? tracksNumber-1 : 0; return (tracksNumber > 0) ? tracksNumber-1 : 0;
// throw Error ( overflowIndex // throw Error ( overflowIndex
// , getString(this).c_str() // , getString(this).c_str()
@ -249,7 +249,7 @@ namespace CRL {
// ); // );
} }
cdebug.tabw(100,-1); cdebug_tabw(100,-1);
return depth; return depth;
} }

24
crlcore/src/ccore/bookshelf/BookshelfParser.cpp
View File

@ -318,7 +318,7 @@ Name BKParser::getNewNetName()
bool BKParser::isNumber ( char* token ) { bool BKParser::isNumber ( char* token ) {
cdebug.log(100) << "isNumber = " << token; cdebug_log(100,0) << "isNumber = " << token;
unsigned i = 0; unsigned i = 0;
char tok; char tok;
@ -330,7 +330,7 @@ bool BKParser::isNumber ( char* token ) {
} }
bool BKParser::isFloat ( char* token ) { bool BKParser::isFloat ( char* token ) {
cdebug.log(100) << "isFloat = " << token; cdebug_log(100,0) << "isFloat = " << token;
unsigned i = 0; unsigned i = 0;
char tok; char tok;
@ -343,7 +343,7 @@ bool BKParser::isFloat ( char* token ) {
} }
bool BKParser::isName ( char* token ) { bool BKParser::isName ( char* token ) {
cdebug.log(100) << "isName = " << token; cdebug_log(100,0) << "isName = " << token;
unsigned i = 0; unsigned i = 0;
char tok; char tok;
@ -358,7 +358,7 @@ bool BKParser::isName ( char* token ) {
} }
bool BKParser::isSymetry ( char* token ) { bool BKParser::isSymetry ( char* token ) {
cdebug.log(100) << "isSymetry = " << token; cdebug_log(100,0) << "isSymetry = " << token;
if ( ( ( token[0] == 'X' ) && ( token[1] == char(0) ) ) if ( ( ( token[0] == 'X' ) && ( token[1] == char(0) ) )
|| ( ( token[0] == 'Y' ) && ( token[1] == char(0) ) ) || ( ( token[0] == 'Y' ) && ( token[1] == char(0) ) )
|| ( ( token[0] == 'R' ) && ( token[1] == '9' ) && ( token[2] == '0' ) && ( token[3] == char(0) ) ) ) || ( ( token[0] == 'R' ) && ( token[1] == '9' ) && ( token[2] == '0' ) && ( token[3] == char(0) ) ) )
@ -366,7 +366,7 @@ bool BKParser::isSymetry ( char* token ) {
return false; return false;
} }
bool BKParser::isDirection ( char* token ) { bool BKParser::isDirection ( char* token ) {
cdebug.log(100) << "isDirection = " << token; cdebug_log(100,0) << "isDirection = " << token;
if ( ( ( token[0] == 'I' ) || ( token[0] == 'O' ) || ( token[0] == 'B' ) ) && ( token[1] == char(0) ) ) if ( ( ( token[0] == 'I' ) || ( token[0] == 'O' ) || ( token[0] == 'B' ) ) && ( token[1] == char(0) ) )
return true; return true;
@ -381,7 +381,7 @@ bool BKParser::ScanAux ()
// The Aux record looks like : // The Aux record looks like :
// RowBasedPlacement : <cell_name>.nodes <cell_name>.nets <cell_name>.wts <cell_name>.pl <cell_name>.scl // RowBasedPlacement : <cell_name>.nodes <cell_name>.nets <cell_name>.wts <cell_name>.pl <cell_name>.scl
// ********************************************************************************************************** // **********************************************************************************************************
cdebug.log(100) << "ScanAux = " << _buffer; cdebug_log(100,0) << "ScanAux = " << _buffer;
// *********************** // ***********************
// Patterns initialization // Patterns initialization
@ -441,7 +441,7 @@ bool BKParser::ScanNum ( unsigned& num )
// The NodeNum record looks like : // The NodeNum record looks like :
// NumNodes : <num> // NumNodes : <num>
// ******************************* // *******************************
cdebug.log(100) << "ScanNum = " << _buffer; cdebug_log(100,0) << "ScanNum = " << _buffer;
char *p_type, *p_num; char *p_type, *p_num;
if ( ( ( p_type = strtok ( _buffer, "\t \n:" ) ) != NULL ) && if ( ( ( p_type = strtok ( _buffer, "\t \n:" ) ) != NULL ) &&
@ -460,7 +460,7 @@ bool BKParser::ScanDegree ( unsigned& degree, Name& netName )
// The NetDregree record looks like : // The NetDregree record looks like :
// NetDegree : <degree> [netName] // NetDegree : <degree> [netName]
// ********************************** // **********************************
cdebug.log(100) << "ScanDegree = " << _buffer; cdebug_log(100,0) << "ScanDegree = " << _buffer;
bool mDegree = false; bool mDegree = false;
bool mName = false; bool mName = false;
@ -502,7 +502,7 @@ bool BKParser::ScanNodes ( Name& name, DbU::Unit& width, DbU::Unit& height, bool
// The Node record looks like : // The Node record looks like :
// <ins_name> <width> <height> [terminal] // <ins_name> <width> <height> [terminal]
// ************************************** // **************************************
cdebug.log(100) << "ScanNodes = " << _buffer; cdebug_log(100,0) << "ScanNodes = " << _buffer;
char *p_name, *p_width, *p_height, *p_term; char *p_name, *p_width, *p_height, *p_term;
if ( ( ( p_name = strtok ( _buffer, "\t \n" ) ) != NULL ) && if ( ( ( p_name = strtok ( _buffer, "\t \n" ) ) != NULL ) &&
@ -528,7 +528,7 @@ bool BKParser::ScanNets ( Name& insName, Net::Direction& dir, DbU::Unit& dx, DbU
// The Net record looks like : // The Net record looks like :
// NetDegree : <degree> <net_name> // NetDegree : <degree> <net_name>
// ********************************* // *********************************
cdebug.log(100) << "ScanNets = " << _buffer; cdebug_log(100,0) << "ScanNets = " << _buffer;
bool mName = false; bool mName = false;
bool mDirection = false; bool mDirection = false;
@ -580,7 +580,7 @@ bool BKParser::ScanWts ( Name& name, unsigned& weight )
// The Weight record looks like : // The Weight record looks like :
// <ins_name> <weight> // <ins_name> <weight>
// ****************************** // ******************************
cdebug.log(100) << "ScanWts = " << _buffer; cdebug_log(100,0) << "ScanWts = " << _buffer;
//char *p_x, *p_y, *p_model, *p_name, *p_transf; //char *p_x, *p_y, *p_model, *p_name, *p_transf;
@ -622,7 +622,7 @@ bool BKParser::ScanPl ( Name& name, DbU::Unit& x, DbU::Unit& y, Transformation::
// The Placement record looks like : // The Placement record looks like :
// <ins_name> <x> <y> : <orient> [FIXED] // <ins_name> <x> <y> : <orient> [FIXED]
// ************************************* // *************************************
cdebug.log(100) << "ScanPl = " << _buffer; cdebug_log(100,0) << "ScanPl = " << _buffer;
char *p_name, *p_x, *p_y, *p_orient, *p_fixed; char *p_name, *p_x, *p_y, *p_orient, *p_fixed;
if ( ( ( p_name = strtok ( _buffer, "\t \n" ) ) != NULL ) && if ( ( ( p_name = strtok ( _buffer, "\t \n" ) ) != NULL ) &&

2
crlcore/src/ccore/toolbox/RoutingPads.cpp
View File

@ -208,7 +208,7 @@ void createPlacedRoutingPadsAndPinsRing ( Cell* top_cell )
netOccurrence = Occurrence(net); netOccurrence = Occurrence(net);
for_each_occurrence ( plugOccurrence, HyperNet(netOccurrence).getLeafPlugOccurrences() ) for_each_occurrence ( plugOccurrence, HyperNet(netOccurrence).getLeafPlugOccurrences() )
{ {
cdebug.log(109,1) << "Creating Routing Pad " << plugOccurrence << endl; cdebug_log(109,1) << "Creating Routing Pad " << plugOccurrence << endl;
cerr << RoutingPad::create ( net, plugOccurrence, RoutingPad::BiggestArea ) << endl; cerr << RoutingPad::create ( net, plugOccurrence, RoutingPad::BiggestArea ) << endl;
//ltraceout(58); //ltraceout(58);
end_for; end_for;

2
crlcore/src/pyCRL/PyAcmSigda.cpp
View File

@ -55,7 +55,7 @@ extern "C" {
static PyObject* PyAcmSigda_load ( PyObject*, PyObject* args ) static PyObject* PyAcmSigda_load ( PyObject*, PyObject* args )
{ {
cdebug.log(30) << "PyAcmSigda_load()" << endl; cdebug_log(30,0) << "PyAcmSigda_load()" << endl;
Cell* cell = NULL; Cell* cell = NULL;

30
crlcore/src/pyCRL/PyAllianceFramework.cpp
View File

@ -70,7 +70,7 @@ extern "C" {
static PyObject* PyAllianceFramework_create ( PyObject*, PyObject* args ) static PyObject* PyAllianceFramework_create ( PyObject*, PyObject* args )
{ {
cdebug.log(30) << "PyAllianceFramework_create()" << endl; cdebug_log(30,0) << "PyAllianceFramework_create()" << endl;
AllianceFramework* af = NULL; AllianceFramework* af = NULL;
PyAllianceFramework* pyAf = NULL; PyAllianceFramework* pyAf = NULL;
@ -96,7 +96,7 @@ extern "C" {
static PyObject* PyAllianceFramework_get ( PyObject* args ) static PyObject* PyAllianceFramework_get ( PyObject* args )
{ {
cdebug.log(30) << "PyAllianceFramework_get()" << endl; cdebug_log(30,0) << "PyAllianceFramework_get()" << endl;
AllianceFramework* af = NULL; AllianceFramework* af = NULL;
PyAllianceFramework* pyAf = NULL; PyAllianceFramework* pyAf = NULL;
@ -116,7 +116,7 @@ extern "C" {
static PyObject* PyAllianceFramework_getEnvironment ( PyAllianceFramework* self ) static PyObject* PyAllianceFramework_getEnvironment ( PyAllianceFramework* self )
{ {
cdebug.log(30) << "PyAllianceFramework_getEnvironment ()" << endl; cdebug_log(30,0) << "PyAllianceFramework_getEnvironment ()" << endl;
Environment* env = NULL; Environment* env = NULL;
@ -134,7 +134,7 @@ extern "C" {
static PyObject* PyAllianceFramework_getLibrary ( PyAllianceFramework* self, PyObject* args ) static PyObject* PyAllianceFramework_getLibrary ( PyAllianceFramework* self, PyObject* args )
{ {
cdebug.log(30) << "PyAllianceFramework_getLibrary()" << endl; cdebug_log(30,0) << "PyAllianceFramework_getLibrary()" << endl;
Library* lib = NULL; Library* lib = NULL;
@ -164,7 +164,7 @@ extern "C" {
static PyObject* PyAllianceFramework_getAllianceLibrary ( PyAllianceFramework* self, PyObject* args ) static PyObject* PyAllianceFramework_getAllianceLibrary ( PyAllianceFramework* self, PyObject* args )
{ {
cdebug.log(30) << "PyAllianceFramework_getAllianceLibrary()" << endl; cdebug_log(30,0) << "PyAllianceFramework_getAllianceLibrary()" << endl;
AllianceLibrary* alib = NULL; AllianceLibrary* alib = NULL;
@ -199,7 +199,7 @@ extern "C" {
static PyObject* PyAllianceFramework_getCell ( PyAllianceFramework* self, PyObject* args ) static PyObject* PyAllianceFramework_getCell ( PyAllianceFramework* self, PyObject* args )
{ {
cdebug.log(30) << "PyAllianceFramework_getCell ()" << endl; cdebug_log(30,0) << "PyAllianceFramework_getCell ()" << endl;
char* name = NULL; char* name = NULL;
Cell* cell = NULL; Cell* cell = NULL;
@ -222,7 +222,7 @@ extern "C" {
static PyObject* PyAllianceFramework_saveCell ( PyAllianceFramework* self, PyObject* args ) static PyObject* PyAllianceFramework_saveCell ( PyAllianceFramework* self, PyObject* args )
{ {
cdebug.log(30) << "PyAllianceFramework_saveCell ()" << endl; cdebug_log(30,0) << "PyAllianceFramework_saveCell ()" << endl;
HTRY HTRY
@ -243,7 +243,7 @@ extern "C" {
static PyObject* PyAllianceFramework_createCell ( PyAllianceFramework* self, PyObject* args ) static PyObject* PyAllianceFramework_createCell ( PyAllianceFramework* self, PyObject* args )
{ {
cdebug.log(30) << "PyAllianceFramework_createCell ()" << endl; cdebug_log(30,0) << "PyAllianceFramework_createCell ()" << endl;
char* name = NULL; char* name = NULL;
Cell* cell = NULL; Cell* cell = NULL;
@ -265,7 +265,7 @@ extern "C" {
static PyObject* PyAllianceFramework_createLibrary ( PyAllianceFramework* self, PyObject* args ) static PyObject* PyAllianceFramework_createLibrary ( PyAllianceFramework* self, PyObject* args )
{ {
cdebug.log(30) << "PyAllianceFramework_createLibrary()" << endl; cdebug_log(30,0) << "PyAllianceFramework_createLibrary()" << endl;
AllianceLibrary* alib = NULL; AllianceLibrary* alib = NULL;
string libName = ""; string libName = "";
@ -304,7 +304,7 @@ extern "C" {
static PyObject* PyAllianceFramework_isPad ( PyAllianceFramework* self, PyObject* args ) static PyObject* PyAllianceFramework_isPad ( PyAllianceFramework* self, PyObject* args )
{ {
cdebug.log(30) << "PyAllianceFramework_isPad ()" << endl; cdebug_log(30,0) << "PyAllianceFramework_isPad ()" << endl;
char* name = NULL; char* name = NULL;
@ -325,7 +325,7 @@ extern "C" {
static PyObject* PyAllianceFramework_addRoutingGauge ( PyAllianceFramework* self, PyObject* args ) static PyObject* PyAllianceFramework_addRoutingGauge ( PyAllianceFramework* self, PyObject* args )
{ {
cdebug.log(30) << "PyAllianceFramework_addRoutingGauge ()" << endl; cdebug_log(30,0) << "PyAllianceFramework_addRoutingGauge ()" << endl;
HTRY HTRY
METHOD_HEAD("AllianceFramework.addRoutingGauge()") METHOD_HEAD("AllianceFramework.addRoutingGauge()")
@ -341,7 +341,7 @@ extern "C" {
static PyObject* PyAllianceFramework_getRoutingGauge ( PyAllianceFramework* self, PyObject* args ) static PyObject* PyAllianceFramework_getRoutingGauge ( PyAllianceFramework* self, PyObject* args )
{ {
cdebug.log(30) << "PyAllianceFramework_getRoutingGauge ()" << endl; cdebug_log(30,0) << "PyAllianceFramework_getRoutingGauge ()" << endl;
RoutingGauge* rg = NULL; RoutingGauge* rg = NULL;
@ -365,7 +365,7 @@ extern "C" {
static PyObject* PyAllianceFramework_addCellGauge ( PyAllianceFramework* self, PyObject* args ) static PyObject* PyAllianceFramework_addCellGauge ( PyAllianceFramework* self, PyObject* args )
{ {
cdebug.log(30) << "PyAllianceFramework_addCellGauge ()" << endl; cdebug_log(30,0) << "PyAllianceFramework_addCellGauge ()" << endl;
HTRY HTRY
METHOD_HEAD("AllianceFramework.addCellGauge()") METHOD_HEAD("AllianceFramework.addCellGauge()")
@ -381,7 +381,7 @@ extern "C" {
static PyObject* PyAllianceFramework_getCellGauge ( PyAllianceFramework* self, PyObject* args ) static PyObject* PyAllianceFramework_getCellGauge ( PyAllianceFramework* self, PyObject* args )
{ {
cdebug.log(30) << "PyAllianceFramework_getCellGauge ()" << endl; cdebug_log(30,0) << "PyAllianceFramework_getCellGauge ()" << endl;
CellGauge* rg = NULL; CellGauge* rg = NULL;
@ -405,7 +405,7 @@ extern "C" {
static PyObject* PyAllianceFramework_loadLibraryCells ( PyAllianceFramework* self, PyObject* args ) static PyObject* PyAllianceFramework_loadLibraryCells ( PyAllianceFramework* self, PyObject* args )
{ {
cdebug.log(30) << "PyAllianceFramework_loadLibraryCells()" << endl; cdebug_log(30,0) << "PyAllianceFramework_loadLibraryCells()" << endl;
unsigned int count = 0; unsigned int count = 0;

6
crlcore/src/pyCRL/PyAllianceLibrary.cpp
View File

@ -59,7 +59,7 @@ extern "C" {
static PyObject* PyAllianceLibrary_getLibrary ( PyAllianceLibrary* self, PyObject* args ) static PyObject* PyAllianceLibrary_getLibrary ( PyAllianceLibrary* self, PyObject* args )
{ {
cdebug.log(30) << "PyAllianceLibrary_getLibrary()" << endl; cdebug_log(30,0) << "PyAllianceLibrary_getLibrary()" << endl;
Library* lib = NULL; Library* lib = NULL;
@ -74,7 +74,7 @@ extern "C" {
static PyObject* PyAllianceLibrary_getPath ( PyAllianceLibrary* self, PyObject* args ) static PyObject* PyAllianceLibrary_getPath ( PyAllianceLibrary* self, PyObject* args )
{ {
cdebug.log(30) << "PyAllianceLibrary_getPath()" << endl; cdebug_log(30,0) << "PyAllianceLibrary_getPath()" << endl;
HTRY HTRY
METHOD_HEAD("AllianceLibrary.getPath()") METHOD_HEAD("AllianceLibrary.getPath()")
@ -114,7 +114,7 @@ extern "C" {
DirectHashMethod(PyAllianceLibrary_Hash, PyAllianceLibrary) DirectHashMethod(PyAllianceLibrary_Hash, PyAllianceLibrary)
extern void PyAllianceLibrary_LinkPyType() { extern void PyAllianceLibrary_LinkPyType() {
cdebug.log(30) << "PyAllianceLibrary_LinkType()" << endl; cdebug_log(30,0) << "PyAllianceLibrary_LinkType()" << endl;
PyTypeAllianceLibrary.tp_dealloc = (destructor) PyAllianceLibrary_DeAlloc; PyTypeAllianceLibrary.tp_dealloc = (destructor) PyAllianceLibrary_DeAlloc;
PyTypeAllianceLibrary.tp_repr = (reprfunc) PyAllianceLibrary_Repr; PyTypeAllianceLibrary.tp_repr = (reprfunc) PyAllianceLibrary_Repr;

4
crlcore/src/pyCRL/PyBanner.cpp
View File

@ -57,7 +57,7 @@ extern "C" {
static PyObject* PyBanner_new ( PyTypeObject* type, PyObject* args, PyObject* kwArgs ) static PyObject* PyBanner_new ( PyTypeObject* type, PyObject* args, PyObject* kwArgs )
{ {
cdebug.log(30) << "PyBanner_new()" << endl; cdebug_log(30,0) << "PyBanner_new()" << endl;
Banner* banner = NULL; Banner* banner = NULL;
PyBanner* pyBanner = (PyBanner*)type->tp_alloc(type,0); PyBanner* pyBanner = (PyBanner*)type->tp_alloc(type,0);
@ -180,7 +180,7 @@ extern "C" {
DirectHashMethod(PyBanner_Hash, PyBanner) DirectHashMethod(PyBanner_Hash, PyBanner)
extern void PyBanner_LinkPyType() { extern void PyBanner_LinkPyType() {
cdebug.log(30) << "PyBanner_LinkType()" << endl; cdebug_log(30,0) << "PyBanner_LinkType()" << endl;
PyTypeBanner.tp_new = PyBanner_new; PyTypeBanner.tp_new = PyBanner_new;
PyTypeBanner.tp_dealloc = (destructor)PyBanner_DeAlloc; PyTypeBanner.tp_dealloc = (destructor)PyBanner_DeAlloc;

2
crlcore/src/pyCRL/PyBlif.cpp
View File

@ -55,7 +55,7 @@ extern "C" {
static PyObject* PyBlif_load ( PyObject*, PyObject* args ) static PyObject* PyBlif_load ( PyObject*, PyObject* args )
{ {
cdebug.log(30) << "PyBlif_load()" << endl; cdebug_log(30,0) << "PyBlif_load()" << endl;
Cell* cell = NULL; Cell* cell = NULL;

6
crlcore/src/pyCRL/PyCRL.cpp
View File

@ -73,7 +73,7 @@ extern "C" {
static PyObject* PyVhdl_destroyAllVHDL ( PyObject* module ) static PyObject* PyVhdl_destroyAllVHDL ( PyObject* module )
{ {
cdebug.log(30) << "PyVhdl_destroyAllVHDL()" << endl; cdebug_log(30,0) << "PyVhdl_destroyAllVHDL()" << endl;
HTRY HTRY
EntityExtension::destroyAll(); EntityExtension::destroyAll();
@ -103,7 +103,7 @@ extern "C" {
// Module Initialization : "initCRL ()" // Module Initialization : "initCRL ()"
DL_EXPORT(void) initCRL () { DL_EXPORT(void) initCRL () {
cdebug.log(30) << "initCRL()" << endl; cdebug_log(30,0) << "initCRL()" << endl;
PyBanner_LinkPyType (); PyBanner_LinkPyType ();
PyCatalogState_LinkPyType (); PyCatalogState_LinkPyType ();
@ -197,7 +197,7 @@ extern "C" {
//PyObject* dictionnary = PyModule_GetDict ( module ); //PyObject* dictionnary = PyModule_GetDict ( module );
//DbULoadConstants ( dictionnary ); //DbULoadConstants ( dictionnary );
cdebug.log(30) << "CRL.so loaded " << (void*)&typeid(string) << endl; cdebug_log(30,0) << "CRL.so loaded " << (void*)&typeid(string) << endl;
} }

2
crlcore/src/pyCRL/PyCatalogState.cpp
View File

@ -114,7 +114,7 @@ extern "C" {
DirectHashMethod(PyCatalogState_Hash, PyCatalogState) DirectHashMethod(PyCatalogState_Hash, PyCatalogState)
extern void PyCatalogState_LinkPyType() { extern void PyCatalogState_LinkPyType() {
cdebug.log(30) << "PyCatalogState_LinkType()" << endl; cdebug_log(30,0) << "PyCatalogState_LinkType()" << endl;
PyTypeCatalogState.tp_dealloc = (destructor) PyCatalogState_DeAlloc; PyTypeCatalogState.tp_dealloc = (destructor) PyCatalogState_DeAlloc;
PyTypeCatalogState.tp_compare = (cmpfunc) PyCatalogState_Cmp; PyTypeCatalogState.tp_compare = (cmpfunc) PyCatalogState_Cmp;
PyTypeCatalogState.tp_repr = (reprfunc) PyCatalogState_Repr; PyTypeCatalogState.tp_repr = (reprfunc) PyCatalogState_Repr;

2
crlcore/src/pyCRL/PyCellGauge.cpp
View File

@ -61,7 +61,7 @@ extern "C" {
static PyObject* PyCellGauge_create ( PyObject*, PyObject* args ) static PyObject* PyCellGauge_create ( PyObject*, PyObject* args )
{ {
cdebug.log(30) << "PyCellGauge_create()" << endl; cdebug_log(30,0) << "PyCellGauge_create()" << endl;
CellGauge* cg = NULL; CellGauge* cg = NULL;
PyCellGauge* pyCg = NULL; PyCellGauge* pyCg = NULL;

6
crlcore/src/pyCRL/PyEnvironment.cpp
View File

@ -67,7 +67,7 @@ extern "C" {
PyObject* PyEnvironment_addSYSTEM_LIBRARY ( PyEnvironment* self, PyObject* args, PyObject* kwArgs ) PyObject* PyEnvironment_addSYSTEM_LIBRARY ( PyEnvironment* self, PyObject* args, PyObject* kwArgs )
{ {
cdebug.log(30) << "PyEnvironment_addSYSTEM_LIBRARY()" << endl; cdebug_log(30,0) << "PyEnvironment_addSYSTEM_LIBRARY()" << endl;
HTRY HTRY
METHOD_HEAD("Environment.addSYSTEM_LIBRARY()") METHOD_HEAD("Environment.addSYSTEM_LIBRARY()")
@ -113,7 +113,7 @@ extern "C" {
PyObject* PyEnvironment_getLIBRARYPath ( PyEnvironment* self, PyObject* args ) PyObject* PyEnvironment_getLIBRARYPath ( PyEnvironment* self, PyObject* args )
{ {
cdebug.log(30) << "PyEnvironment_getLIBRARYPath()" << endl; cdebug_log(30,0) << "PyEnvironment_getLIBRARYPath()" << endl;
HTRY HTRY
METHOD_HEAD("Environment.getLIBRARYPath()") METHOD_HEAD("Environment.getLIBRARYPath()")
@ -265,7 +265,7 @@ extern "C" {
DirectHashMethod(PyEnvironment_Hash, PyEnvironment) DirectHashMethod(PyEnvironment_Hash, PyEnvironment)
extern void PyEnvironment_LinkPyType() { extern void PyEnvironment_LinkPyType() {
cdebug.log(30) << "PyEnvironment_LinkType()" << endl; cdebug_log(30,0) << "PyEnvironment_LinkType()" << endl;
PyTypeEnvironment.tp_dealloc = (destructor) PyEnvironment_DeAlloc; PyTypeEnvironment.tp_dealloc = (destructor) PyEnvironment_DeAlloc;
PyTypeEnvironment.tp_repr = (reprfunc) PyEnvironment_Repr; PyTypeEnvironment.tp_repr = (reprfunc) PyEnvironment_Repr;

2
crlcore/src/pyCRL/PyIspd05.cpp
View File

@ -56,7 +56,7 @@ extern "C" {
static PyObject* PyIspd05_load ( PyObject*, PyObject* args ) static PyObject* PyIspd05_load ( PyObject*, PyObject* args )
{ {
cdebug.log(30) << "PyIspd05_load()" << endl; cdebug_log(30,0) << "PyIspd05_load()" << endl;
Cell* cell = NULL; Cell* cell = NULL;

20
crlcore/src/pyCRL/PyRoutingGauge.cpp
View File

@ -67,7 +67,7 @@ extern "C" {
static PyObject* PyRoutingGauge_create ( PyObject*, PyObject* args ) static PyObject* PyRoutingGauge_create ( PyObject*, PyObject* args )
{ {
cdebug.log(30) << "PyRoutingGauge_create()" << endl; cdebug_log(30,0) << "PyRoutingGauge_create()" << endl;
RoutingGauge* rg = NULL; RoutingGauge* rg = NULL;
PyRoutingGauge* pyRg = NULL; PyRoutingGauge* pyRg = NULL;
@ -96,7 +96,7 @@ extern "C" {
static PyObject* PyRoutingGauge_getTechnology ( PyRoutingGauge* self ) static PyObject* PyRoutingGauge_getTechnology ( PyRoutingGauge* self )
{ {
cdebug.log(30) << "PyRoutingGauge_getTechnology()" << endl; cdebug_log(30,0) << "PyRoutingGauge_getTechnology()" << endl;
Technology* technology = NULL; Technology* technology = NULL;
@ -111,7 +111,7 @@ extern "C" {
static PyObject* PyRoutingGauge_getDepth ( PyRoutingGauge* self ) static PyObject* PyRoutingGauge_getDepth ( PyRoutingGauge* self )
{ {
cdebug.log(30) << "PyRoutingGauge_getDepth()" << endl; cdebug_log(30,0) << "PyRoutingGauge_getDepth()" << endl;
size_t depth = 0; size_t depth = 0;
@ -126,7 +126,7 @@ extern "C" {
static PyObject* PyRoutingGauge_getLayerDepth ( PyRoutingGauge* self, PyObject* args ) static PyObject* PyRoutingGauge_getLayerDepth ( PyRoutingGauge* self, PyObject* args )
{ {
cdebug.log(30) << "PyRoutingGauge_getLayerDepth()" << endl; cdebug_log(30,0) << "PyRoutingGauge_getLayerDepth()" << endl;
size_t depth = 0; size_t depth = 0;
@ -153,7 +153,7 @@ extern "C" {
static PyObject* PyRoutingGauge_getLayerGauge ( PyRoutingGauge* self, PyObject* args ) static PyObject* PyRoutingGauge_getLayerGauge ( PyRoutingGauge* self, PyObject* args )
{ {
cdebug.log(30) << "PyRoutingGauge_getLayerGauge()" << endl; cdebug_log(30,0) << "PyRoutingGauge_getLayerGauge()" << endl;
RoutingLayerGauge* rlg = NULL; RoutingLayerGauge* rlg = NULL;
@ -188,7 +188,7 @@ extern "C" {
static PyObject* PyRoutingGauge_getLayerDirection ( PyRoutingGauge* self, PyObject* args ) static PyObject* PyRoutingGauge_getLayerDirection ( PyRoutingGauge* self, PyObject* args )
{ {
cdebug.log(30) << "PyRoutingGauge_getLayerDirection()" << endl; cdebug_log(30,0) << "PyRoutingGauge_getLayerDirection()" << endl;
unsigned int direction = 0; unsigned int direction = 0;
@ -219,7 +219,7 @@ extern "C" {
static PyObject* PyRoutingGauge_getLayerPitch ( PyRoutingGauge* self, PyObject* args ) static PyObject* PyRoutingGauge_getLayerPitch ( PyRoutingGauge* self, PyObject* args )
{ {
cdebug.log(30) << "PyRoutingGauge_getLayerPitch()" << endl; cdebug_log(30,0) << "PyRoutingGauge_getLayerPitch()" << endl;
DbU::Unit pitch = 0; DbU::Unit pitch = 0;
@ -250,7 +250,7 @@ extern "C" {
static PyObject* PyRoutingGauge_getRoutingLayer ( PyRoutingGauge* self, PyObject* args ) static PyObject* PyRoutingGauge_getRoutingLayer ( PyRoutingGauge* self, PyObject* args )
{ {
cdebug.log(30) << "PyRoutingGauge_getRoutingLayer()" << endl; cdebug_log(30,0) << "PyRoutingGauge_getRoutingLayer()" << endl;
Layer* layer = NULL; Layer* layer = NULL;
@ -277,7 +277,7 @@ extern "C" {
static PyObject* PyRoutingGauge_getContactLayer ( PyRoutingGauge* self, PyObject* args ) static PyObject* PyRoutingGauge_getContactLayer ( PyRoutingGauge* self, PyObject* args )
{ {
cdebug.log(30) << "PyRoutingGauge_getContactLayer()" << endl; cdebug_log(30,0) << "PyRoutingGauge_getContactLayer()" << endl;
Layer* layer = NULL; Layer* layer = NULL;
@ -304,7 +304,7 @@ extern "C" {
PyObject* PyRoutingGauge_addLayerGauge ( PyRoutingGauge* self, PyObject* args ) PyObject* PyRoutingGauge_addLayerGauge ( PyRoutingGauge* self, PyObject* args )
{ {
cdebug.log(30) << "PyRoutingGauge_addLayerGauge()" << endl; cdebug_log(30,0) << "PyRoutingGauge_addLayerGauge()" << endl;
HTRY HTRY
METHOD_HEAD("RoutingGauge.addLayerGauge()") METHOD_HEAD("RoutingGauge.addLayerGauge()")

12
crlcore/src/pyCRL/PyRoutingLayerGauge.cpp
View File

@ -60,7 +60,7 @@ extern "C" {
static PyObject* PyRoutingLayerGauge_create ( PyObject*, PyObject* args ) static PyObject* PyRoutingLayerGauge_create ( PyObject*, PyObject* args )
{ {
cdebug.log(30) << "PyRoutingLayerGauge_create()" << endl; cdebug_log(30,0) << "PyRoutingLayerGauge_create()" << endl;
RoutingLayerGauge* rlg = NULL; RoutingLayerGauge* rlg = NULL;
PyRoutingLayerGauge* pyRlg = NULL; PyRoutingLayerGauge* pyRlg = NULL;
@ -140,7 +140,7 @@ extern "C" {
static PyObject* PyRoutingLayerGauge_getLayer ( PyRoutingLayerGauge* self ) static PyObject* PyRoutingLayerGauge_getLayer ( PyRoutingLayerGauge* self )
{ {
cdebug.log(30) << "PyRoutingLayerGauge_getLayer()" << endl; cdebug_log(30,0) << "PyRoutingLayerGauge_getLayer()" << endl;
Layer* layer = NULL; Layer* layer = NULL;
@ -155,7 +155,7 @@ extern "C" {
static PyObject* PyRoutingLayerGauge_getBlockageLayer ( PyRoutingLayerGauge* self ) static PyObject* PyRoutingLayerGauge_getBlockageLayer ( PyRoutingLayerGauge* self )
{ {
cdebug.log(30) << "PyRoutingLayerGauge_getBlockageLayer()" << endl; cdebug_log(30,0) << "PyRoutingLayerGauge_getBlockageLayer()" << endl;
Layer* layer = NULL; Layer* layer = NULL;
@ -170,7 +170,7 @@ extern "C" {
static PyObject* PyRoutingLayerGauge_getTrackNumber ( PyRoutingLayerGauge* self, PyObject* args ) static PyObject* PyRoutingLayerGauge_getTrackNumber ( PyRoutingLayerGauge* self, PyObject* args )
{ {
cdebug.log(30) << "PyRoutingLayerGauge_getTrackNumber()" << endl; cdebug_log(30,0) << "PyRoutingLayerGauge_getTrackNumber()" << endl;
unsigned int trackNumber = 0; unsigned int trackNumber = 0;
@ -194,7 +194,7 @@ extern "C" {
static PyObject* PyRoutingLayerGauge_getTrackIndex ( PyRoutingLayerGauge* self, PyObject* args ) static PyObject* PyRoutingLayerGauge_getTrackIndex ( PyRoutingLayerGauge* self, PyObject* args )
{ {
cdebug.log(30) << "PyRoutingLayerGauge_getTrackIndex()" << endl; cdebug_log(30,0) << "PyRoutingLayerGauge_getTrackIndex()" << endl;
unsigned int trackIndex = 0; unsigned int trackIndex = 0;
@ -232,7 +232,7 @@ extern "C" {
static PyObject* PyRoutingLayerGauge_getTrackPosition ( PyRoutingLayerGauge* self, PyObject* args ) static PyObject* PyRoutingLayerGauge_getTrackPosition ( PyRoutingLayerGauge* self, PyObject* args )
{ {
cdebug.log(30) << "PyRoutingLayerGauge_getTrackPosition()" << endl; cdebug_log(30,0) << "PyRoutingLayerGauge_getTrackPosition()" << endl;
DbU::Unit trackPosition = 0; DbU::Unit trackPosition = 0;

2
crlcore/src/pyCRL/PyToolBox.cpp
View File

@ -70,7 +70,7 @@ extern "C" {
extern PyObject* PyToolBox_createPartRing ( PyObject* module, PyObject* args ) extern PyObject* PyToolBox_createPartRing ( PyObject* module, PyObject* args )
{ {
cdebug.log(30) << "PyToolBox_createPartRing ()" << endl; cdebug_log(30,0) << "PyToolBox_createPartRing ()" << endl;
HTRY HTRY
PyObject* arg0; PyObject* arg0;

6
crlcore/src/pyCRL/PyToolEngine.cpp
View File

@ -46,7 +46,7 @@ extern "C" {
static PyObject* PyToolEngine_get ( PyObject*, PyObject* args, PyObject* kwArgs ) static PyObject* PyToolEngine_get ( PyObject*, PyObject* args, PyObject* kwArgs )
{ {
cdebug.log(30) << "PyToolEngine_get()" << endl; cdebug_log(30,0) << "PyToolEngine_get()" << endl;
HTRY HTRY
PyObject* pyCell = NULL; PyObject* pyCell = NULL;
@ -98,7 +98,7 @@ extern "C" {
static PyObject* PyToolEngine_destroyAll ( PyObject* ) static PyObject* PyToolEngine_destroyAll ( PyObject* )
{ {
cdebug.log(30) << "PyToolEngine_destroyAll()" << endl; cdebug_log(30,0) << "PyToolEngine_destroyAll()" << endl;
HTRY HTRY
ToolEngine::destroyAll(); ToolEngine::destroyAll();
@ -110,7 +110,7 @@ extern "C" {
static PyObject* PyToolEngine_getCell ( PyToolEngine* self ) static PyObject* PyToolEngine_getCell ( PyToolEngine* self )
{ {
cdebug.log(30) << "PyToolEngine_getCell ()" << endl; cdebug_log(30,0) << "PyToolEngine_getCell ()" << endl;
Cell* cell = NULL; Cell* cell = NULL;

20
documentation/UsersGuide/UsersGuide.html
View File

@ -271,15 +271,8 @@ running the <span class="cb">ccb</span> installer.</p>
</ul> </ul>
<p>Optional libraries:</p> <p>Optional libraries:</p>
<ul class="simple"> <ul class="simple">
<li><a class="reference external" href="https://www.si2.org/">Lemon</a> (used by the detailed placer)</li>
<li>LEF/DEF (from <a class="reference external" href="https://www.si2.org/">SI2</a>)</li> <li>LEF/DEF (from <a class="reference external" href="https://www.si2.org/">SI2</a>)</li>
</ul> </ul>
<p>The <span class="sc">Coloquinte</span> component requires the <span class="sc">lemon</span> component from <span class="sc">coin-or</span> (<a class="reference external" href="http://www.coin-or.org/index.html">Coin Or Home</a>).
A repository of <span class="sc">coin-or</span> packages backported from <span class="sc">Fedora</span> 21 is available here:</p>
<ul class="simple">
<li><span class="sc">Scientific Linux 6</span>: <a class="reference external" href="http://ftp.lip6.fr/pub/linux/distributions/slsoc/slsoc/soc/addons/i386/repoview">ftp://pub/linux/distributions/slsoc/slsoc/soc/addons/i386/RPMS</a></li>
<li><span class="sc">Scientific Linux 7</span>: <a class="reference external" href="http://ftp.lip6.fr/pub/linux/distributions/slsoc/soc/7/addons/x86_64/repoview">ftp://pub/linux/distributions/slsoc/soc/7/addons/x86_64/RPMS</a></li>
</ul>
<p>For other distributions, refer to their own packaging system.</p> <p>For other distributions, refer to their own packaging system.</p>
<p><span class="raw-html"><hr></span></p> <p><span class="raw-html"><hr></span></p>
<div class="section" id="fixed-directory-tree"> <div class="section" id="fixed-directory-tree">
@ -824,7 +817,8 @@ parametersTable = \
, ('misc.logMode' , TypeBool , True ) , ('misc.logMode' , TypeBool , True )
, ('misc.verboseLevel1' , TypeBool , False ) , ('misc.verboseLevel1' , TypeBool , False )
, ('misc.verboseLevel2' , TypeBool , True ) , ('misc.verboseLevel2' , TypeBool , True )
, ('misc.traceLevel' , TypeInt , 1000 ) , ('misc.minTraceLevel' , TypeInt , 0 )
, ('misc.maxTraceLevel' , TypeInt , 0 )
) )
# Some ordinary Python script... # Some ordinary Python script...
@ -1568,12 +1562,16 @@ sequences</td>
</tr> </tr>
<tr><td colspan="3"><strong>Development/Debug Parameters</strong></td> <tr><td colspan="3"><strong>Development/Debug Parameters</strong></td>
</tr> </tr>
<tr><td rowspan="2"><tt class="docutils literal">misc.traceLevel</tt></td> <tr><td><tt class="docutils literal">misc.minTraceLevel</tt></td>
<td>TypeInt</td> <td>TypeInt</td>
<td><span class="cb">0</span></td> <td><span class="cb">0</span></td>
</tr> </tr>
<tr><td colspan="2">Display trace information <em>below</em> that level <tr><td rowspan="2"><tt class="docutils literal">misc.maxTraceLevel</tt></td>
(<span class="cb">ltrace</span> stream)</td> <td>TypeInt</td>
<td><span class="cb">0</span></td>
</tr>
<tr><td colspan="2">Display trace information <em>between</em> those two
levels (<span class="cb">cdebug</span> stream)</td>
</tr> </tr>
<tr><td rowspan="2"><tt class="docutils literal">misc.catchCore</tt></td> <tr><td rowspan="2"><tt class="docutils literal">misc.catchCore</tt></td>
<td>TypeBool</td> <td>TypeBool</td>

668
documentation/UsersGuide/UsersGuide.pdf
View File

File diff suppressed because it is too large Load Diff

14
etesian/src/AddFeeds.cpp
View File

@ -115,8 +115,8 @@ namespace {
void Slice::merge ( DbU::Unit source, DbU::Unit target ) void Slice::merge ( DbU::Unit source, DbU::Unit target )
{ {
Interval chunkToMerge = _xspan.getIntersection( Interval(source,target) ); Interval chunkToMerge = _xspan.getIntersection( Interval(source,target) );
cdebug.log(129) << " Slice::merge() " << " " << chunkToMerge << endl; cdebug_log(129,0) << " Slice::merge() " << " " << chunkToMerge << endl;
cdebug.log(129) << " | " << _getString() << endl; cdebug_log(129,0) << " | " << _getString() << endl;
if (chunkToMerge.isEmpty()) return; if (chunkToMerge.isEmpty()) return;
@ -126,20 +126,20 @@ namespace {
while ( ichunk != _chunks.end() ) { while ( ichunk != _chunks.end() ) {
if (imerge == _chunks.end()) { if (imerge == _chunks.end()) {
if (chunkToMerge.getVMax() < (*ichunk).getVMin()) { if (chunkToMerge.getVMax() < (*ichunk).getVMin()) {
cdebug.log(129) << " | Insert before " << *ichunk << endl; cdebug_log(129,0) << " | Insert before " << *ichunk << endl;
imerge = _chunks.insert( ichunk, chunkToMerge ); imerge = _chunks.insert( ichunk, chunkToMerge );
break; break;
} }
if (chunkToMerge.intersect(*ichunk)) { if (chunkToMerge.intersect(*ichunk)) {
cdebug.log(129) << " | Merge with " << *ichunk << endl; cdebug_log(129,0) << " | Merge with " << *ichunk << endl;
imerge = ichunk; imerge = ichunk;
(*imerge).merge( chunkToMerge ); (*imerge).merge( chunkToMerge );
} }
} else { } else {
if (chunkToMerge.getVMax() >= (*ichunk).getVMin()) { if (chunkToMerge.getVMax() >= (*ichunk).getVMin()) {
(*imerge).merge( *ichunk ); (*imerge).merge( *ichunk );
cdebug.log(129) << " | Absorb (erase) " << *ichunk << endl; cdebug_log(129,0) << " | Absorb (erase) " << *ichunk << endl;
ichunk = _chunks.erase( ichunk ); ichunk = _chunks.erase( ichunk );
continue; continue;
} else } else
@ -151,8 +151,8 @@ namespace {
if (imerge == _chunks.end()) { if (imerge == _chunks.end()) {
_chunks.insert( ichunk, chunkToMerge ); _chunks.insert( ichunk, chunkToMerge );
cdebug.log(129) << " | Insert at end " << DbU::getValueString(_ybottom) << " " << chunkToMerge << endl; cdebug_log(129,0) << " | Insert at end " << DbU::getValueString(_ybottom) << " " << chunkToMerge << endl;
cdebug.log(129) << " | " << _getString() << endl; cdebug_log(129,0) << " | " << _getString() << endl;
} }
} }

2
etesian/src/Configuration.cpp
View File

@ -80,7 +80,7 @@ namespace Etesian {
Configuration::~Configuration () Configuration::~Configuration ()
{ {
cdebug.log(129) << "About to delete attribute _cg (CellGauge)." << endl; cdebug_log(129,0) << "About to delete attribute _cg (CellGauge)." << endl;
_cg->destroy (); _cg->destroy ();
} }

2
etesian/src/EtesianEngine.cpp
View File

@ -287,7 +287,7 @@ namespace Etesian {
void EtesianEngine::_preDestroy () void EtesianEngine::_preDestroy ()
{ {
cdebug.log(129,1) << "EtesianEngine::_preDestroy()" << endl; cdebug_log(129,1) << "EtesianEngine::_preDestroy()" << endl;
cmess1 << " o Deleting ToolEngine<" << getName() << "> from Cell <" cmess1 << " o Deleting ToolEngine<" << getName() << "> from Cell <"
<< getCell()->getName() << ">" << endl; << getCell()->getName() << ">" << endl;

2
etesian/src/PyEtesian.cpp
View File

@ -65,7 +65,7 @@ extern "C" {
// Module Initialization : "initEtesian ()" // Module Initialization : "initEtesian ()"
DL_EXPORT(void) initEtesian () { DL_EXPORT(void) initEtesian () {
cdebug.log(34) << "initEtesian()" << endl; cdebug_log(34,0) << "initEtesian()" << endl;
PyEtesianEngine_LinkPyType(); PyEtesianEngine_LinkPyType();
PyGraphicEtesianEngine_LinkPyType(); PyGraphicEtesianEngine_LinkPyType();

8
etesian/src/PyEtesianEngine.cpp
View File

@ -65,7 +65,7 @@ extern "C" {
static PyObject* PyEtesianEngine_get ( PyObject*, PyObject* args ) static PyObject* PyEtesianEngine_get ( PyObject*, PyObject* args )
{ {
cdebug.log(34) << "PyEtesianEngine_get()" << endl; cdebug_log(34,0) << "PyEtesianEngine_get()" << endl;
EtesianEngine* etesian = NULL; EtesianEngine* etesian = NULL;
@ -82,7 +82,7 @@ extern "C" {
static PyObject* PyEtesianEngine_create ( PyObject*, PyObject* args ) static PyObject* PyEtesianEngine_create ( PyObject*, PyObject* args )
{ {
cdebug.log(34) << "PyEtesianEngine_create()" << endl; cdebug_log(34,0) << "PyEtesianEngine_create()" << endl;
EtesianEngine* etesian = NULL; EtesianEngine* etesian = NULL;
@ -108,7 +108,7 @@ extern "C" {
static PyObject* PyEtesianEngine_setViewer ( PyEtesianEngine* self, PyObject* args ) static PyObject* PyEtesianEngine_setViewer ( PyEtesianEngine* self, PyObject* args )
{ {
cdebug.log(34) << "PyEtesianEngine_setViewer ()" << endl; cdebug_log(34,0) << "PyEtesianEngine_setViewer ()" << endl;
HTRY HTRY
METHOD_HEAD( "EtesianEngine.setViewer()" ) METHOD_HEAD( "EtesianEngine.setViewer()" )
@ -129,7 +129,7 @@ extern "C" {
static PyObject* PyEtesianEngine_place ( PyEtesianEngine* self ) static PyObject* PyEtesianEngine_place ( PyEtesianEngine* self )
{ {
cdebug.log(34) << "PyEtesianEngine_place()" << endl; cdebug_log(34,0) << "PyEtesianEngine_place()" << endl;
HTRY HTRY
METHOD_HEAD("EtesianEngine.place()") METHOD_HEAD("EtesianEngine.place()")
if (etesian->getViewer()) { if (etesian->getViewer()) {

4
etesian/src/PyGraphicEtesianEngine.cpp
View File

@ -49,7 +49,7 @@ extern "C" {
static PyObject* PyGraphicEtesianEngine_grab ( PyObject* ) static PyObject* PyGraphicEtesianEngine_grab ( PyObject* )
{ {
cdebug.log(34) << "PyGraphicEtesianEngine_grab()" << endl; cdebug_log(34,0) << "PyGraphicEtesianEngine_grab()" << endl;
PyGraphicEtesianEngine* pyGraphicEtesianEngine = NULL; PyGraphicEtesianEngine* pyGraphicEtesianEngine = NULL;
HTRY HTRY
@ -65,7 +65,7 @@ extern "C" {
static PyObject* PyGraphicEtesianEngine_getCell ( PyGraphicEtesianEngine* self ) static PyObject* PyGraphicEtesianEngine_getCell ( PyGraphicEtesianEngine* self )
{ {
cdebug.log(34) << "PyGraphicEtesianEngine_getCell ()" << endl; cdebug_log(34,0) << "PyGraphicEtesianEngine_getCell ()" << endl;
Cell* cell = NULL; Cell* cell = NULL;

6
hurricane/src/hurricane/BasicLayer.cpp
View File

@ -352,7 +352,7 @@ namespace Hurricane {
{ {
if (flags & JsonWriter::RegisterMode) return; if (flags & JsonWriter::RegisterMode) return;
cdebug.log(19) << "JsonBasicLayer::JsonBasicLayer()" << endl; cdebug_log(19,0) << "JsonBasicLayer::JsonBasicLayer()" << endl;
add( "_material" , typeid(string) ); add( "_material" , typeid(string) );
add( "_extractNumber", typeid(string) ); add( "_extractNumber", typeid(string) );
@ -375,7 +375,7 @@ namespace Hurricane {
void JsonBasicLayer::toData(JsonStack& stack) void JsonBasicLayer::toData(JsonStack& stack)
{ {
cdebug.tabw(19,1); cdebug_tabw(19,1);
check( stack, "JsonBasicLayer::toData" ); check( stack, "JsonBasicLayer::toData" );
@ -449,7 +449,7 @@ namespace Hurricane {
update( stack, basicLayer ); update( stack, basicLayer );
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
} }

2
hurricane/src/hurricane/Box.cpp
View File

@ -405,7 +405,7 @@ void JsonBox::toData(JsonStack& stack)
if ( (xMin <= xMax) and (yMin <= yMax) ) if ( (xMin <= xMax) and (yMin <= yMax) )
box.merge( xMin, yMin, xMax, yMax ); box.merge( xMin, yMin, xMax, yMax );
cdebug.log(19) << "Box(" << xMin << ", " cdebug_log(19,0) << "Box(" << xMin << ", "
<< yMin << ", " << yMin << ", "
<< xMax << ", " << xMax << ", "
<< yMax << ")" << endl; << yMax << ")" << endl;

32
hurricane/src/hurricane/Cell.cpp
View File

@ -194,7 +194,7 @@ namespace Hurricane {
UniquifyRelation* relation = NULL; UniquifyRelation* relation = NULL;
Cell* cell = dynamic_cast<Cell*>( dbo ); Cell* cell = dynamic_cast<Cell*>( dbo );
cdebug.log(19) << "topDBo:" << dbo << endl; cdebug_log(19,0) << "topDBo:" << dbo << endl;
if (cell) { if (cell) {
relation = UniquifyRelation::get( cell ); relation = UniquifyRelation::get( cell );
@ -394,7 +394,7 @@ namespace Hurricane {
SlavedsRelation* relation = NULL; SlavedsRelation* relation = NULL;
Cell* cell = dynamic_cast<Cell*>( dbo ); Cell* cell = dynamic_cast<Cell*>( dbo );
cdebug.log(19) << "topDBo:" << dbo << endl; cdebug_log(19,0) << "topDBo:" << dbo << endl;
if (cell) { if (cell) {
relation = SlavedsRelation::get( cell ); relation = SlavedsRelation::get( cell );
@ -667,12 +667,12 @@ Entity* Cell::getEntity(const Signature& signature) const
return NULL; return NULL;
} }
cdebug.log(18) << "Cell::getEntity(): <" << getName() << ">, Net:<" << net->getName() << ">" << endl; cdebug_log(18,0) << "Cell::getEntity(): <" << getName() << ">, Net:<" << net->getName() << ">" << endl;
if (signature.getType() == Signature::TypeContact) { if (signature.getType() == Signature::TypeContact) {
cdebug.log(18) << "Looking in Contacts..." << endl; cdebug_log(18,0) << "Looking in Contacts..." << endl;
for ( Contact* component : getComponents().getSubSet<Contact*>() ) { for ( Contact* component : getComponents().getSubSet<Contact*>() ) {
cdebug.log(18) << "| " << component << endl; cdebug_log(18,0) << "| " << component << endl;
if ( (component->getLayer () == signature.getLayer()) if ( (component->getLayer () == signature.getLayer())
and (component->getDx () == signature.getDim(Signature::ContactDx)) and (component->getDx () == signature.getDim(Signature::ContactDx))
and (component->getDy () == signature.getDim(Signature::ContactDy)) and (component->getDy () == signature.getDim(Signature::ContactDy))
@ -683,9 +683,9 @@ Entity* Cell::getEntity(const Signature& signature) const
} }
if (signature.getType() == Signature::TypeVertical) { if (signature.getType() == Signature::TypeVertical) {
cdebug.log(18) << "Looking in Verticals..." << endl; cdebug_log(18,0) << "Looking in Verticals..." << endl;
for ( Vertical* component : getComponents().getSubSet<Vertical*>() ) { for ( Vertical* component : getComponents().getSubSet<Vertical*>() ) {
cdebug.log(18) << "| " << component << endl; cdebug_log(18,0) << "| " << component << endl;
if ( (component->getLayer () == signature.getLayer()) if ( (component->getLayer () == signature.getLayer())
and (component->getWidth () == signature.getDim(Signature::VerticalWidth)) and (component->getWidth () == signature.getDim(Signature::VerticalWidth))
and (component->getX () == signature.getDim(Signature::VerticalX)) and (component->getX () == signature.getDim(Signature::VerticalX))
@ -696,9 +696,9 @@ Entity* Cell::getEntity(const Signature& signature) const
} }
if (signature.getType() == Signature::TypeHorizontal) { if (signature.getType() == Signature::TypeHorizontal) {
cdebug.log(18) << "Looking in Horizontals..." << endl; cdebug_log(18,0) << "Looking in Horizontals..." << endl;
for ( Horizontal* component : getComponents().getSubSet<Horizontal*>() ) { for ( Horizontal* component : getComponents().getSubSet<Horizontal*>() ) {
cdebug.log(18) << "| " << component << endl; cdebug_log(18,0) << "| " << component << endl;
if ( (component->getLayer () == signature.getLayer()) if ( (component->getLayer () == signature.getLayer())
and (component->getWidth () == signature.getDim(Signature::HorizontalWidth)) and (component->getWidth () == signature.getDim(Signature::HorizontalWidth))
and (component->getY () == signature.getDim(Signature::HorizontalY)) and (component->getY () == signature.getDim(Signature::HorizontalY))
@ -709,9 +709,9 @@ Entity* Cell::getEntity(const Signature& signature) const
} }
if (signature.getType() == Signature::TypePad) { if (signature.getType() == Signature::TypePad) {
cdebug.log(18) << "Looking in Pads..." << endl; cdebug_log(18,0) << "Looking in Pads..." << endl;
for ( Pad* component : getComponents().getSubSet<Pad*>() ) { for ( Pad* component : getComponents().getSubSet<Pad*>() ) {
cdebug.log(18) << "| " << component << endl; cdebug_log(18,0) << "| " << component << endl;
if ( (component->getLayer() == signature.getLayer()) if ( (component->getLayer() == signature.getLayer())
and (component->getBoundingBox().getXMin() == signature.getDim(Signature::PadXMin)) and (component->getBoundingBox().getXMin() == signature.getDim(Signature::PadXMin))
and (component->getBoundingBox().getYMin() == signature.getDim(Signature::PadYMin)) and (component->getBoundingBox().getYMin() == signature.getDim(Signature::PadYMin))
@ -817,7 +817,7 @@ DeepNet* Cell::getDeepNet ( Path path, const Net* leafNet ) const
void Cell::flattenNets(unsigned int flags) void Cell::flattenNets(unsigned int flags)
// *************************************** // ***************************************
{ {
cdebug.log(18) << "Cell::flattenNets() flags:0x" << hex << flags << endl; cdebug_log(18,0) << "Cell::flattenNets() flags:0x" << hex << flags << endl;
UpdateSession::open(); UpdateSession::open();
@ -1003,7 +1003,7 @@ Cell* Cell::getClone()
void Cell::uniquify(unsigned int depth) void Cell::uniquify(unsigned int depth)
// ************************************ // ************************************
{ {
cdebug.log(18,1) << "Cell::uniquify() " << this << endl; cdebug_log(18,1) << "Cell::uniquify() " << this << endl;
vector<DeepNet*> deepNets; vector<DeepNet*> deepNets;
for ( DeepNet* deepNet : getNets().getSubSet<DeepNet*>() ) { for ( DeepNet* deepNet : getNets().getSubSet<DeepNet*>() ) {
@ -1019,7 +1019,7 @@ void Cell::uniquify(unsigned int depth)
for ( Instance* instance : getInstances() ) { for ( Instance* instance : getInstances() ) {
Cell* masterCell = instance->getMasterCell(); Cell* masterCell = instance->getMasterCell();
cdebug.log(18) << "| " << instance << endl; cdebug_log(18,0) << "| " << instance << endl;
if (masterCell->isTerminal()) continue; if (masterCell->isTerminal()) continue;
if (masterCells.find(masterCell) == masterCells.end()) { if (masterCells.find(masterCell) == masterCells.end()) {
@ -1042,8 +1042,8 @@ void Cell::uniquify(unsigned int depth)
cell->uniquify( depth-1 ); cell->uniquify( depth-1 );
} }
cdebug.tabw(18,-1); cdebug_tabw(18,-1);
cdebug.log(18) << "Cell::uniquify() END " << this << endl; cdebug_log(18,0) << "Cell::uniquify() END " << this << endl;
} }
void Cell::materialize() void Cell::materialize()

10
hurricane/src/hurricane/Component.cpp
View File

@ -330,7 +330,7 @@ ComponentFilter Component::getIsUnderFilter(const Box& area)
void Component::materialize() void Component::materialize()
// ************************** // **************************
{ {
cdebug.log(18) << "Component::materialize() - " << this << endl; cdebug_log(18,0) << "Component::materialize() - " << this << endl;
if (!isMaterialized()) { if (!isMaterialized()) {
Cell* cell = getCell(); Cell* cell = getCell();
@ -350,7 +350,7 @@ void Component::materialize()
void Component::unmaterialize() void Component::unmaterialize()
// **************************** // ****************************
{ {
cdebug.log(18) << "Component::unmaterialize() " << this << endl; cdebug_log(18,0) << "Component::unmaterialize() " << this << endl;
if (isMaterialized()) { if (isMaterialized()) {
Cell* cell = getCell(); Cell* cell = getCell();
@ -408,7 +408,7 @@ void Component::_postCreate()
void Component::_preDestroy() void Component::_preDestroy()
// ************************* // *************************
{ {
cdebug.log(18,1) << "entering Component::_Predestroy: " << this << endl; cdebug_log(18,1) << "entering Component::_Predestroy: " << this << endl;
clearProperties(); clearProperties();
@ -468,8 +468,8 @@ void Component::_preDestroy()
if (_net) _net->_getComponentSet()._remove(this); if (_net) _net->_getComponentSet()._remove(this);
cdebug.log(18) << "exiting Component::_Predestroy:" << endl; cdebug_log(18,0) << "exiting Component::_Predestroy:" << endl;
cdebug.tabw(18,-1); cdebug_tabw(18,-1);
} }
void Component::_toJson( JsonWriter* writer ) const void Component::_toJson( JsonWriter* writer ) const

6
hurricane/src/hurricane/Contact.cpp
View File

@ -325,14 +325,14 @@ void Contact::setOffset(const DbU::Unit& dx, const DbU::Unit& dy)
void Contact::_preDestroy() void Contact::_preDestroy()
// *********************** // ***********************
{ {
cdebug.log(18,1) << "entering Contact::PreDestroy " << this << endl; cdebug_log(18,1) << "entering Contact::PreDestroy " << this << endl;
Inherit::_preDestroy(); Inherit::_preDestroy();
_anchorHook.detach(); _anchorHook.detach();
cdebug.log(19) << "exiting Contact::PreDestroy" << endl; cdebug_log(19,0) << "exiting Contact::PreDestroy" << endl;
cdebug.tabw(18,-1); cdebug_tabw(18,-1);
} }
void Contact::_toJson(JsonWriter* writer) const void Contact::_toJson(JsonWriter* writer) const

6
hurricane/src/hurricane/ContactLayer.cpp
View File

@ -225,7 +225,7 @@ namespace Hurricane {
{ {
if (flags & JsonWriter::RegisterMode) return; if (flags & JsonWriter::RegisterMode) return;
cdebug.log(19) << "JsonContactLayer::JsonContactLayer()" << endl; cdebug_log(19,0) << "JsonContactLayer::JsonContactLayer()" << endl;
add( "_metal" , typeid(string) ); add( "_metal" , typeid(string) );
add( "_cut" , typeid(string) ); add( "_cut" , typeid(string) );
@ -254,7 +254,7 @@ namespace Hurricane {
void JsonContactLayer::toData(JsonStack& stack) void JsonContactLayer::toData(JsonStack& stack)
{ {
cdebug.tabw(19,1); cdebug_tabw(19,1);
check( stack, "JsonContactLayer::toData" ); check( stack, "JsonContactLayer::toData" );
@ -333,7 +333,7 @@ namespace Hurricane {
update( stack, layer ); update( stack, layer );
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
} }

8
hurricane/src/hurricane/DeepNet.cpp
View File

@ -56,7 +56,7 @@ namespace Hurricane {
) )
, _netOccurrence(netOccurrence) , _netOccurrence(netOccurrence)
{ {
cdebug.log(18) << "DeepNet::DeepNet() " << getCell() << " " << this << endl; cdebug_log(18,0) << "DeepNet::DeepNet() " << getCell() << " " << this << endl;
} }
@ -154,7 +154,7 @@ namespace Hurricane {
JsonDeepNet::JsonDeepNet ( unsigned long flags ) JsonDeepNet::JsonDeepNet ( unsigned long flags )
: JsonNet(flags) : JsonNet(flags)
{ {
cdebug.log(19) << "JsonDeepNet::JsonDeepNet()" << endl; cdebug_log(19,0) << "JsonDeepNet::JsonDeepNet()" << endl;
add( "_netOccurrence", typeid(Occurrence) ); add( "_netOccurrence", typeid(Occurrence) );
} }
@ -174,7 +174,7 @@ namespace Hurricane {
void JsonDeepNet::toData(JsonStack& stack) void JsonDeepNet::toData(JsonStack& stack)
{ {
cdebug.tabw(19,1); cdebug_tabw(19,1);
check( stack, "JsonDeepNet::toData" ); check( stack, "JsonDeepNet::toData" );
presetId( stack ); presetId( stack );
@ -191,7 +191,7 @@ namespace Hurricane {
setName( ".Net" ); setName( ".Net" );
update( stack, _net ); update( stack, _net );
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
} }

6
hurricane/src/hurricane/DiffusionLayer.cpp
View File

@ -253,7 +253,7 @@ namespace Hurricane {
{ {
if (flags & JsonWriter::RegisterMode) return; if (flags & JsonWriter::RegisterMode) return;
cdebug.log(19) << "JsonDiffusionLayer::JsonDiffusionLayer()" << endl; cdebug_log(19,0) << "JsonDiffusionLayer::JsonDiffusionLayer()" << endl;
add( "_active" , typeid(string) ); add( "_active" , typeid(string) );
add( "_diffusion" , typeid(string) ); add( "_diffusion" , typeid(string) );
@ -281,7 +281,7 @@ namespace Hurricane {
void JsonDiffusionLayer::toData(JsonStack& stack) void JsonDiffusionLayer::toData(JsonStack& stack)
{ {
cdebug.tabw(19,1); cdebug_tabw(19,1);
check( stack, "JsonDiffusionLayer::toData" ); check( stack, "JsonDiffusionLayer::toData" );
@ -360,7 +360,7 @@ namespace Hurricane {
update( stack, layer ); update( stack, layer );
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
} }

8
hurricane/src/hurricane/Entity.cpp
View File

@ -80,7 +80,7 @@ namespace Hurricane {
if (_flags & ForcedIdMode) { if (_flags & ForcedIdMode) {
if (_flags & NextIdSet) { if (_flags & NextIdSet) {
_flags &= ~NextIdSet; _flags &= ~NextIdSet;
cdebug.log(18) << demangle(typeid(*this).name()) cdebug_log(18,0) << demangle(typeid(*this).name())
<< "::getNextId(): Consuming the preset id:" << _nextId << endl; << "::getNextId(): Consuming the preset id:" << _nextId << endl;
return _nextId; return _nextId;
} else { } else {
@ -223,14 +223,14 @@ namespace Hurricane {
void JsonEntityRef::toData ( JsonStack& stack ) void JsonEntityRef::toData ( JsonStack& stack )
{ {
cdebug.tabw(19,1); cdebug_tabw(19,1);
check( stack, "JsonEntityRef::toData" ); check( stack, "JsonEntityRef::toData" );
unsigned int jsonId = get<int64_t>( stack, "_id" ); unsigned int jsonId = get<int64_t>( stack, "_id" );
Entity* entity = stack.getEntity<Entity*>( jsonId ); Entity* entity = stack.getEntity<Entity*>( jsonId );
cdebug.log(19) << "jsonId:" << jsonId << " entity:" << entity << endl; cdebug_log(19,0) << "jsonId:" << jsonId << " entity:" << entity << endl;
if (entity) { if (entity) {
JsonBaseArray<Entity*>* array = jget< JsonBaseArray<Entity*> >( stack ); JsonBaseArray<Entity*>* array = jget< JsonBaseArray<Entity*> >( stack );
@ -243,7 +243,7 @@ namespace Hurricane {
update( stack, NULL ); update( stack, NULL );
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
} }
} // End of Hurricane namespace. } // End of Hurricane namespace.

8
hurricane/src/hurricane/ExtensionGo.cpp
View File

@ -50,7 +50,7 @@ namespace Hurricane {
void ExtensionGo::_preDestroy () void ExtensionGo::_preDestroy ()
{ {
cdebug.log(18) << "ExtensionGo::_preDestroy() - " << (void*)this << endl; cdebug_log(18,0) << "ExtensionGo::_preDestroy() - " << (void*)this << endl;
Go::_preDestroy (); Go::_preDestroy ();
} }
@ -73,7 +73,7 @@ namespace Hurricane {
void ExtensionGo::unmaterialize () void ExtensionGo::unmaterialize ()
{ {
cdebug.log(18,1) << "ExtensionGo::unmaterialize() - start" << (void*)this << endl; cdebug_log(18,1) << "ExtensionGo::unmaterialize() - start" << (void*)this << endl;
if ( isMaterialized() ) { if ( isMaterialized() ) {
ExtensionSlice* slice = _cell->getExtensionSlice( getName() ); ExtensionSlice* slice = _cell->getExtensionSlice( getName() );
@ -84,8 +84,8 @@ namespace Hurricane {
} }
} }
cdebug.tabw(18,-1); cdebug_tabw(18,-1);
cdebug.log(18) << "ExtensionGo::unmaterialize() - completed" << endl; cdebug_log(18,0) << "ExtensionGo::unmaterialize() - completed" << endl;
} }

2
hurricane/src/hurricane/ExtensionSlice.cpp
View File

@ -66,7 +66,7 @@ namespace Hurricane {
ExtensionSlice::~ExtensionSlice () ExtensionSlice::~ExtensionSlice ()
{ {
cdebug.log(18) << "ExtensionSlice::~ExtensionSlice() - " << (void*)this << endl; cdebug_log(18,0) << "ExtensionSlice::~ExtensionSlice() - " << (void*)this << endl;
_cell->_removeSlice ( this ); _cell->_removeSlice ( this );
} }

12
hurricane/src/hurricane/Instance.cpp
View File

@ -428,8 +428,8 @@ void Instance::setPlacementStatus(const PlacementStatus& placementStatus)
void Instance::setMasterCell(Cell* masterCell, bool secureFlag) void Instance::setMasterCell(Cell* masterCell, bool secureFlag)
// ************************************************************ // ************************************************************
{ {
cdebug.log(18,1) << "Instance::setMasterCell() on " << this << endl; cdebug_log(18,1) << "Instance::setMasterCell() on " << this << endl;
cdebug.log(18) << "NEW masterCell:" << masterCell << endl; cdebug_log(18,0) << "NEW masterCell:" << masterCell << endl;
if (masterCell != _masterCell) { if (masterCell != _masterCell) {
UpdateSession::open(); UpdateSession::open();
@ -475,14 +475,14 @@ void Instance::setMasterCell(Cell* masterCell, bool secureFlag)
masterNetList.pop_front(); masterNetList.pop_front();
} }
cdebug.log(18) << "Remove " << this << " from " << _masterCell << endl; cdebug_log(18,0) << "Remove " << this << " from " << _masterCell << endl;
_masterCell->_getSlaveInstanceSet()._remove(this); _masterCell->_getSlaveInstanceSet()._remove(this);
_masterCell = masterCell; _masterCell = masterCell;
cdebug.log(18) << "Add (before) " << this << " to " << _masterCell << endl; cdebug_log(18,0) << "Add (before) " << this << " to " << _masterCell << endl;
_masterCell->isUnique(); _masterCell->isUnique();
_masterCell->_getSlaveInstanceSet()._insert(this); _masterCell->_getSlaveInstanceSet()._insert(this);
cdebug.log(18) << "Add (after) " << this << " to " << _masterCell << endl; cdebug_log(18,0) << "Add (after) " << this << " to " << _masterCell << endl;
_masterCell->isUnique(); _masterCell->isUnique();
for_each_net(externalNet, _masterCell->getExternalNets()) { for_each_net(externalNet, _masterCell->getExternalNets()) {
@ -493,7 +493,7 @@ void Instance::setMasterCell(Cell* masterCell, bool secureFlag)
UpdateSession::close(); UpdateSession::close();
} }
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
} }
void Instance::uniquify() void Instance::uniquify()

32
hurricane/src/hurricane/JsonReader.cpp
View File

@ -212,7 +212,7 @@ namespace Hurricane {
} }
} }
cdebug.log(19) << "HurricaneHandler::String() [key/typename] \"" << value << "\"." << endl; cdebug_log(19,0) << "HurricaneHandler::String() [key/typename] \"" << value << "\"." << endl;
_key.clear(); _key.clear();
return true; return true;
} }
@ -230,13 +230,13 @@ namespace Hurricane {
_key = key; _key = key;
if (_state & TypenameKey) return true; if (_state & TypenameKey) return true;
//cdebug.log(19) << "HurricaneHandler::Key() key:" << _key << " objects().size():" << objects().size() << endl; //cdebug_log(19,0) << "HurricaneHandler::Key() key:" << _key << " objects().size():" << objects().size() << endl;
if (objects().back()) { if (objects().back()) {
if ( doCallToData() and not _key.empty() and (_key[0] != '_') ) { if ( doCallToData() and not _key.empty() and (_key[0] != '_') ) {
// The key is no longer a simple attribute of the object. // The key is no longer a simple attribute of the object.
// Triggers it's creation in the Json stack. // Triggers it's creation in the Json stack.
cdebug.log(19) << "HurricaneHandler::key() Calling " cdebug_log(19,0) << "HurricaneHandler::key() Calling "
<< objects().back()->getTypeName() << "::toData(JsonStack&)." << endl; << objects().back()->getTypeName() << "::toData(JsonStack&)." << endl;
objects().back()->toData( stack() ); objects().back()->toData( stack() );
} }
@ -248,28 +248,28 @@ namespace Hurricane {
bool HurricaneHandler::StartObject () bool HurricaneHandler::StartObject ()
{ {
cdebug.log(19,1) << "Hurricane::StartObject()" << endl; cdebug_log(19,1) << "Hurricane::StartObject()" << endl;
_state |= TypenameKey; _state |= TypenameKey;
_objectName = _key; _objectName = _key;
objects().push_back( new JsonDummy() ); objects().push_back( new JsonDummy() );
_key.clear(); _key.clear();
cdebug.log(19) << "objects().push_back(NULL), size():" << objects().size() << "." << endl; cdebug_log(19,0) << "objects().push_back(NULL), size():" << objects().size() << "." << endl;
cdebug.tabw(19,1); cdebug_tabw(19,1);
return true; return true;
} }
bool HurricaneHandler::EndObject ( SizeType ) bool HurricaneHandler::EndObject ( SizeType )
{ {
cdebug.tabw(19,-2); cdebug_tabw(19,-2);
cdebug.log(19) << "HurricaneHandler::EndObject()" << endl; cdebug_log(19,0) << "HurricaneHandler::EndObject()" << endl;
cdebug.tabw(19,1); cdebug_tabw(19,1);
_objectName.clear(); _objectName.clear();
if (not isDummy()) { if (not isDummy()) {
if (doCallToData()) { if (doCallToData()) {
cdebug.log(19) << "Calling " << objects().back()->getTypeName() << "::toData(JsonStack&)." << endl; cdebug_log(19,0) << "Calling " << objects().back()->getTypeName() << "::toData(JsonStack&)." << endl;
objects().back()->toData( stack() ); objects().back()->toData( stack() );
} }
if (stack().size() > 1) { if (stack().size() > 1) {
@ -277,21 +277,21 @@ namespace Hurricane {
} }
} }
cdebug.log(19) << "objects().pop_back(), size():" << objects().size() << "." << endl; cdebug_log(19,0) << "objects().pop_back(), size():" << objects().size() << "." << endl;
if (objects().back()->issetFlags(JsonWriter::DBoObject)) if (objects().back()->issetFlags(JsonWriter::DBoObject))
stack().pop_back_dbo(); stack().pop_back_dbo();
delete objects().back(); delete objects().back();
objects().pop_back(); objects().pop_back();
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
return true; return true;
} }
bool HurricaneHandler::StartArray() bool HurricaneHandler::StartArray()
{ {
cdebug.log(19,1) << "HurricaneHandler::StartArray() key:\"" << _key << "\"." << endl; cdebug_log(19,1) << "HurricaneHandler::StartArray() key:\"" << _key << "\"." << endl;
_objectName.clear(); _objectName.clear();
if (_key[0] != '+') { if (_key[0] != '+') {
@ -306,8 +306,8 @@ namespace Hurricane {
bool HurricaneHandler::EndArray ( SizeType ) bool HurricaneHandler::EndArray ( SizeType )
{ {
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
cdebug.log(19) << "HurricaneHandler::EndArray()" << endl; cdebug_log(19,0) << "HurricaneHandler::EndArray()" << endl;
return true; return true;
} }
@ -351,7 +351,7 @@ namespace Hurricane {
fileName += ".json.bz2"; fileName += ".json.bz2";
_file = fopen( fileName.c_str(), "r" ); _file = fopen( fileName.c_str(), "r" );
cdebug.log(19) << "_file:" << _file << ", _buffer:" << (void*)_buffer << endl; cdebug_log(19,0) << "_file:" << _file << ", _buffer:" << (void*)_buffer << endl;
if (not _file) { if (not _file) {
throw Error( "JsonReader::parse(): Cannot open file \"%s\"." throw Error( "JsonReader::parse(): Cannot open file \"%s\"."

10
hurricane/src/hurricane/Net.cpp
View File

@ -1113,7 +1113,7 @@ string Net_SlavePlugs::Locator::_getString() const
{ {
if (flags & JsonWriter::RegisterMode) return; if (flags & JsonWriter::RegisterMode) return;
cdebug.log(19) << "JsonNet::JsonNet()" << endl; cdebug_log(19,0) << "JsonNet::JsonNet()" << endl;
add( "_name" , typeid(string) ); add( "_name" , typeid(string) );
add( "_isGlobal" , typeid(bool) ); add( "_isGlobal" , typeid(bool) );
@ -1125,7 +1125,7 @@ string Net_SlavePlugs::Locator::_getString() const
add( "+componentSet" , typeid(JsonArray) ); add( "+componentSet" , typeid(JsonArray) );
add( "+externalComponents", typeid(JsonArray) ); add( "+externalComponents", typeid(JsonArray) );
cdebug.log(19) << "Disabling auto-materialization (" << _autoMaterialize << ")." << endl; cdebug_log(19,0) << "Disabling auto-materialization (" << _autoMaterialize << ")." << endl;
Go::disableAutoMaterialization(); Go::disableAutoMaterialization();
} }
@ -1140,7 +1140,7 @@ string Net_SlavePlugs::Locator::_getString() const
if (_autoMaterialize) { if (_autoMaterialize) {
Go::enableAutoMaterialization(); Go::enableAutoMaterialization();
cdebug.log(18) << "Enabling auto-materialization." << endl; cdebug_log(18,0) << "Enabling auto-materialization." << endl;
} }
} }
@ -1155,7 +1155,7 @@ string Net_SlavePlugs::Locator::_getString() const
void JsonNet::toData ( JsonStack& stack ) void JsonNet::toData ( JsonStack& stack )
{ {
cdebug.tabw(19,1); cdebug_tabw(19,1);
check( stack, "JsonNet::toData" ); check( stack, "JsonNet::toData" );
presetId( stack ); presetId( stack );
@ -1169,7 +1169,7 @@ string Net_SlavePlugs::Locator::_getString() const
update( stack, _net ); update( stack, _net );
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
} }

4
hurricane/src/hurricane/NetExternalComponents.cpp
View File

@ -149,12 +149,12 @@ namespace Hurricane {
void JsonNetExternalComponents::toData ( JsonStack& stack ) void JsonNetExternalComponents::toData ( JsonStack& stack )
{ {
cdebug.tabw(19,1); cdebug_tabw(19,1);
check ( stack, "JsonNetExternalComponents::toData" ); check ( stack, "JsonNetExternalComponents::toData" );
update( stack, NULL ); update( stack, NULL );
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
} }

8
hurricane/src/hurricane/Plug.cpp
View File

@ -180,14 +180,14 @@ void Plug::_destroy()
void Plug::_preDestroy() void Plug::_preDestroy()
// ******************** // ********************
{ {
cdebug.log(18,1) << "entering Plug::_preDestroy: " << this << endl; cdebug_log(18,1) << "entering Plug::_preDestroy: " << this << endl;
Inherit::_preDestroy(); Inherit::_preDestroy();
_instance->_getPlugMap()._remove(this); _instance->_getPlugMap()._remove(this);
cdebug.log(18) << "exiting Plug::_preDestroy:" << endl; cdebug_log(18,0) << "exiting Plug::_preDestroy:" << endl;
cdebug.tabw(18,-1); cdebug_tabw(18,-1);
} }
void Plug::_toJson(JsonWriter* writer) const void Plug::_toJson(JsonWriter* writer) const
@ -289,7 +289,7 @@ void JsonPlug::toData(JsonStack& stack)
} else { } else {
cerr << Error( "JsonPlug::toData(): Cannot find \".Instance\" in stack, skipping." ) << endl; cerr << Error( "JsonPlug::toData(): Cannot find \".Instance\" in stack, skipping." ) << endl;
} }
cdebug.log(19) << "Instance Plug contents ignored for now." << endl; cdebug_log(19,0) << "Instance Plug contents ignored for now." << endl;
update( stack, plug ); update( stack, plug );
} }

6
hurricane/src/hurricane/Quark.cpp
View File

@ -81,7 +81,7 @@ void Quark::_postCreate()
void Quark::_preDestroy() void Quark::_preDestroy()
// ********************* // *********************
{ {
cdebug.log(18,1) << "entering Quark::_preDestroy: " << this << endl; cdebug_log(18,1) << "entering Quark::_preDestroy: " << this << endl;
Inherit::_preDestroy(); Inherit::_preDestroy();
@ -92,8 +92,8 @@ void Quark::_preDestroy()
else else
if (NULL_SHARED_PATH_QUARK_MAP) NULL_SHARED_PATH_QUARK_MAP->_remove(this); if (NULL_SHARED_PATH_QUARK_MAP) NULL_SHARED_PATH_QUARK_MAP->_remove(this);
cdebug.log(18) << "exiting Quark::_preDestroy:" << endl; cdebug_log(18,0) << "exiting Quark::_preDestroy:" << endl;
cdebug.tabw(18,-1); cdebug_tabw(18,-1);
} }
string Quark::_getString() const string Quark::_getString() const

6
hurricane/src/hurricane/RegularLayer.cpp
View File

@ -350,7 +350,7 @@ namespace Hurricane {
{ {
if (flags & JsonWriter::RegisterMode) return; if (flags & JsonWriter::RegisterMode) return;
cdebug.log(19) << "JsonRegularLayer::JsonRegularLayer()" << endl; cdebug_log(19,0) << "JsonRegularLayer::JsonRegularLayer()" << endl;
add( "_basicLayer" , typeid(string) ); add( "_basicLayer" , typeid(string) );
add( "_enclosure" , typeid(int64_t) ); add( "_enclosure" , typeid(int64_t) );
@ -373,7 +373,7 @@ namespace Hurricane {
void JsonRegularLayer::toData( JsonStack& stack ) void JsonRegularLayer::toData( JsonStack& stack )
{ {
cdebug.tabw(19,1); cdebug_tabw(19,1);
check( stack, "JsonRegularLayer::toData" ); check( stack, "JsonRegularLayer::toData" );
@ -440,7 +440,7 @@ namespace Hurricane {
update( stack, layer ); update( stack, layer );
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
} }
} // Hurricane namespace. } // Hurricane namespace.

6
hurricane/src/hurricane/RoutingPad.cpp
View File

@ -236,14 +236,14 @@ namespace Hurricane {
void RoutingPad::_preDestroy () void RoutingPad::_preDestroy ()
{ {
cdebug.log(18,1) << "entering RoutingPad::preDestroy: " << this << endl; cdebug_log(18,1) << "entering RoutingPad::preDestroy: " << this << endl;
if ( not _occurrence.getPath().isEmpty() ) if ( not _occurrence.getPath().isEmpty() )
_occurrence.getMasterCell()->_removeSlaveEntity(_occurrence.getEntity(),this); _occurrence.getMasterCell()->_removeSlaveEntity(_occurrence.getEntity(),this);
Inherit::_preDestroy(); Inherit::_preDestroy();
cdebug.log(18) << "exiting RoutingPad::preDestroy:" << endl; cdebug_log(18,0) << "exiting RoutingPad::preDestroy:" << endl;
cdebug.tabw(18,-1); cdebug_tabw(18,-1);
} }

6
hurricane/src/hurricane/Rubber.cpp
View File

@ -179,7 +179,7 @@ void Rubber::_destroy()
void Rubber::_preDestroy() void Rubber::_preDestroy()
// ********************** // **********************
{ {
cdebug.log(18,1) << "entering Rubber::_preDestroy: " << this << endl; cdebug_log(18,1) << "entering Rubber::_preDestroy: " << this << endl;
Inherit::_preDestroy(); Inherit::_preDestroy();
@ -192,8 +192,8 @@ void Rubber::_preDestroy()
_net->_getRubberSet()._remove(this); _net->_getRubberSet()._remove(this);
cdebug.log(18) << "exiting Rubber::_preDestroy:" << endl; cdebug_log(18,0) << "exiting Rubber::_preDestroy:" << endl;
cdebug.tabw(18,-1); cdebug_tabw(18,-1);
} }
string Rubber::_getString() const string Rubber::_getString() const

6
hurricane/src/hurricane/Segment.cpp
View File

@ -294,15 +294,15 @@ void Segment::invert()
void Segment::_preDestroy() void Segment::_preDestroy()
// *********************** // ***********************
{ {
cdebug.log(18,1) << "entering Segment::_preDestroy: " << this << endl; cdebug_log(18,1) << "entering Segment::_preDestroy: " << this << endl;
Inherit::_preDestroy(); Inherit::_preDestroy();
_sourceHook.detach(); _sourceHook.detach();
_targetHook.detach(); _targetHook.detach();
cdebug.log(18) << "exiting Segment::_preDestroy:" << endl; cdebug_log(18,0) << "exiting Segment::_preDestroy:" << endl;
cdebug.tabw(18,-1); cdebug_tabw(18,-1);
} }
void Segment::_toJson(JsonWriter* writer) const void Segment::_toJson(JsonWriter* writer) const

2
hurricane/src/hurricane/Signature.cpp
View File

@ -107,7 +107,7 @@ namespace Hurricane {
void JsonSignature::toData ( JsonStack& stack ) void JsonSignature::toData ( JsonStack& stack )
{ {
cdebug.log(19) << (void*)this << " _subTypeName:" << _subTypeName << endl; cdebug_log(19,0) << (void*)this << " _subTypeName:" << _subTypeName << endl;
check( stack, "JsonSignature::toData" ); check( stack, "JsonSignature::toData" );

6
hurricane/src/hurricane/Technology.cpp
View File

@ -640,7 +640,7 @@ JsonTechnology::JsonTechnology(unsigned long flags)
{ {
if (flags & JsonWriter::RegisterMode) return; if (flags & JsonWriter::RegisterMode) return;
cdebug.log(19) << "JsonTechnology::JsonTechnology()" << endl; cdebug_log(19,0) << "JsonTechnology::JsonTechnology()" << endl;
add( "_name" , typeid(string) ); add( "_name" , typeid(string) );
add( "+layers", typeid(JsonArray) ); add( "+layers", typeid(JsonArray) );
@ -683,7 +683,7 @@ void JsonTechnology::addBlockageRef(const string& blockageLayer, BasicLayer* lay
void JsonTechnology::toData(JsonStack& stack) void JsonTechnology::toData(JsonStack& stack)
// ****************************************** // ******************************************
{ {
cdebug.tabw(19,1); cdebug_tabw(19,1);
check( stack, "JsonTechnology::toData" ); check( stack, "JsonTechnology::toData" );
@ -708,7 +708,7 @@ void JsonTechnology::toData(JsonStack& stack)
update( stack, techno ); update( stack, techno );
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
} }
} // End of Hurricane namespace. } // End of Hurricane namespace.

6
hurricane/src/hurricane/TransistorLayer.cpp
View File

@ -258,7 +258,7 @@ namespace Hurricane {
{ {
if (flags & JsonWriter::RegisterMode) return; if (flags & JsonWriter::RegisterMode) return;
cdebug.log(19) << "JsonTransistorLayer::JsonTransistorLayer()" << endl; cdebug_log(19,0) << "JsonTransistorLayer::JsonTransistorLayer()" << endl;
add( "_gate" , typeid(string) ); add( "_gate" , typeid(string) );
add( "_active" , typeid(string) ); add( "_active" , typeid(string) );
@ -289,7 +289,7 @@ namespace Hurricane {
void JsonTransistorLayer::toData ( JsonStack& stack ) void JsonTransistorLayer::toData ( JsonStack& stack )
{ {
cdebug.tabw(19,1); cdebug_tabw(19,1);
check( stack, "JsonTransistorLayer::toData" ); check( stack, "JsonTransistorLayer::toData" );
@ -374,7 +374,7 @@ namespace Hurricane {
update( stack, layer ); update( stack, layer );
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
} }

16
hurricane/src/hurricane/UpdateSession.cpp
View File

@ -147,7 +147,7 @@ void UpdateSession::onNotOwned()
void Go::invalidate(bool propagateFlag) void Go::invalidate(bool propagateFlag)
// ************************************ // ************************************
{ {
cdebug.log(18,1) << "Go::invalidate(" << this << ")" << endl; cdebug_log(18,1) << "Go::invalidate(" << this << ")" << endl;
if (not UPDATOR_STACK or UPDATOR_STACK->empty()) if (not UPDATOR_STACK or UPDATOR_STACK->empty())
throw Error( "Can't invalidate go: empty update session stack" ); throw Error( "Can't invalidate go: empty update session stack" );
@ -184,30 +184,30 @@ void Go::invalidate(bool propagateFlag)
} }
} }
cdebug.log(18) << "Go::invalidate(" << this << ") - Completed." << endl; cdebug_log(18,0) << "Go::invalidate(" << this << ") - Completed." << endl;
cdebug.tabw(18,-1); cdebug_tabw(18,-1);
} }
void UpdateSession::open() void UpdateSession::open()
// *********************** // ***********************
{ {
cdebug.log(18,1) << "UpdateSession::open()" << endl; cdebug_log(18,1) << "UpdateSession::open()" << endl;
UpdateSession::_create(); UpdateSession::_create();
} }
void UpdateSession::close() void UpdateSession::close()
// ************************ // ************************
{ {
cdebug.tabw(18,-1); cdebug_tabw(18,-1);
cdebug.log(18,1) << "UpdateSession::close() - Start materialization." << endl; cdebug_log(18,1) << "UpdateSession::close() - Start materialization." << endl;
if (!UPDATOR_STACK || UPDATOR_STACK->empty()) if (!UPDATOR_STACK || UPDATOR_STACK->empty())
throw Error("Can't end update : empty update session stack"); throw Error("Can't end update : empty update session stack");
UPDATOR_STACK->top()->_destroy(); UPDATOR_STACK->top()->_destroy();
cdebug.tabw(18,-1); cdebug_tabw(18,-1);
cdebug.log(18) << "UpdateSession::close() - Materialization completed." << endl; cdebug_log(18,0) << "UpdateSession::close() - Materialization completed." << endl;
} }

6
hurricane/src/hurricane/ViaLayer.cpp
View File

@ -230,7 +230,7 @@ namespace Hurricane {
{ {
if (flags & JsonWriter::RegisterMode) return; if (flags & JsonWriter::RegisterMode) return;
cdebug.log(19) << "JsonViaLayer::JsonViaLayer()" << endl; cdebug_log(19,0) << "JsonViaLayer::JsonViaLayer()" << endl;
add( "_bottom" , typeid(string) ); add( "_bottom" , typeid(string) );
add( "_cut" , typeid(string) ); add( "_cut" , typeid(string) );
@ -255,7 +255,7 @@ namespace Hurricane {
void JsonViaLayer::toData(JsonStack& stack) void JsonViaLayer::toData(JsonStack& stack)
{ {
cdebug.tabw(19,1); cdebug_tabw(19,1);
check( stack, "JsonViaLayer::toData" ); check( stack, "JsonViaLayer::toData" );
@ -326,7 +326,7 @@ namespace Hurricane {
update( stack, layer ); update( stack, layer );
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
} }

28
hurricane/src/hurricane/grenier/json/JsonReader.cpp
View File

@ -176,7 +176,7 @@ namespace {
_objects[_objects.size()-1]->setName( _objectName ); _objects[_objects.size()-1]->setName( _objectName );
} }
cdebug.log(19) << "HurricaneHandler::String() [key/typename] " << value << endl; cdebug_log(19,0) << "HurricaneHandler::String() [key/typename] " << value << endl;
return true; return true;
} }
@ -201,13 +201,13 @@ namespace {
return true; return true;
} }
//cdebug.log(19) << "HurricaneHandler::Key() key:" << _key << " _objects.size():" << _objects.size() << endl; //cdebug_log(19,0) << "HurricaneHandler::Key() key:" << _key << " _objects.size():" << _objects.size() << endl;
if (_objects.back()) { if (_objects.back()) {
if ( doCallToData() and not _key.empty() and (_key[0] != '_') ) { if ( doCallToData() and not _key.empty() and (_key[0] != '_') ) {
// The key is no longer a simple attribute of the object. // The key is no longer a simple attribute of the object.
// Triggers it's creation in the Json stack. // Triggers it's creation in the Json stack.
cdebug.log(19) << "HurricaneHandler::key() Calling " cdebug_log(19,0) << "HurricaneHandler::key() Calling "
<< _objects.back()->getTypeName() << "::toData(JsonStack&)." << endl; << _objects.back()->getTypeName() << "::toData(JsonStack&)." << endl;
_objects.back()->toData( _stack ); _objects.back()->toData( _stack );
} }
@ -219,17 +219,17 @@ namespace {
bool HurricaneHandler::StartObject () bool HurricaneHandler::StartObject ()
{ {
cdebug.log(19) << "Hurricane::StartObject()" << endl; cdebug_log(19,0) << "Hurricane::StartObject()" << endl;
ltracein(50); ltracein(50);
_state |= TypenameKey; _state |= TypenameKey;
// if (doCallToData()) { // if (doCallToData()) {
// cdebug.log(19) << "Calling " << _objects.back()->getTypeName() << "::toData(JsonStack&)." << endl; // cdebug_log(19,0) << "Calling " << _objects.back()->getTypeName() << "::toData(JsonStack&)." << endl;
// _objects.back()->toData( _stack ); // _objects.back()->toData( _stack );
// } // }
_objectName = (_key == ".Array") ? "" : _key; _objectName = (_key == ".Array") ? "" : _key;
_objects.push_back( NULL ); _objects.push_back( NULL );
cdebug.log(19) << "_objects.push_back(NULL), size():" << _objects.size() << "." << endl; cdebug_log(19,0) << "_objects.push_back(NULL), size():" << _objects.size() << "." << endl;
ltracein(50); ltracein(50);
return true; return true;
@ -239,7 +239,7 @@ namespace {
bool HurricaneHandler::EndObject ( SizeType ) bool HurricaneHandler::EndObject ( SizeType )
{ {
ltraceout(50,2); ltraceout(50,2);
cdebug.log(19) << "HurricaneHandler::EndObject()" << endl; cdebug_log(19,0) << "HurricaneHandler::EndObject()" << endl;
ltracein(50); ltracein(50);
_objectName.clear(); _objectName.clear();
@ -247,11 +247,11 @@ namespace {
_state &= ~SkipObject; _state &= ~SkipObject;
} else { } else {
if (doCallToData()) { if (doCallToData()) {
cdebug.log(19) << "Calling " << _objects.back()->getTypeName() << "::toData(JsonStack&)." << endl; cdebug_log(19,0) << "Calling " << _objects.back()->getTypeName() << "::toData(JsonStack&)." << endl;
_objects.back()->toData( _stack ); _objects.back()->toData( _stack );
} }
if (_objects.size() > 1) { if (_objects.size() > 1) {
cdebug.log(19) << "_objects.pop_back(), size():" << _objects.size() << "." << endl; cdebug_log(19,0) << "_objects.pop_back(), size():" << _objects.size() << "." << endl;
delete _objects.back(); delete _objects.back();
_objects.pop_back(); _objects.pop_back();
} }
@ -259,14 +259,14 @@ namespace {
if (_stack[-1].first[0] != '_') _stack.pop_back(); if (_stack[-1].first[0] != '_') _stack.pop_back();
} }
} }
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
return true; return true;
} }
bool HurricaneHandler::StartArray() bool HurricaneHandler::StartArray()
{ {
cdebug.log(19) << "HurricaneHandler::StartArray() key:\"" << _key << "\"." << endl; cdebug_log(19,0) << "HurricaneHandler::StartArray() key:\"" << _key << "\"." << endl;
ltracein(50); ltracein(50);
_objectName.clear(); _objectName.clear();
@ -285,14 +285,14 @@ namespace {
bool HurricaneHandler::EndArray ( SizeType ) bool HurricaneHandler::EndArray ( SizeType )
{ {
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
cdebug.log(19) << "HurricaneHandler::EndArray()" << endl; cdebug_log(19,0) << "HurricaneHandler::EndArray()" << endl;
ltracein(50); ltracein(50);
_state &= ~(ArrayMode | SkipArray); _state &= ~(ArrayMode | SkipArray);
_key.clear(); _key.clear();
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
return true; return true;
} }

10
hurricane/src/hurricane/grenier/json/JsonReader.h
View File

@ -655,7 +655,7 @@ namespace Hurricane {
{ } { }
template<typename T> inline void JsonStack::push_back ( const std::string& key, T t ) { template<typename T> inline void JsonStack::push_back ( const std::string& key, T t ) {
cdebug.log(19) << "JsonStack::push_back() key:" << key << " t:" << t cdebug_log(19,0) << "JsonStack::push_back() key:" << key << " t:" << t
<< " (" << demangle(typeid(T)) << ")." << endl; << " (" << demangle(typeid(T)) << ")." << endl;
_stack.push_back(std::make_pair(key,boost::any(t))); _stack.push_back(std::make_pair(key,boost::any(t)));
} }
@ -667,7 +667,7 @@ namespace Hurricane {
<< (count+1) << " elements remains to pop." << std::endl; << (count+1) << " elements remains to pop." << std::endl;
break; break;
} }
cdebug.log(19) << "| _stack.pop_back() " << _stack.back().first << endl; cdebug_log(19,0) << "| _stack.pop_back() " << _stack.back().first << endl;
_stack.pop_back(); _stack.pop_back();
} }
} }
@ -685,7 +685,7 @@ namespace Hurricane {
int i = _stack.size()-1; int i = _stack.size()-1;
do { do {
if (_stack[i].first == key) { if (_stack[i].first == key) {
cdebug.log(19) << "JsonStack::rhas(): key \"" << key << "\" found at index:" cdebug_log(19,0) << "JsonStack::rhas(): key \"" << key << "\" found at index:"
<< (i-(int)_stack.size()) << " (i:" << i << ")." << endl; << (i-(int)_stack.size()) << " (i:" << i << ")." << endl;
return i-(int)_stack.size(); return i-(int)_stack.size();
} }
@ -693,7 +693,7 @@ namespace Hurricane {
--i; --i;
} while ( true ); } while ( true );
cdebug.log(19) << "JsonStack::rhas(): key \"" << key << "\" not found (returning index: 0)." << endl; cdebug_log(19,0) << "JsonStack::rhas(): key \"" << key << "\" not found (returning index: 0)." << endl;
return 0; return 0;
} }
@ -703,7 +703,7 @@ namespace Hurricane {
int i = _stack.size()-1; int i = _stack.size()-1;
do { do {
if (_stack[i].first == key) { if (_stack[i].first == key) {
cdebug.log(19) << "JsonStack::as<T>() k:" << key cdebug_log(19,0) << "JsonStack::as<T>() k:" << key
<< " t:" << _stack[i].second.type().name() << std::endl; << " t:" << _stack[i].second.type().name() << std::endl;
return boost::any_cast<T>( _stack[i].second ); return boost::any_cast<T>( _stack[i].second );
} }

2
hurricane/src/hurricane/grenier/json/Net.cpp
View File

@ -1095,7 +1095,7 @@ void JsonNet::toData(JsonStack& stack)
update( stack, net ); update( stack, net );
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
} }
} // End of Hurricane namespace. } // End of Hurricane namespace.

6
hurricane/src/hurricane/hurricane/Collection.h
View File

@ -1107,16 +1107,16 @@ template<typename Type>
inline void jsonWrite ( JsonWriter* w, const std::string& key, Hurricane::GenericCollection<Type> collection ) inline void jsonWrite ( JsonWriter* w, const std::string& key, Hurricane::GenericCollection<Type> collection )
{ {
if (cdebug.enabled(19)) if (cdebug.enabled(19))
cdebug.log(19) << "jsonWrite< GenericCollection<" << Hurricane::demangle(typeid(Type).name()) cdebug_log(19,0) << "jsonWrite< GenericCollection<" << Hurricane::demangle(typeid(Type).name())
<< "> >(w,key,coll)" << " key:\"" << key << "\"" << std::endl; << "> >(w,key,coll)" << " key:\"" << key << "\"" << std::endl;
cdebug.tabw(19,1); cdebug_tabw(19,1);
w->key( key ); w->key( key );
w->startArray(); w->startArray();
for ( Type element : collection ) jsonWrite( w, element ); for ( Type element : collection ) jsonWrite( w, element );
w->endArray(); w->endArray();
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
} }

4
hurricane/src/hurricane/hurricane/Commons.h
View File

@ -815,6 +815,10 @@ inline tstream& operator<< ( tstream& o, const std::string& s )
extern tstream cdebug; extern tstream cdebug;
#define cdebug_log(level,indent) if (cdebug.enabled(level)) cdebug.log(level,indent)
#define cdebug_tabw(level,indent) cdebug.tabw(level,indent)
// x-----------------------------------------------------------------x // x-----------------------------------------------------------------x
// | Classes Neededs in All Hurricane Modules | // | Classes Neededs in All Hurricane Modules |
// x-----------------------------------------------------------------x // x-----------------------------------------------------------------x

12
hurricane/src/hurricane/hurricane/JsonObject.h
View File

@ -284,7 +284,7 @@ namespace Hurricane {
template<typename T> inline void JsonStack::push_back ( const std::string& key, T t ) template<typename T> inline void JsonStack::push_back ( const std::string& key, T t )
{ {
cdebug.log(19) << "JsonStack::push_back(T) key:" << key << " value:" << t cdebug_log(19,0) << "JsonStack::push_back(T) key:" << key << " value:" << t
<< " (" << demangle(typeid(T)) << ")." << endl; << " (" << demangle(typeid(T)) << ")." << endl;
_stack.push_back(std::make_pair(key,boost::any(t))); _stack.push_back(std::make_pair(key,boost::any(t)));
} }
@ -297,7 +297,7 @@ namespace Hurricane {
<< (count+1) << " elements remains to pop." << std::endl; << (count+1) << " elements remains to pop." << std::endl;
break; break;
} }
cdebug.log(19) << "| _stack.pop_back() \"" << _stack.back().first cdebug_log(19,0) << "| _stack.pop_back() \"" << _stack.back().first
<< "\", size:" << _stack.size() << ", dbos:" << _dbos.size() << endl; << "\", size:" << _stack.size() << ", dbos:" << _dbos.size() << endl;
_stack.pop_back(); _stack.pop_back();
} }
@ -316,7 +316,7 @@ namespace Hurricane {
int i = _stack.size()-1; int i = _stack.size()-1;
do { do {
if (_stack[i].first == key) { if (_stack[i].first == key) {
cdebug.log(19) << "JsonStack::rhas(): key \"" << key << "\" found at index:" cdebug_log(19,0) << "JsonStack::rhas(): key \"" << key << "\" found at index:"
<< (i-(int)_stack.size()) << " (i:" << i << ") " << (i-(int)_stack.size()) << " (i:" << i << ") "
<< "(" << demangle(_stack[i].second.type().name()) << ")." << "(" << demangle(_stack[i].second.type().name()) << ")."
<< endl; << endl;
@ -326,7 +326,7 @@ namespace Hurricane {
--i; --i;
} while ( true ); } while ( true );
cdebug.log(19) << "JsonStack::rhas(): key \"" << key << "\" not found (returning index: 0)." << endl; cdebug_log(19,0) << "JsonStack::rhas(): key \"" << key << "\" not found (returning index: 0)." << endl;
return 0; return 0;
} }
@ -336,7 +336,7 @@ namespace Hurricane {
int i = _stack.size()-1; int i = _stack.size()-1;
do { do {
if (_stack[i].first == key) { if (_stack[i].first == key) {
cdebug.log(19) << "JsonStack::as<T>() k:" << key cdebug_log(19,0) << "JsonStack::as<T>() k:" << key
<< " value:" << demangle(_stack[i].second.type().name()) << std::endl; << " value:" << demangle(_stack[i].second.type().name()) << std::endl;
return boost::any_cast<T>( _stack[i].second ); return boost::any_cast<T>( _stack[i].second );
} }
@ -405,7 +405,7 @@ namespace Hurricane {
template<typename T> template<typename T>
inline void JsonObject::update ( JsonStack& stack, T hobject ) inline void JsonObject::update ( JsonStack& stack, T hobject )
{ {
cdebug.log(19) << "JsonObject::update<T>()" << endl; cdebug_log(19,0) << "JsonObject::update<T>()" << endl;
stack.pop_back( _attributes.size() ); stack.pop_back( _attributes.size() );
stack.push_back<T>( getStackName(), hobject ); stack.push_back<T>( getStackName(), hobject );
setObject<T>( hobject ); setObject<T>( hobject );

16
hurricane/src/hurricane/hurricane/JsonWriter.h
View File

@ -221,12 +221,12 @@ inline void jsonWrite ( JsonWriter* w, const std::string& key, const C& )
template<typename C> template<typename C>
inline void jsonWrite ( JsonWriter* w, const C* object ) inline void jsonWrite ( JsonWriter* w, const C* object )
{ {
cdebug.log(19,1) << "jsonWrite<" << Hurricane::demangle(typeid(C).name()) << "*>(w,object)" << std::endl; cdebug_log(19,1) << "jsonWrite<" << Hurricane::demangle(typeid(C).name()) << "*>(w,object)" << std::endl;
if (object) object->toJson( w ); if (object) object->toJson( w );
else jsonWrite(w); else jsonWrite(w);
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
} }
@ -240,21 +240,21 @@ inline void jsonWrite ( JsonWriter* w, const std::string& key, C* object )
template<typename C> template<typename C>
inline void jsonWrite ( JsonWriter* w, const std::string& key, const C* object ) inline void jsonWrite ( JsonWriter* w, const std::string& key, const C* object )
{ {
cdebug.log(19,1) << "jsonWrite<" << Hurricane::demangle(typeid(C).name()) << "*>(w,key,object)" cdebug_log(19,1) << "jsonWrite<" << Hurricane::demangle(typeid(C).name()) << "*>(w,key,object)"
<< " key:\"" << key << "\"" << std::endl; << " key:\"" << key << "\"" << std::endl;
w->key( key ); w->key( key );
if (object) jsonWrite( w, object ); if (object) jsonWrite( w, object );
else jsonWrite(w); else jsonWrite(w);
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
} }
template<typename Element> template<typename Element>
inline void jsonWrite ( JsonWriter* w, const std::string& key, const std::vector<Element>& v ) inline void jsonWrite ( JsonWriter* w, const std::string& key, const std::vector<Element>& v )
{ {
cdebug.log(19,1) << "jsonWrite< vector<" << Hurricane::demangle(typeid(Element).name()) cdebug_log(19,1) << "jsonWrite< vector<" << Hurricane::demangle(typeid(Element).name())
<< "> >(w,key,v)" << " key:\"" << key << "\"" << std::endl; << "> >(w,key,v)" << " key:\"" << key << "\"" << std::endl;
w->key( key ); w->key( key );
@ -262,7 +262,7 @@ inline void jsonWrite ( JsonWriter* w, const std::string& key, const std::vecto
for ( Element element : v ) jsonWrite( w, element ); for ( Element element : v ) jsonWrite( w, element );
w->endArray(); w->endArray();
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
} }
@ -271,7 +271,7 @@ inline void jsonWrite ( JsonWriter* w
, const std::string& key , const std::string& key
, const std::map<Key,Element,Compare,Allocator>& m ) , const std::map<Key,Element,Compare,Allocator>& m )
{ {
cdebug.log(19,1) << "jsonWrite< map<" cdebug_log(19,1) << "jsonWrite< map<"
<< Hurricane::demangle(typeid(Key ).name()) << "," << Hurricane::demangle(typeid(Key ).name()) << ","
<< Hurricane::demangle(typeid(Element).name()) << "," << Hurricane::demangle(typeid(Element).name()) << ","
<< Hurricane::demangle(typeid(Compare).name()) << Hurricane::demangle(typeid(Compare).name())
@ -282,7 +282,7 @@ inline void jsonWrite ( JsonWriter* w
for ( auto mapElement : m ) jsonWrite( w, mapElement.second ); for ( auto mapElement : m ) jsonWrite( w, mapElement.second );
w->endArray(); w->endArray();
cdebug.tabw(19,-1); cdebug_tabw(19,-1);
} }

4
hurricane/src/isobar/ProxyProperty.cpp
View File

@ -80,12 +80,12 @@ ProxyProperty* ProxyProperty::create ( void* shadow ) {
void ProxyProperty::_preDestroy () { void ProxyProperty::_preDestroy () {
if ( _owner ) _owner->_onDestroyed ( this ); if ( _owner ) _owner->_onDestroyed ( this );
cdebug.log(20) << "ProxyProperty::_owner := " << hex << (void*)_owner << endl; cdebug_log(20,0) << "ProxyProperty::_owner := " << hex << (void*)_owner << endl;
if ( _offset > 0 ) { if ( _offset > 0 ) {
void** shadowMember = ( (void**)( (unsigned long)_shadow + _offset ) ); void** shadowMember = ( (void**)( (unsigned long)_shadow + _offset ) );
cdebug.log(20) << "ProxyProperty::_shadowMember := " << hex << *shadowMember << endl; cdebug_log(20,0) << "ProxyProperty::_shadowMember := " << hex << *shadowMember << endl;
*shadowMember = NULL; *shadowMember = NULL;
} }

4
hurricane/src/isobar/PyBasicLayer.cpp
View File

@ -47,7 +47,7 @@ extern "C" {
static PyObject* PyBasicLayer_create ( PyObject*, PyObject* args ) static PyObject* PyBasicLayer_create ( PyObject*, PyObject* args )
{ {
cdebug.log(20) << "PyBasicLayer_create()" << endl; cdebug_log(20,0) << "PyBasicLayer_create()" << endl;
BasicLayer* basicLayer = NULL; BasicLayer* basicLayer = NULL;
@ -96,7 +96,7 @@ extern "C" {
static PyObject* PyBasicLayer_getMaterial ( PyBasicLayer *self ) static PyObject* PyBasicLayer_getMaterial ( PyBasicLayer *self )
{ {
cdebug.log(20) << "PyBasicLayer_getMaterial ()" << endl; cdebug_log(20,0) << "PyBasicLayer_getMaterial ()" << endl;
METHOD_HEAD ( "BasicLayer.getMaterial()" ) METHOD_HEAD ( "BasicLayer.getMaterial()" )
BasicLayer::Material* material = NULL; BasicLayer::Material* material = NULL;

24
hurricane/src/isobar/PyBox.cpp
View File

@ -62,7 +62,7 @@ extern "C" {
// Class Method : "PyBox_NEW ()" // Class Method : "PyBox_NEW ()"
static PyObject* PyBox_NEW (PyObject *module, PyObject *args) { static PyObject* PyBox_NEW (PyObject *module, PyObject *args) {
cdebug.log(20) << "PyBox_NEW()" << endl; cdebug_log(20,0) << "PyBox_NEW()" << endl;
Box* box = NULL; Box* box = NULL;
PyBox* pyBox = NULL; PyBox* pyBox = NULL;
@ -106,13 +106,13 @@ extern "C" {
static int PyBox_Init ( PyBox* self, PyObject* args, PyObject* kwargs ) static int PyBox_Init ( PyBox* self, PyObject* args, PyObject* kwargs )
{ {
cdebug.log(20) << "PyBox_Init(): " << (void*)self << endl; cdebug_log(20,0) << "PyBox_Init(): " << (void*)self << endl;
return 0; return 0;
} }
static PyObject* PyBox_getCenter ( PyBox *self ) { static PyObject* PyBox_getCenter ( PyBox *self ) {
cdebug.log(20) << "PyBox_getCenter()" << endl; cdebug_log(20,0) << "PyBox_getCenter()" << endl;
METHOD_HEAD ( "Box.Center()" ) METHOD_HEAD ( "Box.Center()" )
@ -128,7 +128,7 @@ extern "C" {
static PyObject* PyBox_getUnion ( PyBox *self, PyObject* args ) { static PyObject* PyBox_getUnion ( PyBox *self, PyObject* args ) {
cdebug.log(20) << "PyBox_getUnion()" << endl; cdebug_log(20,0) << "PyBox_getUnion()" << endl;
METHOD_HEAD ( "Box.getUnion()" ) METHOD_HEAD ( "Box.getUnion()" )
@ -154,7 +154,7 @@ extern "C" {
// Attribute Method : "PyBox_getIntersection ()" // Attribute Method : "PyBox_getIntersection ()"
static PyObject* PyBox_getIntersection ( PyBox *self, PyObject* args ) { static PyObject* PyBox_getIntersection ( PyBox *self, PyObject* args ) {
cdebug.log(20) << "PyBox_getIntersection()" << endl; cdebug_log(20,0) << "PyBox_getIntersection()" << endl;
METHOD_HEAD ( "Box.getIntersection()" ) METHOD_HEAD ( "Box.getIntersection()" )
@ -179,7 +179,7 @@ extern "C" {
// Attribute Method : "PyBox_contains ()" // Attribute Method : "PyBox_contains ()"
static PyObject* PyBox_contains ( PyBox *self, PyObject* args ) { static PyObject* PyBox_contains ( PyBox *self, PyObject* args ) {
cdebug.log(20) << "PyBox_contains ()" << endl; cdebug_log(20,0) << "PyBox_contains ()" << endl;
METHOD_HEAD ( "Box.contains()" ) METHOD_HEAD ( "Box.contains()" )
@ -214,7 +214,7 @@ extern "C" {
// Attribute Method : "PyBox_intersect ()" // Attribute Method : "PyBox_intersect ()"
static PyObject* PyBox_intersect ( PyBox *self, PyObject* args ) { static PyObject* PyBox_intersect ( PyBox *self, PyObject* args ) {
cdebug.log(20) << "PyBox_intersect ()" << endl; cdebug_log(20,0) << "PyBox_intersect ()" << endl;
bool result = false; bool result = false;
HTRY HTRY
@ -244,7 +244,7 @@ extern "C" {
// Attribute Method : "PyBox_isConstrainedBy ()" // Attribute Method : "PyBox_isConstrainedBy ()"
static PyObject* PyBox_isConstrainedBy ( PyBox *self, PyObject* args ) { static PyObject* PyBox_isConstrainedBy ( PyBox *self, PyObject* args ) {
cdebug.log(20) << "PyBox_isConstrainedBy ()" << endl; cdebug_log(20,0) << "PyBox_isConstrainedBy ()" << endl;
bool result = false; bool result = false;
HTRY HTRY
@ -273,7 +273,7 @@ extern "C" {
// Attribute Method : "PyBox_makeEmpty ()" // Attribute Method : "PyBox_makeEmpty ()"
static PyObject* PyBox_makeEmpty ( PyBox *self, PyObject* args ) { static PyObject* PyBox_makeEmpty ( PyBox *self, PyObject* args ) {
cdebug.log(20) << "PyBox_makeEmpty ()" << endl; cdebug_log(20,0) << "PyBox_makeEmpty ()" << endl;
HTRY HTRY
METHOD_HEAD ( "Box.makeEmpty()" ) METHOD_HEAD ( "Box.makeEmpty()" )
@ -289,7 +289,7 @@ extern "C" {
// Attribute Method : "PyBox_inflate ()" // Attribute Method : "PyBox_inflate ()"
static PyObject* PyBox_inflate ( PyBox *self, PyObject* args ) { static PyObject* PyBox_inflate ( PyBox *self, PyObject* args ) {
cdebug.log(20) << "PyBox_inflate ()" << endl; cdebug_log(20,0) << "PyBox_inflate ()" << endl;
METHOD_HEAD ( "Box.inflate()" ) METHOD_HEAD ( "Box.inflate()" )
@ -326,7 +326,7 @@ extern "C" {
// Attribute Method : "PyBox_merge ()" // Attribute Method : "PyBox_merge ()"
static PyObject* PyBox_merge ( PyBox *self, PyObject* args ) { static PyObject* PyBox_merge ( PyBox *self, PyObject* args ) {
cdebug.log(20) << "Box_merge()" << endl; cdebug_log(20,0) << "Box_merge()" << endl;
METHOD_HEAD ( "Box.merge()" ) METHOD_HEAD ( "Box.merge()" )
@ -364,7 +364,7 @@ extern "C" {
// Attribute Method : "PyBox_translate ()" // Attribute Method : "PyBox_translate ()"
static PyObject* PyBox_translate ( PyBox *self, PyObject* args ) { static PyObject* PyBox_translate ( PyBox *self, PyObject* args ) {
cdebug.log(20) << "PyBox_translate ()" << endl; cdebug_log(20,0) << "PyBox_translate ()" << endl;
HTRY HTRY
METHOD_HEAD ( "Box.translate()" ) METHOD_HEAD ( "Box.translate()" )

10
hurricane/src/isobar/PyBreakpoint.cpp
View File

@ -44,13 +44,13 @@ extern "C" {
static void PyBreakpoint_DeAlloc ( PyBreakpoint* self ) static void PyBreakpoint_DeAlloc ( PyBreakpoint* self )
{ {
cdebug.log(20) << "PySingletonObject_DeAlloc(" << hex << self << ")" << endl; cdebug_log(20,0) << "PySingletonObject_DeAlloc(" << hex << self << ")" << endl;
} }
static PyObject* PyBreakpoint_stop ( PyObject*, PyObject *args ) static PyObject* PyBreakpoint_stop ( PyObject*, PyObject *args )
{ {
cdebug.log(20) << "PyBreakpoint_stop()" << endl; cdebug_log(20,0) << "PyBreakpoint_stop()" << endl;
bool result = false; bool result = false;
@ -71,7 +71,7 @@ extern "C" {
static PyObject* PyBreakpoint_setStopLevel ( PyObject*, PyObject* args ) static PyObject* PyBreakpoint_setStopLevel ( PyObject*, PyObject* args )
{ {
cdebug.log(20) << "PyBreakpoint_setStopLevel()" << endl; cdebug_log(20,0) << "PyBreakpoint_setStopLevel()" << endl;
HTRY HTRY
@ -89,7 +89,7 @@ extern "C" {
static PyObject* PyBreakpoint_getStopLevel ( PyObject* ) static PyObject* PyBreakpoint_getStopLevel ( PyObject* )
{ {
cdebug.log(20) << "PyBreakpoint_getStopLevel()" << endl; cdebug_log(20,0) << "PyBreakpoint_getStopLevel()" << endl;
return Py_BuildValue ( "i", Breakpoint::getStopLevel() ); return Py_BuildValue ( "i", Breakpoint::getStopLevel() );
@ -112,7 +112,7 @@ extern "C" {
// extern void PyBreakpoint_LinkPyType() // extern void PyBreakpoint_LinkPyType()
// { // {
// cdebug.log(20) << "PyBreakpoint_LinkType()" << endl; // cdebug_log(20,0) << "PyBreakpoint_LinkType()" << endl;
// PyTypeBreakpoint.tp_new = (newfunc) PyType_GenericNew; // PyTypeBreakpoint.tp_new = (newfunc) PyType_GenericNew;
// PyTypeBreakpoint.tp_dealloc = (destructor)PyBreakpoint_DeAlloc; // PyTypeBreakpoint.tp_dealloc = (destructor)PyBreakpoint_DeAlloc;

52
hurricane/src/isobar/PyCell.cpp
View File

@ -65,7 +65,7 @@ extern "C" {
// Attribute Method : "PyCell_create ()" // Attribute Method : "PyCell_create ()"
PyObject* PyCell_create ( PyObject*, PyObject *args ) { PyObject* PyCell_create ( PyObject*, PyObject *args ) {
cdebug.log(20) << "PyCell_create()" << endl; cdebug_log(20,0) << "PyCell_create()" << endl;
char* name = NULL; char* name = NULL;
PyLibrary* pyLibrary = NULL; PyLibrary* pyLibrary = NULL;
@ -88,7 +88,7 @@ extern "C" {
// Attribute Method : "PyCell_getLibrary ()" // Attribute Method : "PyCell_getLibrary ()"
static PyObject* PyCell_getLibrary ( PyCell *self ) { static PyObject* PyCell_getLibrary ( PyCell *self ) {
cdebug.log(20) << "PyCell_getLibrary ()" << endl; cdebug_log(20,0) << "PyCell_getLibrary ()" << endl;
Library* library = NULL; Library* library = NULL;
@ -110,7 +110,7 @@ extern "C" {
// Attribute Method : "PyCell_getInstance ()" // Attribute Method : "PyCell_getInstance ()"
static PyObject* PyCell_getInstance ( PyCell *self, PyObject* args ) { static PyObject* PyCell_getInstance ( PyCell *self, PyObject* args ) {
cdebug.log(20) << "PyCell_getInstance ()" << endl; cdebug_log(20,0) << "PyCell_getInstance ()" << endl;
METHOD_HEAD("Cell.getInstance()") METHOD_HEAD("Cell.getInstance()")
Instance* instance = NULL; Instance* instance = NULL;
@ -133,7 +133,7 @@ extern "C" {
// Attribute Method : "PyCell_getInstances()" // Attribute Method : "PyCell_getInstances()"
static PyObject* PyCell_getInstances( PyCell *self ) { static PyObject* PyCell_getInstances( PyCell *self ) {
cdebug.log(20) << "PyCell_getInstances()" << endl; cdebug_log(20,0) << "PyCell_getInstances()" << endl;
METHOD_HEAD ( "Cell.getInstances()" ) METHOD_HEAD ( "Cell.getInstances()" )
@ -158,7 +158,7 @@ extern "C" {
// Attribute Method : "PyCell_getInstancesUnder()" // Attribute Method : "PyCell_getInstancesUnder()"
static PyObject* PyCell_getInstancesUnder(PyCell *self, PyObject* args) { static PyObject* PyCell_getInstancesUnder(PyCell *self, PyObject* args) {
cdebug.log(20) << "PyCell_getInstancesUnder()" << endl; cdebug_log(20,0) << "PyCell_getInstancesUnder()" << endl;
METHOD_HEAD("Cell.getInstancesUnder()") METHOD_HEAD("Cell.getInstancesUnder()")
@ -188,7 +188,7 @@ extern "C" {
// Attribute Method : "PyCell_getSlaveInstances()" // Attribute Method : "PyCell_getSlaveInstances()"
static PyObject* PyCell_getSlaveInstances(PyCell *self) { static PyObject* PyCell_getSlaveInstances(PyCell *self) {
cdebug.log(20) << "PyCell_getSlaveInstances()" << endl; cdebug_log(20,0) << "PyCell_getSlaveInstances()" << endl;
METHOD_HEAD("Cell.getSlaveInstances()") METHOD_HEAD("Cell.getSlaveInstances()")
@ -213,7 +213,7 @@ extern "C" {
// Attribute Method : "PyCell_getComponents()" // Attribute Method : "PyCell_getComponents()"
static PyObject* PyCell_getComponents(PyCell *self) { static PyObject* PyCell_getComponents(PyCell *self) {
cdebug.log(20) << "PyCell_getComponents()" << endl; cdebug_log(20,0) << "PyCell_getComponents()" << endl;
METHOD_HEAD("Cell.getComponents()") METHOD_HEAD("Cell.getComponents()")
@ -239,7 +239,7 @@ extern "C" {
// Attribute Method : "PyCell_getComponentsUnder()" // Attribute Method : "PyCell_getComponentsUnder()"
static PyObject* PyCell_getComponentsUnder(PyCell *self, PyObject* args) { static PyObject* PyCell_getComponentsUnder(PyCell *self, PyObject* args) {
cdebug.log(20) << "PyCell_getComponentsUnder()" << endl; cdebug_log(20,0) << "PyCell_getComponentsUnder()" << endl;
METHOD_HEAD("Cell.getComponentsUnder()") METHOD_HEAD("Cell.getComponentsUnder()")
@ -268,7 +268,7 @@ extern "C" {
// Attribute Method : "PyCell_getOccurrences()" // Attribute Method : "PyCell_getOccurrences()"
static PyObject* PyCell_getOccurrences(PyCell *self) { static PyObject* PyCell_getOccurrences(PyCell *self) {
cdebug.log(20) << "PyCell_getOccurrences()" << endl; cdebug_log(20,0) << "PyCell_getOccurrences()" << endl;
METHOD_HEAD("Cell.getOccurrences()") METHOD_HEAD("Cell.getOccurrences()")
@ -294,7 +294,7 @@ extern "C" {
// Attribute Method : "PyCell_getOccurrencesUnder()" // Attribute Method : "PyCell_getOccurrencesUnder()"
static PyObject* PyCell_getOccurrencesUnder(PyCell *self, PyObject* args) { static PyObject* PyCell_getOccurrencesUnder(PyCell *self, PyObject* args) {
cdebug.log(20) << "PyCell_getOccurrencesUnder()" << endl; cdebug_log(20,0) << "PyCell_getOccurrencesUnder()" << endl;
METHOD_HEAD("Cell.getOccurrencesUnder()") METHOD_HEAD("Cell.getOccurrencesUnder()")
@ -323,7 +323,7 @@ extern "C" {
// Attribute Method : "PyCell_getLeafInstanceOccurrences()" // Attribute Method : "PyCell_getLeafInstanceOccurrences()"
static PyObject* PyCell_getLeafInstanceOccurrences(PyCell *self) { static PyObject* PyCell_getLeafInstanceOccurrences(PyCell *self) {
cdebug.log(20) << "PyCell_getLeafInstanceOccurrences()" << endl; cdebug_log(20,0) << "PyCell_getLeafInstanceOccurrences()" << endl;
METHOD_HEAD ( "Cell.getLeafInstanceOccurrences()" ) METHOD_HEAD ( "Cell.getLeafInstanceOccurrences()" )
@ -348,7 +348,7 @@ extern "C" {
// Attribute Method : "PyCell_getLeafInstanceOccurrencesUnder()" // Attribute Method : "PyCell_getLeafInstanceOccurrencesUnder()"
static PyObject* PyCell_getLeafInstanceOccurrencesUnder(PyCell *self, PyObject* args) { static PyObject* PyCell_getLeafInstanceOccurrencesUnder(PyCell *self, PyObject* args) {
cdebug.log(20) << "PyCell_getLeafInstanceOccurrencesUnder()" << endl; cdebug_log(20,0) << "PyCell_getLeafInstanceOccurrencesUnder()" << endl;
METHOD_HEAD ( "Cell.getLeafInstanceOccurrencesUnder()" ) METHOD_HEAD ( "Cell.getLeafInstanceOccurrencesUnder()" )
@ -378,7 +378,7 @@ extern "C" {
// Attribute Method : "PyCell_getReferences()" // Attribute Method : "PyCell_getReferences()"
static PyObject* PyCell_getReferences(PyCell *self) { static PyObject* PyCell_getReferences(PyCell *self) {
cdebug.log(20) << "PyCell_getReferences()" << endl; cdebug_log(20,0) << "PyCell_getReferences()" << endl;
METHOD_HEAD("Cell.getReferences()") METHOD_HEAD("Cell.getReferences()")
@ -403,7 +403,7 @@ extern "C" {
// Attribute Method : "PyCell_getHyperNets()" // Attribute Method : "PyCell_getHyperNets()"
static PyObject* PyCell_getHyperNets(PyCell *self) { static PyObject* PyCell_getHyperNets(PyCell *self) {
cdebug.log(20) << "PyCell_getHyperNets()" << endl; cdebug_log(20,0) << "PyCell_getHyperNets()" << endl;
METHOD_HEAD ( "Cell.getHyperNets()" ) METHOD_HEAD ( "Cell.getHyperNets()" )
@ -428,7 +428,7 @@ extern "C" {
// Attribute Method : "PyCell_getNet ()" // Attribute Method : "PyCell_getNet ()"
static PyObject* PyCell_getNet(PyCell *self, PyObject* args) { static PyObject* PyCell_getNet(PyCell *self, PyObject* args) {
cdebug.log(20) << "PyCell_getNet ()" << endl; cdebug_log(20,0) << "PyCell_getNet ()" << endl;
METHOD_HEAD ( "Cell.getNet()" ) METHOD_HEAD ( "Cell.getNet()" )
Net* net = NULL; Net* net = NULL;
@ -449,7 +449,7 @@ extern "C" {
// Attribute Method : "PyCell_getNets ()" // Attribute Method : "PyCell_getNets ()"
static PyObject* PyCell_getNets ( PyCell *self ) { static PyObject* PyCell_getNets ( PyCell *self ) {
cdebug.log(20) << "PyCell_getNets()" << endl; cdebug_log(20,0) << "PyCell_getNets()" << endl;
METHOD_HEAD("Cell.getNets()") METHOD_HEAD("Cell.getNets()")
@ -474,7 +474,7 @@ extern "C" {
// Attribute Method : "PyCell_getExternalNets()" // Attribute Method : "PyCell_getExternalNets()"
static PyObject* PyCell_getExternalNets(PyCell *self) { static PyObject* PyCell_getExternalNets(PyCell *self) {
cdebug.log(20) << "PyCell_getExternalNets()" << endl; cdebug_log(20,0) << "PyCell_getExternalNets()" << endl;
METHOD_HEAD("Cell.getExternalNets()") METHOD_HEAD("Cell.getExternalNets()")
@ -498,7 +498,7 @@ extern "C" {
// Attribute Method : "PyCell_getClockNets()" // Attribute Method : "PyCell_getClockNets()"
static PyObject* PyCell_getClockNets(PyCell *self) { static PyObject* PyCell_getClockNets(PyCell *self) {
cdebug.log(20) << "PyCell_getClockNets()" << endl; cdebug_log(20,0) << "PyCell_getClockNets()" << endl;
METHOD_HEAD("Cell.getClockNets") METHOD_HEAD("Cell.getClockNets")
@ -522,7 +522,7 @@ extern "C" {
// Attribute Method : "PyCell_getSupplyNets()" // Attribute Method : "PyCell_getSupplyNets()"
static PyObject* PyCell_getSupplyNets(PyCell *self) { static PyObject* PyCell_getSupplyNets(PyCell *self) {
cdebug.log(20) << "PyCell_getSupplyNets()" << endl; cdebug_log(20,0) << "PyCell_getSupplyNets()" << endl;
METHOD_HEAD ( "Cell.getSupplyNets()" ) METHOD_HEAD ( "Cell.getSupplyNets()" )
@ -547,7 +547,7 @@ extern "C" {
// Attribute Method : "PyCell_getPowerNets()" // Attribute Method : "PyCell_getPowerNets()"
static PyObject* PyCell_getPowerNets(PyCell *self) { static PyObject* PyCell_getPowerNets(PyCell *self) {
cdebug.log(20) << "PyCell_getPowerNets()" << endl; cdebug_log(20,0) << "PyCell_getPowerNets()" << endl;
METHOD_HEAD ( "Cell.getPowerNets()" ) METHOD_HEAD ( "Cell.getPowerNets()" )
@ -572,7 +572,7 @@ extern "C" {
// Attribute Method : "PyCell_getGroundNets()" // Attribute Method : "PyCell_getGroundNets()"
static PyObject* PyCell_getGroundNets(PyCell *self) { static PyObject* PyCell_getGroundNets(PyCell *self) {
cdebug.log(20) << "PyCell_getGroundNets()" << endl; cdebug_log(20,0) << "PyCell_getGroundNets()" << endl;
METHOD_HEAD ( "Cell.getGroundNets()" ) METHOD_HEAD ( "Cell.getGroundNets()" )
@ -596,7 +596,7 @@ extern "C" {
// Attribute Method : "PyCell_getAbutmentBox ()" // Attribute Method : "PyCell_getAbutmentBox ()"
static PyObject* PyCell_getAbutmentBox ( PyCell *self ) { static PyObject* PyCell_getAbutmentBox ( PyCell *self ) {
cdebug.log(20) << "PyCell_getAbutmentBox()" << endl; cdebug_log(20,0) << "PyCell_getAbutmentBox()" << endl;
METHOD_HEAD ( "Cell.getAbutmentBox()" ) METHOD_HEAD ( "Cell.getAbutmentBox()" )
@ -620,7 +620,7 @@ extern "C" {
// Attribute Method : "PyCell_setAbutmentBox ()" // Attribute Method : "PyCell_setAbutmentBox ()"
static PyObject* PyCell_setAbutmentBox ( PyCell *self, PyObject* args ) { static PyObject* PyCell_setAbutmentBox ( PyCell *self, PyObject* args ) {
cdebug.log(20) << "Cell.setAbutmentBox()" << endl; cdebug_log(20,0) << "Cell.setAbutmentBox()" << endl;
HTRY HTRY
METHOD_HEAD ( "Cell.setAbutmentBox()" ) METHOD_HEAD ( "Cell.setAbutmentBox()" )
@ -640,7 +640,7 @@ extern "C" {
// Attribute Method : "PyCell_setTerminal ()" // Attribute Method : "PyCell_setTerminal ()"
static PyObject* PyCell_setTerminal ( PyCell *self, PyObject* args ) { static PyObject* PyCell_setTerminal ( PyCell *self, PyObject* args ) {
cdebug.log(20) << "PyCell_setTerminal ()" << endl; cdebug_log(20,0) << "PyCell_setTerminal ()" << endl;
HTRY HTRY
METHOD_HEAD ( "Cell.setTerminal()" ) METHOD_HEAD ( "Cell.setTerminal()" )
@ -658,7 +658,7 @@ extern "C" {
// Attribute Method : "PyCell_uniquify ()" // Attribute Method : "PyCell_uniquify ()"
static PyObject* PyCell_uniquify ( PyCell *self, PyObject* args ) { static PyObject* PyCell_uniquify ( PyCell *self, PyObject* args ) {
cdebug.log(20) << "PyCell_uniquify ()" << endl; cdebug_log(20,0) << "PyCell_uniquify ()" << endl;
HTRY HTRY
METHOD_HEAD ( "Cell.uniquify()" ) METHOD_HEAD ( "Cell.uniquify()" )
@ -677,7 +677,7 @@ extern "C" {
// Attribute Method : "PyCell_getClone ()" // Attribute Method : "PyCell_getClone ()"
static PyObject* PyCell_getClone ( PyCell *self ) { static PyObject* PyCell_getClone ( PyCell *self ) {
cdebug.log(20) << "PyCell_getClone ()" << endl; cdebug_log(20,0) << "PyCell_getClone ()" << endl;
Cell* cloneCell = NULL; Cell* cloneCell = NULL;
HTRY HTRY

14
hurricane/src/isobar/PyComponent.cpp
View File

@ -61,7 +61,7 @@ extern "C" {
static PyObject* PyComponent_getPosition ( PyComponent *self ) static PyObject* PyComponent_getPosition ( PyComponent *self )
{ {
cdebug.log(20) << "PyComponent_getPosition ()" << endl; cdebug_log(20,0) << "PyComponent_getPosition ()" << endl;
METHOD_HEAD ( "Component.getPosition()" ) METHOD_HEAD ( "Component.getPosition()" )
PyPoint* pyPoint = PyObject_NEW ( PyPoint, &PyTypePoint ); PyPoint* pyPoint = PyObject_NEW ( PyPoint, &PyTypePoint );
@ -77,7 +77,7 @@ extern "C" {
static PyObject* PyComponent_getNet ( PyComponent *self ) static PyObject* PyComponent_getNet ( PyComponent *self )
{ {
cdebug.log(20) << "PyComponent_getNet ()" << endl; cdebug_log(20,0) << "PyComponent_getNet ()" << endl;
Net* net = NULL; Net* net = NULL;
@ -93,7 +93,7 @@ extern "C" {
static PyObject* PyComponent_getLayer ( PyComponent *self ) static PyObject* PyComponent_getLayer ( PyComponent *self )
{ {
cdebug.log(20) << "PyComponent_getLayer ()" << endl; cdebug_log(20,0) << "PyComponent_getLayer ()" << endl;
METHOD_HEAD ( "Component.getLayer()" ) METHOD_HEAD ( "Component.getLayer()" )
Layer* layer = NULL; Layer* layer = NULL;
@ -108,7 +108,7 @@ extern "C" {
static PyObject* PyComponent_getCenter ( PyComponent *self ) static PyObject* PyComponent_getCenter ( PyComponent *self )
{ {
cdebug.log(20) << "PyComponent_getCenter ()" << endl; cdebug_log(20,0) << "PyComponent_getCenter ()" << endl;
METHOD_HEAD( "Component.getCenter()" ) METHOD_HEAD( "Component.getCenter()" )
PyPoint* pyPoint = PyObject_NEW( PyPoint, &PyTypePoint ); PyPoint* pyPoint = PyObject_NEW( PyPoint, &PyTypePoint );
@ -124,7 +124,7 @@ extern "C" {
static PyObject* PyComponent_getBoundingBox ( PyComponent *self, PyObject* args ) static PyObject* PyComponent_getBoundingBox ( PyComponent *self, PyObject* args )
{ {
cdebug.log(20) << "PyComponent_getBoundingBox ()" << endl; cdebug_log(20,0) << "PyComponent_getBoundingBox ()" << endl;
METHOD_HEAD ( "Component.getBoundingBox()" ) METHOD_HEAD ( "Component.getBoundingBox()" )
PyBox* pyBox = PyObject_NEW ( PyBox, &PyTypeBox ); PyBox* pyBox = PyObject_NEW ( PyBox, &PyTypeBox );
@ -154,7 +154,7 @@ extern "C" {
static PyObject* PyComponent_getConnexComponents ( PyComponent *self ) static PyObject* PyComponent_getConnexComponents ( PyComponent *self )
{ {
cdebug.log(20) << "PyComponent_getConnexComponents()" << endl; cdebug_log(20,0) << "PyComponent_getConnexComponents()" << endl;
METHOD_HEAD( "PyComponent.getConnexComponents()" ) METHOD_HEAD( "PyComponent.getConnexComponents()" )
PyComponentCollection* pyComponentCollection = NULL; PyComponentCollection* pyComponentCollection = NULL;
@ -176,7 +176,7 @@ extern "C" {
static PyObject* PyComponent_getSlaveComponents ( PyComponent *self ) static PyObject* PyComponent_getSlaveComponents ( PyComponent *self )
{ {
cdebug.log(20) << "PyComponent_getSlaveComponents()" << endl; cdebug_log(20,0) << "PyComponent_getSlaveComponents()" << endl;
METHOD_HEAD( "PyComponent.getSlaveComponents()" ) METHOD_HEAD( "PyComponent.getSlaveComponents()" )
PyComponentCollection* pyComponentCollection = NULL; PyComponentCollection* pyComponentCollection = NULL;

4
hurricane/src/isobar/PyContact.cpp
View File

@ -66,7 +66,7 @@ extern "C" {
static PyObject* PyContact_create ( PyObject*, PyObject *args ) { static PyObject* PyContact_create ( PyObject*, PyObject *args ) {
cdebug.log(20) << "PyContact_create()" << endl; cdebug_log(20,0) << "PyContact_create()" << endl;
Contact* contact = NULL; Contact* contact = NULL;
@ -99,7 +99,7 @@ extern "C" {
static PyObject* PyContact_translate ( PyContact *self, PyObject* args ) { static PyObject* PyContact_translate ( PyContact *self, PyObject* args ) {
cdebug.log(20) << "PyContact_translate ()" << endl; cdebug_log(20,0) << "PyContact_translate ()" << endl;
HTRY HTRY
METHOD_HEAD ( "Contact.translate()" ) METHOD_HEAD ( "Contact.translate()" )

2
hurricane/src/isobar/PyContactLayer.cpp
View File

@ -76,7 +76,7 @@ extern "C" {
static PyObject* PyContactLayer_create ( PyObject*, PyObject* args ) static PyObject* PyContactLayer_create ( PyObject*, PyObject* args )
{ {
cdebug.log(20) << "PyContactLayer_create()" << endl; cdebug_log(20,0) << "PyContactLayer_create()" << endl;
ContactLayer* contactLayer = NULL; ContactLayer* contactLayer = NULL;

8
hurricane/src/isobar/PyDataBase.cpp
View File

@ -38,7 +38,7 @@ extern "C" {
static PyObject* PyDataBase_create ( PyObject* ) { static PyObject* PyDataBase_create ( PyObject* ) {
cdebug.log(20) << "PyDataBase_create()" << endl; cdebug_log(20,0) << "PyDataBase_create()" << endl;
DataBase* db = NULL; DataBase* db = NULL;
@ -51,7 +51,7 @@ extern "C" {
static PyObject* PyDataBase_getDB ( PyObject* ) { static PyObject* PyDataBase_getDB ( PyObject* ) {
cdebug.log(20) << "PyDataBase_getDB()" << endl; cdebug_log(20,0) << "PyDataBase_getDB()" << endl;
DataBase* db = NULL; DataBase* db = NULL;
@ -66,7 +66,7 @@ extern "C" {
PyObject* PyDataBase_getTechnology ( PyDataBase* self ) { PyObject* PyDataBase_getTechnology ( PyDataBase* self ) {
cdebug.log(20) << "PyDataBase_getTechnology()" << endl; cdebug_log(20,0) << "PyDataBase_getTechnology()" << endl;
Technology* techno = NULL; Technology* techno = NULL;
@ -84,7 +84,7 @@ extern "C" {
static PyObject* PyDataBase_getRootLibrary ( PyDataBase *self ) { static PyObject* PyDataBase_getRootLibrary ( PyDataBase *self ) {
cdebug.log(20) << "PyDataBase_getRootLibrary ()" << endl; cdebug_log(20,0) << "PyDataBase_getRootLibrary ()" << endl;
Library* library = NULL; Library* library = NULL;

2
hurricane/src/isobar/PyDbU.cpp
View File

@ -531,7 +531,7 @@ extern "C" {
extern void PyDbU_LinkPyType() extern void PyDbU_LinkPyType()
{ {
cdebug.log(20) << "PyDbU_LinkType()" << endl; cdebug_log(20,0) << "PyDbU_LinkType()" << endl;
PyTypeDbU.tp_methods = PyDbU_Methods; PyTypeDbU.tp_methods = PyDbU_Methods;
} }

8
hurricane/src/isobar/PyDebugSession.cpp
View File

@ -44,13 +44,13 @@ extern "C" {
static void PyDebugSession_DeAlloc ( PyDebugSession* self ) static void PyDebugSession_DeAlloc ( PyDebugSession* self )
{ {
cdebug.log(20) << "PyDebugSession_DeAlloc(" << hex << self << ")" << endl; cdebug_log(20,0) << "PyDebugSession_DeAlloc(" << hex << self << ")" << endl;
} }
static PyObject* PyDebugSession_open ( PyObject*, PyObject* args ) static PyObject* PyDebugSession_open ( PyObject*, PyObject* args )
{ {
cdebug.log(20) << "PyDebugSession_open()" << endl; cdebug_log(20,0) << "PyDebugSession_open()" << endl;
HTRY HTRY
PyObject* arg0; PyObject* arg0;
@ -85,7 +85,7 @@ extern "C" {
static PyObject* PyDebugSession_close ( PyObject* ) static PyObject* PyDebugSession_close ( PyObject* )
{ {
cdebug.log(20) << "PyDebugSession_close()" << endl; cdebug_log(20,0) << "PyDebugSession_close()" << endl;
HTRY HTRY
DebugSession::close (); DebugSession::close ();
@ -97,7 +97,7 @@ extern "C" {
static PyObject* PyDebugSession_addToTrace ( PyObject*, PyObject* args ) static PyObject* PyDebugSession_addToTrace ( PyObject*, PyObject* args )
{ {
cdebug.log(20) << "PyDebugSession_addToTrace()" << endl; cdebug_log(20,0) << "PyDebugSession_addToTrace()" << endl;
HTRY HTRY
PyObject* pySymbol = NULL; PyObject* pySymbol = NULL;

2
hurricane/src/isobar/PyDiffusionLayer.cpp
View File

@ -76,7 +76,7 @@ extern "C" {
static PyObject* PyDiffusionLayer_create ( PyObject*, PyObject* args ) static PyObject* PyDiffusionLayer_create ( PyObject*, PyObject* args )
{ {
cdebug.log(20) << "PyDiffusionLayer_create()" << endl; cdebug_log(20,0) << "PyDiffusionLayer_create()" << endl;
DiffusionLayer* diffusionLayer = NULL; DiffusionLayer* diffusionLayer = NULL;

2
hurricane/src/isobar/PyEntity.cpp
View File

@ -59,7 +59,7 @@ extern "C" {
// Attribute Method : "PyEntity_getCell ()" // Attribute Method : "PyEntity_getCell ()"
static PyObject* PyEntity_getCell ( PyEntity *self ) { static PyObject* PyEntity_getCell ( PyEntity *self ) {
cdebug.log(20) << "PyEntity_getCell ()" << endl; cdebug_log(20,0) << "PyEntity_getCell ()" << endl;
Cell* cell = NULL; Cell* cell = NULL;

12
hurricane/src/isobar/PyHook.cpp
View File

@ -48,7 +48,7 @@ extern "C" {
static PyObject* PyHook_getComponent ( PyHook *self ) static PyObject* PyHook_getComponent ( PyHook *self )
{ {
cdebug.log(20) << "PyHook_getComponent()" << endl; cdebug_log(20,0) << "PyHook_getComponent()" << endl;
METHOD_HEAD ( "Hook.getComponent()" ) METHOD_HEAD ( "Hook.getComponent()" )
Component* component = NULL; Component* component = NULL;
@ -62,7 +62,7 @@ extern "C" {
static PyObject* PyHook_getHooks ( PyHook *self ) static PyObject* PyHook_getHooks ( PyHook *self )
{ {
cdebug.log(20) << "PyHook_getHooks()" << endl; cdebug_log(20,0) << "PyHook_getHooks()" << endl;
METHOD_HEAD( "Hook.getHooks()" ) METHOD_HEAD( "Hook.getHooks()" )
@ -83,7 +83,7 @@ extern "C" {
static PyObject* PyHook_getSlaveHooks ( PyHook *self ) static PyObject* PyHook_getSlaveHooks ( PyHook *self )
{ {
cdebug.log(20) << "PyHook_getSlaveHooks()" << endl; cdebug_log(20,0) << "PyHook_getSlaveHooks()" << endl;
METHOD_HEAD( "Hook.getSlaveHooks()" ) METHOD_HEAD( "Hook.getSlaveHooks()" )
@ -104,7 +104,7 @@ extern "C" {
static PyObject* PyHook_detach ( PyHook *self ) static PyObject* PyHook_detach ( PyHook *self )
{ {
cdebug.log(20) << "PyHook_detach()" << endl; cdebug_log(20,0) << "PyHook_detach()" << endl;
METHOD_HEAD ( "Hook.detach()" ) METHOD_HEAD ( "Hook.detach()" )
PyHook* pyReturnHook = PyObject_NEW ( PyHook, &PyTypeHook ); PyHook* pyReturnHook = PyObject_NEW ( PyHook, &PyTypeHook );
@ -120,7 +120,7 @@ extern "C" {
static PyObject* PyHook_attach ( PyHook *self, PyObject* args ) static PyObject* PyHook_attach ( PyHook *self, PyObject* args )
{ {
cdebug.log(20) << "PyHook_attach()" << endl; cdebug_log(20,0) << "PyHook_attach()" << endl;
METHOD_HEAD ( "Hook.attach()" ) METHOD_HEAD ( "Hook.attach()" )
PyHook* pyReturnHook = PyObject_NEW ( PyHook, &PyTypeHook ); PyHook* pyReturnHook = PyObject_NEW ( PyHook, &PyTypeHook );
@ -147,7 +147,7 @@ extern "C" {
static PyObject* PyHook_merge ( PyHook *self, PyObject* args ) static PyObject* PyHook_merge ( PyHook *self, PyObject* args )
{ {
cdebug.log(20) << "PyHook_merge()" << endl; cdebug_log(20,0) << "PyHook_merge()" << endl;
METHOD_HEAD ( "Hook.merge()" ) METHOD_HEAD ( "Hook.merge()" )
PyHook* pyReturnHook = PyObject_NEW ( PyHook, &PyTypeHook ); PyHook* pyReturnHook = PyObject_NEW ( PyHook, &PyTypeHook );

4
hurricane/src/isobar/PyHorizontal.cpp
View File

@ -61,7 +61,7 @@ extern "C" {
// Attribute Method : "PyHorizontal_create ()" // Attribute Method : "PyHorizontal_create ()"
static PyObject* PyHorizontal_create ( PyObject*, PyObject *args ) { static PyObject* PyHorizontal_create ( PyObject*, PyObject *args ) {
cdebug.log(20) << "PyHorizontal_create()" << endl; cdebug_log(20,0) << "PyHorizontal_create()" << endl;
PyObject* arg0; PyObject* arg0;
PyObject* arg1; PyObject* arg1;
@ -152,7 +152,7 @@ extern "C" {
// Attribute Method : "PyHorizontal_translate ()" // Attribute Method : "PyHorizontal_translate ()"
static PyObject* PyHorizontal_translate ( PyHorizontal *self, PyObject* args ) { static PyObject* PyHorizontal_translate ( PyHorizontal *self, PyObject* args ) {
cdebug.log(20) << "PyHorizontal_translate ()" << endl; cdebug_log(20,0) << "PyHorizontal_translate ()" << endl;
HTRY HTRY
METHOD_HEAD ( "Horizontal.translate()" ) METHOD_HEAD ( "Horizontal.translate()" )

6
hurricane/src/isobar/PyHurricane.cpp
View File

@ -209,7 +209,7 @@ using namespace Hurricane;
for ( unsigned i=0 ; i < _types.size() ; i++ ) { for ( unsigned i=0 ; i < _types.size() ; i++ ) {
if ( ! strcmp ( _types[i]->_id, id ) ) { if ( ! strcmp ( _types[i]->_id, id ) ) {
//throw Error ( objectTypeRedefinition ); // 04.09.2009 d2 modification so Pharos can run several scripts during one execution //throw Error ( objectTypeRedefinition ); // 04.09.2009 d2 modification so Pharos can run several scripts during one execution
cdebug.log(20) << objectTypeRedefinition << endl; cdebug_log(20,0) << objectTypeRedefinition << endl;
return; return;
} }
} }
@ -526,7 +526,7 @@ extern "C" {
DL_EXPORT(void) initHurricane () { DL_EXPORT(void) initHurricane () {
//trace_on(); //trace_on();
cdebug.log(20) << "initHurricane()" << endl; cdebug_log(20,0) << "initHurricane()" << endl;
PyDebugSession_LinkPyType (); PyDebugSession_LinkPyType ();
PyUpdateSession_LinkPyType (); PyUpdateSession_LinkPyType ();
@ -836,7 +836,7 @@ extern "C" {
PyInstance_postModuleInit(); PyInstance_postModuleInit();
PyQuery_postModuleInit(); PyQuery_postModuleInit();
cdebug.log(20) << "Hurricane.so loaded " << (void*)&typeid(string) << endl; cdebug_log(20,0) << "Hurricane.so loaded " << (void*)&typeid(string) << endl;
} }

8
hurricane/src/isobar/PyHyperNet.cpp
View File

@ -43,7 +43,7 @@ extern "C" {
static PyObject* PyHyperNet_create ( PyObject*, PyObject *args ) { static PyObject* PyHyperNet_create ( PyObject*, PyObject *args ) {
cdebug.log(20) << "PyHyperNet_create()" << endl; cdebug_log(20,0) << "PyHyperNet_create()" << endl;
HyperNet* hyperNet = NULL; HyperNet* hyperNet = NULL;
PyObject* arg0; PyObject* arg0;
@ -69,7 +69,7 @@ extern "C" {
static PyObject* PyHyperNet_getNetOccurrences(PyHyperNet *self) static PyObject* PyHyperNet_getNetOccurrences(PyHyperNet *self)
{ {
cdebug.log(20) << "PyHyperNet_getNetOccurrences()" << endl; cdebug_log(20,0) << "PyHyperNet_getNetOccurrences()" << endl;
METHOD_HEAD ( "HyperNet.getNetOccurrences()" ) METHOD_HEAD ( "HyperNet.getNetOccurrences()" )
@ -92,7 +92,7 @@ extern "C" {
static PyObject* PyHyperNet_getLeafPlugOccurrences(PyHyperNet *self) static PyObject* PyHyperNet_getLeafPlugOccurrences(PyHyperNet *self)
{ {
cdebug.log(20) << "PyHyperNet_getLeafPlugOccurrences()" << endl; cdebug_log(20,0) << "PyHyperNet_getLeafPlugOccurrences()" << endl;
METHOD_HEAD ( "HyperNet.getLeafPlugOccurrences()" ) METHOD_HEAD ( "HyperNet.getLeafPlugOccurrences()" )
@ -115,7 +115,7 @@ extern "C" {
static PyObject* PyHyperNet_getCell ( PyHyperNet *self ) static PyObject* PyHyperNet_getCell ( PyHyperNet *self )
{ {
cdebug.log(20) << "PyHyperNet_getCell ()" << endl; cdebug_log(20,0) << "PyHyperNet_getCell ()" << endl;
Cell* cell = NULL; Cell* cell = NULL;

30
hurricane/src/isobar/PyInstance.cpp
View File

@ -73,7 +73,7 @@ extern "C" {
static PyObject* PyInstance_create ( PyObject*, PyObject *args ) static PyObject* PyInstance_create ( PyObject*, PyObject *args )
{ {
cdebug.log(20) << "PyInstance_create()" << endl; cdebug_log(20,0) << "PyInstance_create()" << endl;
Instance* instance = NULL; Instance* instance = NULL;
PyObject* arg0 = NULL; PyObject* arg0 = NULL;
@ -117,7 +117,7 @@ extern "C" {
static PyObject* PyInstance_getMasterCell ( PyInstance *self ) static PyObject* PyInstance_getMasterCell ( PyInstance *self )
{ {
cdebug.log(20) << "PyInstance_getMasterCell ()" << endl; cdebug_log(20,0) << "PyInstance_getMasterCell ()" << endl;
Cell* cell = NULL; Cell* cell = NULL;
@ -132,7 +132,7 @@ extern "C" {
static PyObject* PyInstance_getPlacementStatus ( PyInstance *self ) static PyObject* PyInstance_getPlacementStatus ( PyInstance *self )
{ {
cdebug.log(20) << "PyInstance_getPlacementStatus ()" << endl; cdebug_log(20,0) << "PyInstance_getPlacementStatus ()" << endl;
METHOD_HEAD ( "Instance.getPlacementStatus()" ); METHOD_HEAD ( "Instance.getPlacementStatus()" );
@ -147,7 +147,7 @@ extern "C" {
static PyObject* PyInstance_setPlacementStatus ( PyInstance *self, PyObject* args ) static PyObject* PyInstance_setPlacementStatus ( PyInstance *self, PyObject* args )
{ {
cdebug.log(20) << "PyInstance_setPlacementStatus()" << endl; cdebug_log(20,0) << "PyInstance_setPlacementStatus()" << endl;
METHOD_HEAD ( "Instance.setPlacementStatus()" ) METHOD_HEAD ( "Instance.setPlacementStatus()" )
HTRY HTRY
@ -163,7 +163,7 @@ extern "C" {
static PyObject* PyInstance_getTransformation ( PyInstance *self ) static PyObject* PyInstance_getTransformation ( PyInstance *self )
{ {
cdebug.log(20) << "PyInstance_getTransformation ()" << endl; cdebug_log(20,0) << "PyInstance_getTransformation ()" << endl;
METHOD_HEAD ( "Instance.getTransformation()" ); METHOD_HEAD ( "Instance.getTransformation()" );
PyTransformation* resultPyTransf = PyObject_NEW ( PyTransformation, &PyTypeTransformation ); PyTransformation* resultPyTransf = PyObject_NEW ( PyTransformation, &PyTypeTransformation );
@ -179,7 +179,7 @@ extern "C" {
static PyObject* PyInstance_getPlug ( PyInstance *self, PyObject* args ) static PyObject* PyInstance_getPlug ( PyInstance *self, PyObject* args )
{ {
cdebug.log(20) << "PyInstance_getPlug ()" << endl; cdebug_log(20,0) << "PyInstance_getPlug ()" << endl;
Plug* plug = NULL; Plug* plug = NULL;
@ -198,7 +198,7 @@ extern "C" {
static PyObject* PyInstance_getPlugs(PyInstance *self ) static PyObject* PyInstance_getPlugs(PyInstance *self )
{ {
cdebug.log(20) << "PyInstance_getPlugs()" << endl; cdebug_log(20,0) << "PyInstance_getPlugs()" << endl;
METHOD_HEAD ( "Instance.getPlugs()" ) METHOD_HEAD ( "Instance.getPlugs()" )
@ -221,7 +221,7 @@ extern "C" {
static PyObject* PyInstance_getConnectedPlugs(PyInstance *self) static PyObject* PyInstance_getConnectedPlugs(PyInstance *self)
{ {
cdebug.log(20) << "PyInstance_getConnectedPlugs ()" << endl; cdebug_log(20,0) << "PyInstance_getConnectedPlugs ()" << endl;
METHOD_HEAD ( "Instance.getConnectedPlugs()") METHOD_HEAD ( "Instance.getConnectedPlugs()")
@ -244,7 +244,7 @@ extern "C" {
static PyObject* PyInstance_getUnconnectedPlugs(PyInstance *self) static PyObject* PyInstance_getUnconnectedPlugs(PyInstance *self)
{ {
cdebug.log(20) << "PyInstance_getUnconnectedPlugs ()" << endl; cdebug_log(20,0) << "PyInstance_getUnconnectedPlugs ()" << endl;
METHOD_HEAD ( "Instance.getUnconnectedPlugs()") METHOD_HEAD ( "Instance.getUnconnectedPlugs()")
@ -267,7 +267,7 @@ extern "C" {
static PyObject* PyInstance_getAbutmentBox ( PyInstance *self ) static PyObject* PyInstance_getAbutmentBox ( PyInstance *self )
{ {
cdebug.log(20) << "PyInstance_getAbutmentBox ()" << endl; cdebug_log(20,0) << "PyInstance_getAbutmentBox ()" << endl;
METHOD_HEAD ( "Instance.getAbutmentBox()" ) METHOD_HEAD ( "Instance.getAbutmentBox()" )
PyBox* pyBox = PyObject_NEW ( PyBox, &PyTypeBox ); PyBox* pyBox = PyObject_NEW ( PyBox, &PyTypeBox );
@ -283,7 +283,7 @@ extern "C" {
static PyObject* PyInstance_uniquify ( PyInstance *self ) static PyObject* PyInstance_uniquify ( PyInstance *self )
{ {
cdebug.log(20) << "PyInstance_uniquify ()" << endl; cdebug_log(20,0) << "PyInstance_uniquify ()" << endl;
HTRY HTRY
METHOD_HEAD ( "Instance.uniquify()" ) METHOD_HEAD ( "Instance.uniquify()" )
@ -295,7 +295,7 @@ extern "C" {
static PyObject* PyInstance_slaveAbutmentBox ( PyInstance *self ) static PyObject* PyInstance_slaveAbutmentBox ( PyInstance *self )
{ {
cdebug.log(20) << "PyInstance_slaveAbutmentBox ()" << endl; cdebug_log(20,0) << "PyInstance_slaveAbutmentBox ()" << endl;
METHOD_HEAD ( "Instance.slaveAbutmentBox()" ) METHOD_HEAD ( "Instance.slaveAbutmentBox()" )
HTRY HTRY
@ -309,7 +309,7 @@ extern "C" {
static PyObject* PyInstance_getClone ( PyInstance *self, PyObject* args ) static PyObject* PyInstance_getClone ( PyInstance *self, PyObject* args )
{ {
cdebug.log(20) << "PyInstance_getClone ()" << endl; cdebug_log(20,0) << "PyInstance_getClone ()" << endl;
Instance* cloneInstance = NULL; Instance* cloneInstance = NULL;
HTRY HTRY
@ -332,7 +332,7 @@ extern "C" {
static PyObject* PyInstance_setTransformation ( PyInstance *self, PyObject* args ) static PyObject* PyInstance_setTransformation ( PyInstance *self, PyObject* args )
{ {
cdebug.log(20) << "PyInstance_setTransformation()" << endl; cdebug_log(20,0) << "PyInstance_setTransformation()" << endl;
METHOD_HEAD ( "Instance.setTransformation()" ) METHOD_HEAD ( "Instance.setTransformation()" )
HTRY HTRY
@ -348,7 +348,7 @@ extern "C" {
static PyObject* PyInstance_setMasterCell ( PyInstance *self, PyObject* args ) static PyObject* PyInstance_setMasterCell ( PyInstance *self, PyObject* args )
{ {
cdebug.log(20) << "Instance.setMasterCell()" << endl; cdebug_log(20,0) << "Instance.setMasterCell()" << endl;
METHOD_HEAD ( "Instance.setMasterCell()" ) METHOD_HEAD ( "Instance.setMasterCell()" )
HTRY HTRY

22
hurricane/src/isobar/PyInterval.cpp
View File

@ -54,7 +54,7 @@ extern "C" {
// Class Method : "PyInterval_NEW ()" // Class Method : "PyInterval_NEW ()"
static PyObject* PyInterval_NEW (PyObject *module, PyObject *args) { static PyObject* PyInterval_NEW (PyObject *module, PyObject *args) {
cdebug.log(20) << "PyInterval_NEW()" << endl; cdebug_log(20,0) << "PyInterval_NEW()" << endl;
Interval* interval = NULL; Interval* interval = NULL;
@ -85,13 +85,13 @@ extern "C" {
static int PyInterval_Init ( PyInterval* self, PyObject* args, PyObject* kwargs ) static int PyInterval_Init ( PyInterval* self, PyObject* args, PyObject* kwargs )
{ {
cdebug.log(20) << "PyInterval_Init(): " << (void*)self << endl; cdebug_log(20,0) << "PyInterval_Init(): " << (void*)self << endl;
return 0; return 0;
} }
static PyObject* PyInterval_getUnion ( PyInterval *self, PyObject* args ) { static PyObject* PyInterval_getUnion ( PyInterval *self, PyObject* args ) {
cdebug.log(20) << "PyInterval_getUnion()" << endl; cdebug_log(20,0) << "PyInterval_getUnion()" << endl;
METHOD_HEAD ( "Interval.getUnion()" ) METHOD_HEAD ( "Interval.getUnion()" )
@ -110,7 +110,7 @@ extern "C" {
static PyObject* PyInterval_getIntersection ( PyInterval *self, PyObject* args ) { static PyObject* PyInterval_getIntersection ( PyInterval *self, PyObject* args ) {
cdebug.log(20) << "PyInterval_getIntersection()" << endl; cdebug_log(20,0) << "PyInterval_getIntersection()" << endl;
METHOD_HEAD ( "Interval.getIntersection()" ) METHOD_HEAD ( "Interval.getIntersection()" )
@ -129,7 +129,7 @@ extern "C" {
static PyObject* PyInterval_contains ( PyInterval *self, PyObject* args ) { static PyObject* PyInterval_contains ( PyInterval *self, PyObject* args ) {
cdebug.log(20) << "PyInterval_contains ()" << endl; cdebug_log(20,0) << "PyInterval_contains ()" << endl;
METHOD_HEAD( "Interval.contains()" ) METHOD_HEAD( "Interval.contains()" )
@ -155,7 +155,7 @@ extern "C" {
static PyObject* PyInterval_intersect ( PyInterval *self, PyObject* args ) { static PyObject* PyInterval_intersect ( PyInterval *self, PyObject* args ) {
cdebug.log(20) << "PyInterval_intersect ()" << endl; cdebug_log(20,0) << "PyInterval_intersect ()" << endl;
bool result = false; bool result = false;
HTRY HTRY
@ -176,7 +176,7 @@ extern "C" {
static PyObject* PyInterval_makeEmpty ( PyInterval *self, PyObject* args ) { static PyObject* PyInterval_makeEmpty ( PyInterval *self, PyObject* args ) {
cdebug.log(20) << "PyInterval_makeEmpty ()" << endl; cdebug_log(20,0) << "PyInterval_makeEmpty ()" << endl;
METHOD_HEAD( "Interval.makeEmpty()" ) METHOD_HEAD( "Interval.makeEmpty()" )
interval->makeEmpty(); interval->makeEmpty();
@ -187,7 +187,7 @@ extern "C" {
static PyObject* PyInterval_inflate ( PyInterval *self, PyObject* args ) { static PyObject* PyInterval_inflate ( PyInterval *self, PyObject* args ) {
cdebug.log(20) << "PyInterval_inflate ()" << endl; cdebug_log(20,0) << "PyInterval_inflate ()" << endl;
METHOD_HEAD( "Interval.inflate()" ) METHOD_HEAD( "Interval.inflate()" )
@ -213,7 +213,7 @@ extern "C" {
static PyObject* PyInterval_merge ( PyInterval *self, PyObject* args ) { static PyObject* PyInterval_merge ( PyInterval *self, PyObject* args ) {
cdebug.log(20) << "PyInterval_merge ()" << endl; cdebug_log(20,0) << "PyInterval_merge ()" << endl;
METHOD_HEAD( "Interval.merge()" ) METHOD_HEAD( "Interval.merge()" )
@ -239,7 +239,7 @@ extern "C" {
static PyObject* PyInterval_intersection ( PyInterval *self, PyObject* args ) { static PyObject* PyInterval_intersection ( PyInterval *self, PyObject* args ) {
cdebug.log(20) << "PyInterval_intersection ()" << endl; cdebug_log(20,0) << "PyInterval_intersection ()" << endl;
METHOD_HEAD( "Interval.intersection()" ) METHOD_HEAD( "Interval.intersection()" )
@ -265,7 +265,7 @@ extern "C" {
static PyObject* PyInterval_translate ( PyInterval *self, PyObject* args ) { static PyObject* PyInterval_translate ( PyInterval *self, PyObject* args ) {
cdebug.log(20) << "PyInterval_translate ()" << endl; cdebug_log(20,0) << "PyInterval_translate ()" << endl;
HTRY HTRY
METHOD_HEAD( "Interval.translate()" ) METHOD_HEAD( "Interval.translate()" )

16
hurricane/src/isobar/PyLayer.cpp
View File

@ -51,7 +51,7 @@ extern "C" {
# define accessorDbuFromOptBasicLayer(FUNC_NAME,PY_SELF_TYPE,SELF_TYPE) \ # define accessorDbuFromOptBasicLayer(FUNC_NAME,PY_SELF_TYPE,SELF_TYPE) \
static PyObject* PY_SELF_TYPE##_##FUNC_NAME ( PY_SELF_TYPE* self, PyObject* args ) \ static PyObject* PY_SELF_TYPE##_##FUNC_NAME ( PY_SELF_TYPE* self, PyObject* args ) \
{ \ { \
cdebug.log(20) << #PY_SELF_TYPE "_" #FUNC_NAME "()" << endl; \ cdebug_log(20,0) << #PY_SELF_TYPE "_" #FUNC_NAME "()" << endl; \
\ \
DbU::Unit rvalue = 0; \ DbU::Unit rvalue = 0; \
\ \
@ -85,7 +85,7 @@ extern "C" {
# define accessorLayerFromLayer(FUNC_NAME,PY_SELF_TYPE,SELF_TYPE) \ # define accessorLayerFromLayer(FUNC_NAME,PY_SELF_TYPE,SELF_TYPE) \
static PyObject* PY_SELF_TYPE##_##FUNC_NAME ( PY_SELF_TYPE* self, PyObject* args ) \ static PyObject* PY_SELF_TYPE##_##FUNC_NAME ( PY_SELF_TYPE* self, PyObject* args ) \
{ \ { \
cdebug.log(20) << #PY_SELF_TYPE "_" #FUNC_NAME "()" << endl; \ cdebug_log(20,0) << #PY_SELF_TYPE "_" #FUNC_NAME "()" << endl; \
\ \
Layer* rlayer = 0; \ Layer* rlayer = 0; \
\ \
@ -116,7 +116,7 @@ extern "C" {
# define accessorMaskFromVoid(FUNC_NAME,PY_SELF_TYPE,SELF_TYPE) \ # define accessorMaskFromVoid(FUNC_NAME,PY_SELF_TYPE,SELF_TYPE) \
static PyObject* PY_SELF_TYPE##_##FUNC_NAME ( PY_SELF_TYPE* self ) \ static PyObject* PY_SELF_TYPE##_##FUNC_NAME ( PY_SELF_TYPE* self ) \
{ \ { \
cdebug.log(20) << #PY_SELF_TYPE "_" #FUNC_NAME "()" << endl; \ cdebug_log(20,0) << #PY_SELF_TYPE "_" #FUNC_NAME "()" << endl; \
\ \
Layer::Mask mask = 0; \ Layer::Mask mask = 0; \
\ \
@ -132,7 +132,7 @@ extern "C" {
# define accessorLayerFromOptBool(FUNC_NAME,PY_SELF_TYPE,SELF_TYPE) \ # define accessorLayerFromOptBool(FUNC_NAME,PY_SELF_TYPE,SELF_TYPE) \
static PyObject* PY_SELF_TYPE##_##FUNC_NAME ( PY_SELF_TYPE* self, PyObject* args ) \ static PyObject* PY_SELF_TYPE##_##FUNC_NAME ( PY_SELF_TYPE* self, PyObject* args ) \
{ \ { \
cdebug.log(20) << #PY_SELF_TYPE "_" #FUNC_NAME "()" << endl; \ cdebug_log(20,0) << #PY_SELF_TYPE "_" #FUNC_NAME "()" << endl; \
\ \
Layer* rlayer = NULL; \ Layer* rlayer = NULL; \
\ \
@ -162,7 +162,7 @@ extern "C" {
# define predicateFromVoid(FUNC_NAME,PY_SELF_TYPE,SELF_TYPE) \ # define predicateFromVoid(FUNC_NAME,PY_SELF_TYPE,SELF_TYPE) \
static PyObject* PY_SELF_TYPE##_##FUNC_NAME ( PY_SELF_TYPE* self ) \ static PyObject* PY_SELF_TYPE##_##FUNC_NAME ( PY_SELF_TYPE* self ) \
{ \ { \
cdebug.log(20) << #PY_SELF_TYPE "_" #FUNC_NAME "()" << endl; \ cdebug_log(20,0) << #PY_SELF_TYPE "_" #FUNC_NAME "()" << endl; \
\ \
HTRY \ HTRY \
GENERIC_METHOD_HEAD(SELF_TYPE,cobject,#SELF_TYPE"."#FUNC_NAME"()") \ GENERIC_METHOD_HEAD(SELF_TYPE,cobject,#SELF_TYPE"."#FUNC_NAME"()") \
@ -176,7 +176,7 @@ extern "C" {
# define updatorFromDbu(FUNC_NAME,PY_SELF_TYPE,SELF_TYPE) \ # define updatorFromDbu(FUNC_NAME,PY_SELF_TYPE,SELF_TYPE) \
static PyObject* PY_SELF_TYPE##_##FUNC_NAME ( PY_SELF_TYPE* self, PyObject* args ) \ static PyObject* PY_SELF_TYPE##_##FUNC_NAME ( PY_SELF_TYPE* self, PyObject* args ) \
{ \ { \
cdebug.log(20) << #PY_SELF_TYPE "_" #FUNC_NAME "()" << endl; \ cdebug_log(20,0) << #PY_SELF_TYPE "_" #FUNC_NAME "()" << endl; \
\ \
HTRY \ HTRY \
GENERIC_METHOD_HEAD(SELF_TYPE,cobject,#SELF_TYPE"."#FUNC_NAME"()") \ GENERIC_METHOD_HEAD(SELF_TYPE,cobject,#SELF_TYPE"."#FUNC_NAME"()") \
@ -199,7 +199,7 @@ extern "C" {
# define updatorFromBasicLayerDbu(FUNC_NAME,PY_SELF_TYPE,SELF_TYPE) \ # define updatorFromBasicLayerDbu(FUNC_NAME,PY_SELF_TYPE,SELF_TYPE) \
static PyObject* PY_SELF_TYPE##_##FUNC_NAME ( PY_SELF_TYPE* self, PyObject* args ) \ static PyObject* PY_SELF_TYPE##_##FUNC_NAME ( PY_SELF_TYPE* self, PyObject* args ) \
{ \ { \
cdebug.log(20) << #PY_SELF_TYPE "_" #FUNC_NAME "()" << endl; \ cdebug_log(20,0) << #PY_SELF_TYPE "_" #FUNC_NAME "()" << endl; \
\ \
HTRY \ HTRY \
GENERIC_METHOD_HEAD(SELF_TYPE,cobject,#SELF_TYPE"."#FUNC_NAME"()") \ GENERIC_METHOD_HEAD(SELF_TYPE,cobject,#SELF_TYPE"."#FUNC_NAME"()") \
@ -227,7 +227,7 @@ extern "C" {
static PyObject* PyLayer_getTechnology ( PyLayer *self ) { static PyObject* PyLayer_getTechnology ( PyLayer *self ) {
cdebug.log(20) << "PyLayer_getTechnology ()" << endl; cdebug_log(20,0) << "PyLayer_getTechnology ()" << endl;
Technology* techno = NULL; Technology* techno = NULL;

6
hurricane/src/isobar/PyLayerMask.cpp
View File

@ -106,7 +106,7 @@ extern "C" {
static PyObject* PyLayerMask_new ( PyTypeObject* type, PyObject* args, PyObject* kwds ) static PyObject* PyLayerMask_new ( PyTypeObject* type, PyObject* args, PyObject* kwds )
{ {
cdebug.log(20) << "PyLayerMask_new()" << endl; cdebug_log(20,0) << "PyLayerMask_new()" << endl;
PyLayerMask* pyMask = (PyLayerMask*)type->tp_alloc(type,0); PyLayerMask* pyMask = (PyLayerMask*)type->tp_alloc(type,0);
@ -287,7 +287,7 @@ extern "C" {
static void PyLayerMask_DeAlloc ( PyLayerMask *self ) static void PyLayerMask_DeAlloc ( PyLayerMask *self )
{ {
cdebug.log(20) << "PyLayerMask_DeAlloc(" << hex << self << ") " << self->_object << endl; cdebug_log(20,0) << "PyLayerMask_DeAlloc(" << hex << self << ") " << self->_object << endl;
PyObject_DEL ( self ); PyObject_DEL ( self );
} }
@ -312,7 +312,7 @@ extern "C" {
extern void PyLayerMask_LinkPyType() extern void PyLayerMask_LinkPyType()
{ {
cdebug.log(20) << "PyLayerMask_LinkType()" << endl; cdebug_log(20,0) << "PyLayerMask_LinkType()" << endl;
PyTypeLayerMask.tp_new = PyLayerMask_new; PyTypeLayerMask.tp_new = PyLayerMask_new;
PyTypeLayerMask.tp_dealloc = (destructor) PyLayerMask_DeAlloc; PyTypeLayerMask.tp_dealloc = (destructor) PyLayerMask_DeAlloc;

8
hurricane/src/isobar/PyLibrary.cpp
View File

@ -40,7 +40,7 @@ extern "C" {
static PyObject* PyLibrary_create ( PyObject *, PyObject *args ) { static PyObject* PyLibrary_create ( PyObject *, PyObject *args ) {
cdebug.log(20) << "PyLibrary_create()" << endl; cdebug_log(20,0) << "PyLibrary_create()" << endl;
PyObject* arg0; PyObject* arg0;
PyObject* arg1; PyObject* arg1;
@ -69,7 +69,7 @@ extern "C" {
static PyObject* PyLibrary_getSubLibrary ( PyLibrary *self, PyObject* args ) { static PyObject* PyLibrary_getSubLibrary ( PyLibrary *self, PyObject* args ) {
cdebug.log(20) << "PyLibrary_getLibrary ()" << endl; cdebug_log(20,0) << "PyLibrary_getLibrary ()" << endl;
Library* subLibrary = NULL; Library* subLibrary = NULL;
@ -89,7 +89,7 @@ extern "C" {
static PyObject* PyLibrary_getCell ( PyLibrary* self, PyObject* args ) { static PyObject* PyLibrary_getCell ( PyLibrary* self, PyObject* args ) {
cdebug.log(20) << "PyLibrary_getCell ()" << endl; cdebug_log(20,0) << "PyLibrary_getCell ()" << endl;
Cell* cell = NULL; Cell* cell = NULL;
@ -109,7 +109,7 @@ extern "C" {
static PyObject* PyLibrary_getCells(PyLibrary *self) { static PyObject* PyLibrary_getCells(PyLibrary *self) {
cdebug.log(20) << "PyLibrary_getCells()" << endl; cdebug_log(20,0) << "PyLibrary_getCells()" << endl;
METHOD_HEAD ( "Library.getCells()" ) METHOD_HEAD ( "Library.getCells()" )

6
hurricane/src/isobar/PyMaterial.cpp
View File

@ -71,7 +71,7 @@ extern "C" {
static PyObject* PyMaterial_new ( PyTypeObject* type, PyObject* args, PyObject* kwds ) static PyObject* PyMaterial_new ( PyTypeObject* type, PyObject* args, PyObject* kwds )
{ {
cdebug.log(20) << "PyMaterial_new()" << endl; cdebug_log(20,0) << "PyMaterial_new()" << endl;
BasicLayer::Material* material = NULL; BasicLayer::Material* material = NULL;
PyMaterial* pyMaterial = (PyMaterial*)type->tp_alloc(type,0); PyMaterial* pyMaterial = (PyMaterial*)type->tp_alloc(type,0);
@ -101,7 +101,7 @@ extern "C" {
PyObject* PyMaterial_getCode ( PyMaterial* self ) PyObject* PyMaterial_getCode ( PyMaterial* self )
{ {
cdebug.log(20) << "PyMaterial_getCode()" << endl; cdebug_log(20,0) << "PyMaterial_getCode()" << endl;
int code = 0; int code = 0;
@ -146,7 +146,7 @@ extern "C" {
DirectDeleteMethod(PyMaterial_DeAlloc, PyMaterial) DirectDeleteMethod(PyMaterial_DeAlloc, PyMaterial)
extern void PyMaterial_LinkPyType() { extern void PyMaterial_LinkPyType() {
cdebug.log(20) << "PyMaterial_LinkType()" << endl; cdebug_log(20,0) << "PyMaterial_LinkType()" << endl;
PyTypeMaterial.tp_new = PyMaterial_new; PyTypeMaterial.tp_new = PyMaterial_new;
PyTypeMaterial.tp_dealloc = (destructor) PyMaterial_DeAlloc; PyTypeMaterial.tp_dealloc = (destructor) PyMaterial_DeAlloc;

34
hurricane/src/isobar/PyNet.cpp
View File

@ -127,7 +127,7 @@ extern "C" {
// Attribute Method : "PyNet_create ()" // Attribute Method : "PyNet_create ()"
static PyObject* PyNet_create ( PyObject*, PyObject *args ) { static PyObject* PyNet_create ( PyObject*, PyObject *args ) {
cdebug.log(20) << "PyNet_create()" << endl; cdebug_log(20,0) << "PyNet_create()" << endl;
char* name = NULL; char* name = NULL;
PyCell* pyCell = NULL; PyCell* pyCell = NULL;
@ -151,7 +151,7 @@ extern "C" {
static PyObject* PyNet_getType ( PyNet *self ) static PyObject* PyNet_getType ( PyNet *self )
{ {
cdebug.log(20) << "PyNet_getType ()" << endl; cdebug_log(20,0) << "PyNet_getType ()" << endl;
METHOD_HEAD ( "Net.getType()" ) METHOD_HEAD ( "Net.getType()" )
@ -165,7 +165,7 @@ extern "C" {
static PyObject* PyNet_getDirection ( PyNet *self ) static PyObject* PyNet_getDirection ( PyNet *self )
{ {
cdebug.log(20) << "PyNet_getDirection ()" << endl; cdebug_log(20,0) << "PyNet_getDirection ()" << endl;
METHOD_HEAD ( "Net.getDirection()" ) METHOD_HEAD ( "Net.getDirection()" )
@ -177,7 +177,7 @@ extern "C" {
// Attribute Method : "PyNet_getPlugs()" // Attribute Method : "PyNet_getPlugs()"
static PyObject* PyNet_getPlugs(PyNet *self) { static PyObject* PyNet_getPlugs(PyNet *self) {
cdebug.log(20) << "PyNet_getPlugs()" << endl; cdebug_log(20,0) << "PyNet_getPlugs()" << endl;
METHOD_HEAD("Net.getPlugs()") METHOD_HEAD("Net.getPlugs()")
@ -202,7 +202,7 @@ extern "C" {
// Attribute Method : "PyNet_getSegments()" // Attribute Method : "PyNet_getSegments()"
static PyObject* PyNet_getSegments(PyNet *self) { static PyObject* PyNet_getSegments(PyNet *self) {
cdebug.log(20) << "PyNet_getSegments()" << endl; cdebug_log(20,0) << "PyNet_getSegments()" << endl;
METHOD_HEAD ("Net.getSegments()") METHOD_HEAD ("Net.getSegments()")
@ -227,7 +227,7 @@ extern "C" {
// Attribute Method : "PyNet_getPins()" // Attribute Method : "PyNet_getPins()"
static PyObject* PyNet_getPins(PyNet *self) { static PyObject* PyNet_getPins(PyNet *self) {
cdebug.log(20) << "PyNet_getPins()" << endl; cdebug_log(20,0) << "PyNet_getPins()" << endl;
METHOD_HEAD ("Net.getPins()") METHOD_HEAD ("Net.getPins()")
@ -252,7 +252,7 @@ extern "C" {
// Attribute Method : "PyNet_getComponents()" // Attribute Method : "PyNet_getComponents()"
static PyObject* PyNet_getComponents(PyNet *self) { static PyObject* PyNet_getComponents(PyNet *self) {
cdebug.log(20) << "PyNet_getComponents()" << endl; cdebug_log(20,0) << "PyNet_getComponents()" << endl;
METHOD_HEAD ( "Net.getComponents()" ) METHOD_HEAD ( "Net.getComponents()" )
@ -275,7 +275,7 @@ extern "C" {
// Attribute Method : "PyNet_getExternalComponents()" // Attribute Method : "PyNet_getExternalComponents()"
static PyObject* PyNet_getExternalComponents(PyNet *self) { static PyObject* PyNet_getExternalComponents(PyNet *self) {
cdebug.log(20) << "PyNet_getExternalComponents()" << endl; cdebug_log(20,0) << "PyNet_getExternalComponents()" << endl;
METHOD_HEAD ( "Net.getExternalcomponents()" ) METHOD_HEAD ( "Net.getExternalcomponents()" )
@ -304,7 +304,7 @@ extern "C" {
// Attribute Method : "PyNet_setGlobal ()" // Attribute Method : "PyNet_setGlobal ()"
static PyObject* PyNet_setGlobal ( PyNet *self, PyObject* args ) { static PyObject* PyNet_setGlobal ( PyNet *self, PyObject* args ) {
cdebug.log(20) << "PyNet_setGlobal()" << endl; cdebug_log(20,0) << "PyNet_setGlobal()" << endl;
HTRY HTRY
METHOD_HEAD ( "Net.setGlobal()" ) METHOD_HEAD ( "Net.setGlobal()" )
@ -326,7 +326,7 @@ extern "C" {
// Attribute Method : "PyNet_setExternal ()" // Attribute Method : "PyNet_setExternal ()"
static PyObject* PyNet_setExternal ( PyNet *self, PyObject* args ) { static PyObject* PyNet_setExternal ( PyNet *self, PyObject* args ) {
cdebug.log(20) << "PyNet_setExternal()" << endl; cdebug_log(20,0) << "PyNet_setExternal()" << endl;
HTRY HTRY
METHOD_HEAD ( "Net.setExternal()" ) METHOD_HEAD ( "Net.setExternal()" )
@ -349,7 +349,7 @@ extern "C" {
static PyObject* PyNet_setType ( PyNet *self, PyObject* args ) static PyObject* PyNet_setType ( PyNet *self, PyObject* args )
{ {
cdebug.log(20) << "PyNet_setType()" << endl; cdebug_log(20,0) << "PyNet_setType()" << endl;
HTRY HTRY
@ -375,7 +375,7 @@ extern "C" {
static PyObject* PyNet_setDirection ( PyNet *self, PyObject* args ) static PyObject* PyNet_setDirection ( PyNet *self, PyObject* args )
{ {
cdebug.log(20) << "PyNet_setDirection()" << endl; cdebug_log(20,0) << "PyNet_setDirection()" << endl;
HTRY HTRY
@ -397,7 +397,7 @@ extern "C" {
static PyObject* PyNet_addAlias ( PyNet *self, PyObject* args ) static PyObject* PyNet_addAlias ( PyNet *self, PyObject* args )
{ {
cdebug.log(20) << "PyNet_addAlias()" << endl; cdebug_log(20,0) << "PyNet_addAlias()" << endl;
HTRY HTRY
METHOD_HEAD ( "Net.addAlias()" ) METHOD_HEAD ( "Net.addAlias()" )
@ -421,7 +421,7 @@ extern "C" {
static PyObject* PyNet_removeAlias ( PyNet *self, PyObject* args ) static PyObject* PyNet_removeAlias ( PyNet *self, PyObject* args )
{ {
cdebug.log(20) << "PyNet_removeAlias()" << endl; cdebug_log(20,0) << "PyNet_removeAlias()" << endl;
HTRY HTRY
METHOD_HEAD ( "Net.removeAlias()" ) METHOD_HEAD ( "Net.removeAlias()" )
@ -445,7 +445,7 @@ extern "C" {
static PyObject* PyNet_setPosition ( PyNet *self, PyObject* args ) static PyObject* PyNet_setPosition ( PyNet *self, PyObject* args )
{ {
cdebug.log(20) << "PyNet_setPosition()" << endl; cdebug_log(20,0) << "PyNet_setPosition()" << endl;
HTRY HTRY
@ -466,7 +466,7 @@ extern "C" {
// Attribute Method : "PyNet_merge ()" // Attribute Method : "PyNet_merge ()"
static PyObject* PyNet_merge ( PyNet *self, PyObject* args ) { static PyObject* PyNet_merge ( PyNet *self, PyObject* args ) {
cdebug.log(20) << "PyNet_merge()" << endl; cdebug_log(20,0) << "PyNet_merge()" << endl;
HTRY HTRY
PyNet* pyNetToMerge; PyNet* pyNetToMerge;
@ -486,7 +486,7 @@ extern "C" {
// Attribute Method : "PyNet_merge ()" // Attribute Method : "PyNet_merge ()"
static PyObject* PyNet_getClone ( PyNet *self, PyObject* args ) { static PyObject* PyNet_getClone ( PyNet *self, PyObject* args ) {
cdebug.log(20) << "PyNet_getClone()" << endl; cdebug_log(20,0) << "PyNet_getClone()" << endl;
Net* cloneNet = NULL; Net* cloneNet = NULL;
HTRY HTRY

2
hurricane/src/isobar/PyNetDirection.cpp
View File

@ -68,7 +68,7 @@ extern "C" {
DirectHashMethod(PyNetDirection_Hash, PyNetDirection) DirectHashMethod(PyNetDirection_Hash, PyNetDirection)
extern void PyNetDirection_LinkPyType() { extern void PyNetDirection_LinkPyType() {
cdebug.log(20) << "PyNetDirection_LinkType()" << endl; cdebug_log(20,0) << "PyNetDirection_LinkType()" << endl;
PyTypeNetDirection.tp_dealloc = (destructor) PyNetDirection_DeAlloc; PyTypeNetDirection.tp_dealloc = (destructor) PyNetDirection_DeAlloc;
PyTypeNetDirection.tp_compare = (cmpfunc) PyNetDirection_Cmp; PyTypeNetDirection.tp_compare = (cmpfunc) PyNetDirection_Cmp;
PyTypeNetDirection.tp_repr = (reprfunc) PyNetDirection_Repr; PyTypeNetDirection.tp_repr = (reprfunc) PyNetDirection_Repr;

10
hurricane/src/isobar/PyNetExternalComponents.cpp
View File

@ -39,13 +39,13 @@ extern "C" {
static void PyNetExternalComponents_DeAlloc ( PyNetExternalComponents* self ) static void PyNetExternalComponents_DeAlloc ( PyNetExternalComponents* self )
{ {
cdebug.log(20) << "PySingletonObject_DeAlloc(" << hex << self << ")" << endl; cdebug_log(20,0) << "PySingletonObject_DeAlloc(" << hex << self << ")" << endl;
} }
static PyObject* PyNetExternalComponents_isExternal ( PyObject*, PyObject *args ) static PyObject* PyNetExternalComponents_isExternal ( PyObject*, PyObject *args )
{ {
cdebug.log(20) << "PyNetExternalComponents_isExternal()" << endl; cdebug_log(20,0) << "PyNetExternalComponents_isExternal()" << endl;
bool isExternal = false; bool isExternal = false;
@ -63,7 +63,7 @@ extern "C" {
static PyObject* PyNetExternalComponents_setExternal ( PyObject*, PyObject *args ) static PyObject* PyNetExternalComponents_setExternal ( PyObject*, PyObject *args )
{ {
cdebug.log(20) << "PyNetExternalComponents_setExternal()" << endl; cdebug_log(20,0) << "PyNetExternalComponents_setExternal()" << endl;
HTRY HTRY
PyObject* pyComponent; PyObject* pyComponent;
@ -85,7 +85,7 @@ extern "C" {
static PyObject* PyNetExternalComponents_get ( PyObject*, PyObject* args ) static PyObject* PyNetExternalComponents_get ( PyObject*, PyObject* args )
{ {
cdebug.log(20) << "PyNetExternalComponents_getExternalComponents()" << endl; cdebug_log(20,0) << "PyNetExternalComponents_getExternalComponents()" << endl;
PyObject* arg0; PyObject* arg0;
@ -123,7 +123,7 @@ extern "C" {
// extern void PyNetExternalComponents_LinkPyType() // extern void PyNetExternalComponents_LinkPyType()
// { // {
// cdebug.log(20) << "PyNetExternalComponents_LinkType()" << endl; // cdebug_log(20,0) << "PyNetExternalComponents_LinkType()" << endl;
// PyTypeNetExternalComponents.tp_new = (newfunc) PyType_GenericNew; // PyTypeNetExternalComponents.tp_new = (newfunc) PyType_GenericNew;
// PyTypeNetExternalComponents.tp_dealloc = (destructor)PyNetExternalComponents_DeAlloc; // PyTypeNetExternalComponents.tp_dealloc = (destructor)PyNetExternalComponents_DeAlloc;

2
hurricane/src/isobar/PyNetType.cpp
View File

@ -67,7 +67,7 @@ extern "C" {
DirectHashMethod(PyNetType_Hash, PyNetType) DirectHashMethod(PyNetType_Hash, PyNetType)
extern void PyNetType_LinkPyType() { extern void PyNetType_LinkPyType() {
cdebug.log(20) << "PyNetType_LinkType()" << endl; cdebug_log(20,0) << "PyNetType_LinkType()" << endl;
PyTypeNetType.tp_dealloc = (destructor) PyNetType_DeAlloc; PyTypeNetType.tp_dealloc = (destructor) PyNetType_DeAlloc;
PyTypeNetType.tp_compare = (cmpfunc) PyNetType_Cmp; PyTypeNetType.tp_compare = (cmpfunc) PyNetType_Cmp;
PyTypeNetType.tp_repr = (reprfunc) PyNetType_Repr; PyTypeNetType.tp_repr = (reprfunc) PyNetType_Repr;

14
hurricane/src/isobar/PyOccurrence.cpp
View File

@ -62,7 +62,7 @@ extern "C" {
// Attribute Method : "PyOccurrence_NEW ()" // Attribute Method : "PyOccurrence_NEW ()"
PyObject* PyOccurrence_NEW ( PyObject *module, PyObject *args ) { PyObject* PyOccurrence_NEW ( PyObject *module, PyObject *args ) {
cdebug.log(20) << "PyOccurrence_NEW()" << endl; cdebug_log(20,0) << "PyOccurrence_NEW()" << endl;
Occurrence* occurrence; Occurrence* occurrence;
PyObject* arg0; PyObject* arg0;
@ -102,7 +102,7 @@ extern "C" {
static int PyOccurrence_Init ( PyOccurrence* self, PyObject* args, PyObject* kwargs ) static int PyOccurrence_Init ( PyOccurrence* self, PyObject* args, PyObject* kwargs )
{ {
cdebug.log(20) << "PyOccurrence_Init(): " << (void*)self << endl; cdebug_log(20,0) << "PyOccurrence_Init(): " << (void*)self << endl;
return 0; return 0;
} }
@ -111,7 +111,7 @@ extern "C" {
// Attribute Method : "PyOccurrence_getEntity ()" // Attribute Method : "PyOccurrence_getEntity ()"
static PyObject* PyOccurrence_getEntity ( PyOccurrence *self ) { static PyObject* PyOccurrence_getEntity ( PyOccurrence *self ) {
cdebug.log(20) << "PyOccurrence_getEntity()" << endl; cdebug_log(20,0) << "PyOccurrence_getEntity()" << endl;
METHOD_HEAD ( "Occurrence.getEntity()" ) METHOD_HEAD ( "Occurrence.getEntity()" )
@ -133,7 +133,7 @@ extern "C" {
// Attribute Method : "PyOccurrence_getOwnerCell ()" // Attribute Method : "PyOccurrence_getOwnerCell ()"
static PyObject* PyOccurrence_getOwnerCell ( PyOccurrence *self ) { static PyObject* PyOccurrence_getOwnerCell ( PyOccurrence *self ) {
cdebug.log(20) << "PyOccurrence_getOwnerCell()" << endl; cdebug_log(20,0) << "PyOccurrence_getOwnerCell()" << endl;
METHOD_HEAD ( "Occurernce.getOwnerCell()" ) METHOD_HEAD ( "Occurernce.getOwnerCell()" )
@ -152,7 +152,7 @@ extern "C" {
static PyObject* PyOccurrence_getMasterCell ( PyOccurrence *self ) static PyObject* PyOccurrence_getMasterCell ( PyOccurrence *self )
{ {
cdebug.log(20) << "PyOccurrence_getMasterCell()" << endl; cdebug_log(20,0) << "PyOccurrence_getMasterCell()" << endl;
METHOD_HEAD ( "Occurrence.getMasterCell()" ) METHOD_HEAD ( "Occurrence.getMasterCell()" )
@ -171,7 +171,7 @@ extern "C" {
static PyObject* PyOccurrence_getPath ( PyOccurrence *self ) static PyObject* PyOccurrence_getPath ( PyOccurrence *self )
{ {
cdebug.log(20) << "PyOccurrence_getPath ()" << endl; cdebug_log(20,0) << "PyOccurrence_getPath ()" << endl;
METHOD_HEAD ( "Occurrence.getPath()" ) METHOD_HEAD ( "Occurrence.getPath()" )
@ -197,7 +197,7 @@ extern "C" {
static PyObject* PyOccurrence_getBoundingBox ( PyOccurrence *self ) static PyObject* PyOccurrence_getBoundingBox ( PyOccurrence *self )
{ {
cdebug.log(20) << "PyOccurrence_getBoundingBox ()" << endl; cdebug_log(20,0) << "PyOccurrence_getBoundingBox ()" << endl;
METHOD_HEAD ( "Occurrence.getBoundingBox()" ) METHOD_HEAD ( "Occurrence.getBoundingBox()" )

2
hurricane/src/isobar/PyOrientation.cpp
View File

@ -72,7 +72,7 @@ extern "C" {
DirectHashMethod(PyOrientation_Hash, PyOrientation) DirectHashMethod(PyOrientation_Hash, PyOrientation)
extern void PyOrientation_LinkPyType() { extern void PyOrientation_LinkPyType() {
cdebug.log(20) << "PyOrientation_LinkType()" << endl; cdebug_log(20,0) << "PyOrientation_LinkType()" << endl;
PyTypeOrientation.tp_dealloc = (destructor) PyOrientation_DeAlloc; PyTypeOrientation.tp_dealloc = (destructor) PyOrientation_DeAlloc;
PyTypeOrientation.tp_compare = (cmpfunc) PyOrientation_Cmp; PyTypeOrientation.tp_compare = (cmpfunc) PyOrientation_Cmp;
PyTypeOrientation.tp_repr = (reprfunc) PyOrientation_Repr; PyTypeOrientation.tp_repr = (reprfunc) PyOrientation_Repr;

8
hurricane/src/isobar/PyPad.cpp
View File

@ -57,7 +57,7 @@ extern "C" {
// Attribute Method : "PyPad_create ()" // Attribute Method : "PyPad_create ()"
static PyObject* PyPad_create ( PyObject*, PyObject *args ) { static PyObject* PyPad_create ( PyObject*, PyObject *args ) {
cdebug.log(20) << "PyPad_create()" << endl; cdebug_log(20,0) << "PyPad_create()" << endl;
PyObject* arg0; PyObject* arg0;
PyObject* arg1; PyObject* arg1;
@ -91,7 +91,7 @@ extern "C" {
// Attribute Method : "PyPad_getBoundingBox ()" // Attribute Method : "PyPad_getBoundingBox ()"
static PyObject* PyPad_getBoundingBox( PyPad *self ) { static PyObject* PyPad_getBoundingBox( PyPad *self ) {
cdebug.log(20) << "PyPad_getBoundingBox()" << endl; cdebug_log(20,0) << "PyPad_getBoundingBox()" << endl;
METHOD_HEAD ( "Pad.BoundingBox()" ) METHOD_HEAD ( "Pad.BoundingBox()" )
@ -109,7 +109,7 @@ extern "C" {
// Attribute Method : "PyPad_setBoudingBox()" // Attribute Method : "PyPad_setBoudingBox()"
static PyObject* PyPad_setBoundingBox(PyPad *self, PyObject* args) { static PyObject* PyPad_setBoundingBox(PyPad *self, PyObject* args) {
cdebug.log(20) << "Pad.setBoudingBox()" << endl; cdebug_log(20,0) << "Pad.setBoudingBox()" << endl;
HTRY HTRY
METHOD_HEAD ( "Pad.setBoudingBox()" ) METHOD_HEAD ( "Pad.setBoudingBox()" )
@ -129,7 +129,7 @@ extern "C" {
// Attribute Method : "PyPad_translate ()" // Attribute Method : "PyPad_translate ()"
static PyObject* PyPad_translate ( PyPad *self, PyObject* args ) { static PyObject* PyPad_translate ( PyPad *self, PyObject* args ) {
cdebug.log(20) << "PyPad_translate ()" << endl; cdebug_log(20,0) << "PyPad_translate ()" << endl;
HTRY HTRY
METHOD_HEAD ( "Pad.translate()" ) METHOD_HEAD ( "Pad.translate()" )

20
hurricane/src/isobar/PyPath.cpp
View File

@ -58,7 +58,7 @@ extern "C" {
// Attribute Method : "PyPath_NEW ()" // Attribute Method : "PyPath_NEW ()"
static PyObject* PyPath_NEW ( PyObject *module, PyObject *args ) { static PyObject* PyPath_NEW ( PyObject *module, PyObject *args ) {
cdebug.log(20) << "PyPath_NEW()" << endl; cdebug_log(20,0) << "PyPath_NEW()" << endl;
Path* path = NULL; Path* path = NULL;
PyObject* arg0 = NULL; PyObject* arg0 = NULL;
@ -102,7 +102,7 @@ extern "C" {
static int PyPath_Init ( PyPath* self, PyObject* args, PyObject* kwargs ) static int PyPath_Init ( PyPath* self, PyObject* args, PyObject* kwargs )
{ {
cdebug.log(20) << "PyPath_Init(): " << (void*)self << endl; cdebug_log(20,0) << "PyPath_Init(): " << (void*)self << endl;
return 0; return 0;
} }
@ -111,7 +111,7 @@ extern "C" {
// Attribute Method : "PyPath_getHeadInstance ()" // Attribute Method : "PyPath_getHeadInstance ()"
static PyObject* PyPath_getHeadInstance ( PyPath *self ) { static PyObject* PyPath_getHeadInstance ( PyPath *self ) {
cdebug.log(20) << "PyPath_getHeadInstance()" << endl; cdebug_log(20,0) << "PyPath_getHeadInstance()" << endl;
METHOD_HEAD ( "Path.getHeadInstance()" ) METHOD_HEAD ( "Path.getHeadInstance()" )
@ -129,7 +129,7 @@ extern "C" {
// Attribute Method : "PyPath_getTailInstance ()" // Attribute Method : "PyPath_getTailInstance ()"
static PyObject* PyPath_getTailInstance ( PyPath *self ) { static PyObject* PyPath_getTailInstance ( PyPath *self ) {
cdebug.log(20) << "PyPath_getTailInstance()" << endl; cdebug_log(20,0) << "PyPath_getTailInstance()" << endl;
METHOD_HEAD ( "Path.getTailInstance()" ) METHOD_HEAD ( "Path.getTailInstance()" )
@ -147,7 +147,7 @@ extern "C" {
// Attribute Method : "PyPath_getOwnerCell ()" // Attribute Method : "PyPath_getOwnerCell ()"
static PyObject* PyPath_getOwnerCell ( PyPath *self ) { static PyObject* PyPath_getOwnerCell ( PyPath *self ) {
cdebug.log(20) << "PyPath_getOwnerCell()" << endl; cdebug_log(20,0) << "PyPath_getOwnerCell()" << endl;
METHOD_HEAD ( "Path.getOwnerCell()" ) METHOD_HEAD ( "Path.getOwnerCell()" )
@ -165,7 +165,7 @@ extern "C" {
// Attribute Method : "PyPath_getMasterCell ()" // Attribute Method : "PyPath_getMasterCell ()"
static PyObject* PyPath_getMasterCell ( PyPath *self ) { static PyObject* PyPath_getMasterCell ( PyPath *self ) {
cdebug.log(20) << "PyPath_getMasterCell()" << endl; cdebug_log(20,0) << "PyPath_getMasterCell()" << endl;
METHOD_HEAD ( "Path.getMasterCell()" ) METHOD_HEAD ( "Path.getMasterCell()" )
@ -190,7 +190,7 @@ extern "C" {
static PyObject* PyPath_getHeadPath ( PyPath *self ) { static PyObject* PyPath_getHeadPath ( PyPath *self ) {
cdebug.log(20) << "PyPath_getHeadPath ()" << endl; cdebug_log(20,0) << "PyPath_getHeadPath ()" << endl;
METHOD_HEAD ( "Path.getHeadPath()" ) METHOD_HEAD ( "Path.getHeadPath()" )
@ -211,7 +211,7 @@ extern "C" {
static PyObject* PyPath_getTailPath ( PyPath *self ) static PyObject* PyPath_getTailPath ( PyPath *self )
{ {
cdebug.log(20) << "PyPath_getTailPath ()" << endl; cdebug_log(20,0) << "PyPath_getTailPath ()" << endl;
METHOD_HEAD ( "Path.getTailPath()" ) METHOD_HEAD ( "Path.getTailPath()" )
@ -231,7 +231,7 @@ extern "C" {
static PyObject* PyPath_getTransformation ( PyPath *self, PyObject* args ) static PyObject* PyPath_getTransformation ( PyPath *self, PyObject* args )
{ {
cdebug.log(20) << "PyPath_getTransformation ()" << endl; cdebug_log(20,0) << "PyPath_getTransformation ()" << endl;
METHOD_HEAD ( "Instance.getTransformation()" ); METHOD_HEAD ( "Instance.getTransformation()" );
@ -263,7 +263,7 @@ extern "C" {
static PyObject* PyPath_getInstances(PyPath *self) { static PyObject* PyPath_getInstances(PyPath *self) {
cdebug.log(20) << "PyPath_getInstances()" << endl; cdebug_log(20,0) << "PyPath_getInstances()" << endl;
METHOD_HEAD ( "Path.getInstances()" ) METHOD_HEAD ( "Path.getInstances()" )

4
hurricane/src/isobar/PyPin.cpp
View File

@ -79,7 +79,7 @@ extern "C" {
HTRY HTRY
cdebug.log(20) << "PyPin_create()" << endl; cdebug_log(20,0) << "PyPin_create()" << endl;
PyObject* arg0; PyObject* arg0;
PyObject* arg1; PyObject* arg1;
PyObject* arg2; PyObject* arg2;
@ -152,7 +152,7 @@ extern "C" {
// Standart Accessors (Attributes). // Standart Accessors (Attributes).
PyObject* PyPin_getAccessDirection( PyPin* self ) { PyObject* PyPin_getAccessDirection( PyPin* self ) {
cdebug.log(20) << "PyNet_getAccessDirection ()" << endl; cdebug_log(20,0) << "PyNet_getAccessDirection ()" << endl;
METHOD_HEAD ( "Net.getAccessDirection()" ) METHOD_HEAD ( "Net.getAccessDirection()" )

2
hurricane/src/isobar/PyPinDirection.cpp
View File

@ -68,7 +68,7 @@ extern "C" {
DirectHashMethod(PyPinDirection_Hash, PyPinDirection) DirectHashMethod(PyPinDirection_Hash, PyPinDirection)
extern void PyPinDirection_LinkPyType() { extern void PyPinDirection_LinkPyType() {
cdebug.log(20) << "PyPinDirection_LinkType()" << endl; cdebug_log(20,0) << "PyPinDirection_LinkType()" << endl;
PyTypePinDirection.tp_dealloc = (destructor) PyPinDirection_DeAlloc; PyTypePinDirection.tp_dealloc = (destructor) PyPinDirection_DeAlloc;
PyTypePinDirection.tp_compare = (cmpfunc) PyPinDirection_Cmp; PyTypePinDirection.tp_compare = (cmpfunc) PyPinDirection_Cmp;
PyTypePinDirection.tp_repr = (reprfunc) PyPinDirection_Repr; PyTypePinDirection.tp_repr = (reprfunc) PyPinDirection_Repr;

2
hurricane/src/isobar/PyPinPlacementStatus.cpp
View File

@ -68,7 +68,7 @@ extern "C" {
DirectHashMethod(PyPinPlacementStatus_Hash, PyPinPlacementStatus) DirectHashMethod(PyPinPlacementStatus_Hash, PyPinPlacementStatus)
extern void PyPinPlacementStatus_LinkPyType() { extern void PyPinPlacementStatus_LinkPyType() {
cdebug.log(20) << "PyPinPlacementStatus_LinkType()" << endl; cdebug_log(20,0) << "PyPinPlacementStatus_LinkType()" << endl;
PyTypePinPlacementStatus.tp_dealloc = (destructor) PyPinPlacementStatus_DeAlloc; PyTypePinPlacementStatus.tp_dealloc = (destructor) PyPinPlacementStatus_DeAlloc;
PyTypePinPlacementStatus.tp_compare = (cmpfunc) PyPinPlacementStatus_Cmp; PyTypePinPlacementStatus.tp_compare = (cmpfunc) PyPinPlacementStatus_Cmp;
PyTypePinPlacementStatus.tp_repr = (reprfunc) PyPinPlacementStatus_Repr; PyTypePinPlacementStatus.tp_repr = (reprfunc) PyPinPlacementStatus_Repr;

2
hurricane/src/isobar/PyPlacementStatus.cpp
View File

@ -72,7 +72,7 @@ extern "C" {
DirectHashMethod(PyPlacementStatus_Hash, PyPlacementStatus) DirectHashMethod(PyPlacementStatus_Hash, PyPlacementStatus)
extern void PyPlacementStatus_LinkPyType() { extern void PyPlacementStatus_LinkPyType() {
cdebug.log(20) << "PyPlacementStatus_LinkType()" << endl; cdebug_log(20,0) << "PyPlacementStatus_LinkType()" << endl;
PyTypePlacementStatus.tp_dealloc = (destructor) PyPlacementStatus_DeAlloc; PyTypePlacementStatus.tp_dealloc = (destructor) PyPlacementStatus_DeAlloc;
PyTypePlacementStatus.tp_compare = (cmpfunc) PyPlacementStatus_Cmp; PyTypePlacementStatus.tp_compare = (cmpfunc) PyPlacementStatus_Cmp;
PyTypePlacementStatus.tp_repr = (reprfunc) PyPlacementStatus_Repr; PyTypePlacementStatus.tp_repr = (reprfunc) PyPlacementStatus_Repr;

8
hurricane/src/isobar/PyPlug.cpp
View File

@ -94,7 +94,7 @@ extern "C" {
static PyObject* PyPlug_getInstance ( PyPlug *self ) static PyObject* PyPlug_getInstance ( PyPlug *self )
{ {
cdebug.log(20) << "PyPlug_getInstance ()" << endl; cdebug_log(20,0) << "PyPlug_getInstance ()" << endl;
Instance* instance = NULL; Instance* instance = NULL;
@ -112,7 +112,7 @@ extern "C" {
static PyObject* PyPlug_getMasterNet ( PyPlug *self ) static PyObject* PyPlug_getMasterNet ( PyPlug *self )
{ {
cdebug.log(20) << "PyPlug_getMasterNet ()" << endl; cdebug_log(20,0) << "PyPlug_getMasterNet ()" << endl;
Net* net = NULL; Net* net = NULL;
@ -130,7 +130,7 @@ extern "C" {
// Attribute Method : "PyPlug_getNet ()" // Attribute Method : "PyPlug_getNet ()"
static PyObject* PyPlug_getNet ( PyPlug *self ) { static PyObject* PyPlug_getNet ( PyPlug *self ) {
cdebug.log(20) << "PyPlug_getNet ()" << endl; cdebug_log(20,0) << "PyPlug_getNet ()" << endl;
Net* net = NULL; Net* net = NULL;
@ -149,7 +149,7 @@ extern "C" {
// Attribute Method : "PyPlug_setNet ()" // Attribute Method : "PyPlug_setNet ()"
static PyObject* PyPlug_setNet ( PyPlug *self, PyObject* args ) { static PyObject* PyPlug_setNet ( PyPlug *self, PyObject* args ) {
cdebug.log(20) << "PyPlug_setNet()" << endl; cdebug_log(20,0) << "PyPlug_setNet()" << endl;
HTRY HTRY

6
hurricane/src/isobar/PyPoint.cpp
View File

@ -44,7 +44,7 @@ extern "C" {
static PyObject* PyPoint_NEW ( PyObject* module, PyObject *args ) static PyObject* PyPoint_NEW ( PyObject* module, PyObject *args )
{ {
cdebug.log(20) << "PyPoint_NEW()" << endl; cdebug_log(20,0) << "PyPoint_NEW()" << endl;
Point* point; Point* point;
PyObject* arg0; PyObject* arg0;
@ -81,7 +81,7 @@ extern "C" {
static int PyPoint_Init ( PyPoint* self, PyObject* args, PyObject* kwargs ) static int PyPoint_Init ( PyPoint* self, PyObject* args, PyObject* kwargs )
{ {
cdebug.log(20) << "PyPoint_Init(): " << (void*)self << endl; cdebug_log(20,0) << "PyPoint_Init(): " << (void*)self << endl;
return 0; return 0;
} }
@ -91,7 +91,7 @@ extern "C" {
static PyObject* PyPoint_Translate ( PyPoint *self, PyObject* args ) static PyObject* PyPoint_Translate ( PyPoint *self, PyObject* args )
{ {
cdebug.log(20) << "PyPoint_Translate()" << endl; cdebug_log(20,0) << "PyPoint_Translate()" << endl;
HTRY HTRY

30
hurricane/src/isobar/PyQuery.cpp
View File

@ -131,7 +131,7 @@ extern "C" {
static PyObject* PyQuery_getMasterCell ( PyQuery *self ) { static PyObject* PyQuery_getMasterCell ( PyQuery *self ) {
cdebug.log(20) << "PyQuery.getMasterCell()" << endl; cdebug_log(20,0) << "PyQuery.getMasterCell()" << endl;
Cell* cell = NULL; Cell* cell = NULL;
@ -145,7 +145,7 @@ extern "C" {
static PyObject* PyQuery_getInstance ( PyQuery *self ) { static PyObject* PyQuery_getInstance ( PyQuery *self ) {
cdebug.log(20) << "PyQuery.getInstance()" << endl; cdebug_log(20,0) << "PyQuery.getInstance()" << endl;
Instance* instance = NULL; Instance* instance = NULL;
@ -160,7 +160,7 @@ extern "C" {
static PyObject* PyQuery_getPath ( PyQuery *self ) static PyObject* PyQuery_getPath ( PyQuery *self )
{ {
cdebug.log(20) << "PyQuery_getPath ()" << endl; cdebug_log(20,0) << "PyQuery_getPath ()" << endl;
METHOD_HEAD( "PyQuery.getPath()" ) METHOD_HEAD( "PyQuery.getPath()" )
@ -177,7 +177,7 @@ extern "C" {
static PyObject* PyQuery_getTransformation ( PyQuery *self ) static PyObject* PyQuery_getTransformation ( PyQuery *self )
{ {
cdebug.log(20) << "PyQuery_getTransformation ()" << endl; cdebug_log(20,0) << "PyQuery_getTransformation ()" << endl;
METHOD_HEAD( "PyQuery.getTransformation()" ) METHOD_HEAD( "PyQuery.getTransformation()" )
@ -194,7 +194,7 @@ extern "C" {
static PyObject* PyQuery_setCell ( PyQuery* self, PyObject* args ) static PyObject* PyQuery_setCell ( PyQuery* self, PyObject* args )
{ {
cdebug.log(20) << "PyQuery.setCell()" << endl; cdebug_log(20,0) << "PyQuery.setCell()" << endl;
METHOD_HEAD("PyQuery.setCell()") METHOD_HEAD("PyQuery.setCell()")
HTRY HTRY
@ -217,7 +217,7 @@ extern "C" {
static PyObject* PyQuery_setFilter ( PyQuery* self, PyObject* args ) static PyObject* PyQuery_setFilter ( PyQuery* self, PyObject* args )
{ {
cdebug.log(20) << "PyQuery.setFilter()" << endl; cdebug_log(20,0) << "PyQuery.setFilter()" << endl;
METHOD_HEAD("PyQuery.setFilter()") METHOD_HEAD("PyQuery.setFilter()")
HTRY HTRY
@ -235,7 +235,7 @@ extern "C" {
static PyObject* PyQuery_setArea ( PyQuery* self, PyObject* args ) static PyObject* PyQuery_setArea ( PyQuery* self, PyObject* args )
{ {
cdebug.log(20) << "PyQuery.setArea()" << endl; cdebug_log(20,0) << "PyQuery.setArea()" << endl;
METHOD_HEAD("PyQuery.setArea()") METHOD_HEAD("PyQuery.setArea()")
HTRY HTRY
@ -258,7 +258,7 @@ extern "C" {
static PyObject* PyQuery_setTransformation ( PyQuery* self, PyObject* args ) static PyObject* PyQuery_setTransformation ( PyQuery* self, PyObject* args )
{ {
cdebug.log(20) << "PyQuery.setTransformation()" << endl; cdebug_log(20,0) << "PyQuery.setTransformation()" << endl;
METHOD_HEAD("PyQuery.setTransformation()") METHOD_HEAD("PyQuery.setTransformation()")
HTRY HTRY
@ -281,7 +281,7 @@ extern "C" {
static PyObject* PyQuery_setBasicLayer ( PyQuery* self, PyObject* args ) static PyObject* PyQuery_setBasicLayer ( PyQuery* self, PyObject* args )
{ {
cdebug.log(20) << "PyQuery.setBasicLayer()" << endl; cdebug_log(20,0) << "PyQuery.setBasicLayer()" << endl;
METHOD_HEAD("PyQuery.setBasicLayer()") METHOD_HEAD("PyQuery.setBasicLayer()")
HTRY HTRY
@ -304,7 +304,7 @@ extern "C" {
static PyObject* PyQuery_setMasterCellCallback ( PyQuery* self, PyObject* args ) static PyObject* PyQuery_setMasterCellCallback ( PyQuery* self, PyObject* args )
{ {
cdebug.log(20) << "PyQuery.setMasterCellCallback()" << endl; cdebug_log(20,0) << "PyQuery.setMasterCellCallback()" << endl;
METHOD_HEAD("PyQuery.setMasterCellCallback()") METHOD_HEAD("PyQuery.setMasterCellCallback()")
HTRY HTRY
@ -327,7 +327,7 @@ extern "C" {
static PyObject* PyQuery_setGoCallback ( PyQuery* self, PyObject* args ) static PyObject* PyQuery_setGoCallback ( PyQuery* self, PyObject* args )
{ {
cdebug.log(20) << "PyQuery.setGoCallback()" << endl; cdebug_log(20,0) << "PyQuery.setGoCallback()" << endl;
METHOD_HEAD("PyQuery.setGoCallback()") METHOD_HEAD("PyQuery.setGoCallback()")
HTRY HTRY
@ -350,7 +350,7 @@ extern "C" {
static PyObject* PyQuery_setMarkerCallback ( PyQuery* self, PyObject* args ) static PyObject* PyQuery_setMarkerCallback ( PyQuery* self, PyObject* args )
{ {
cdebug.log(20) << "PyQuery.setMarkerCallback()" << endl; cdebug_log(20,0) << "PyQuery.setMarkerCallback()" << endl;
METHOD_HEAD("PyQuery.setMarkerCallback()") METHOD_HEAD("PyQuery.setMarkerCallback()")
HTRY HTRY
@ -373,7 +373,7 @@ extern "C" {
static PyObject* PyQuery_setRubberCallback ( PyQuery* self, PyObject* args ) static PyObject* PyQuery_setRubberCallback ( PyQuery* self, PyObject* args )
{ {
cdebug.log(20) << "PyQuery.setRubberCallback()" << endl; cdebug_log(20,0) << "PyQuery.setRubberCallback()" << endl;
METHOD_HEAD("PyQuery.setRubberCallback()") METHOD_HEAD("PyQuery.setRubberCallback()")
HTRY HTRY
@ -396,7 +396,7 @@ extern "C" {
static PyObject* PyQuery_setExtensionGoCallback ( PyQuery* self, PyObject* args ) static PyObject* PyQuery_setExtensionGoCallback ( PyQuery* self, PyObject* args )
{ {
cdebug.log(20) << "PyQuery.setExtensionGoCallback()" << endl; cdebug_log(20,0) << "PyQuery.setExtensionGoCallback()" << endl;
METHOD_HEAD("PyQuery.setExtensionGoCallback()") METHOD_HEAD("PyQuery.setExtensionGoCallback()")
HTRY HTRY
@ -419,7 +419,7 @@ extern "C" {
PyObject* PyQuery_NEW ( PyObject* module, PyObject* args ) PyObject* PyQuery_NEW ( PyObject* module, PyObject* args )
{ {
cdebug.log(20) << "PyQuery.new()" << endl; cdebug_log(20,0) << "PyQuery.new()" << endl;
BaseQuery* query = NULL; BaseQuery* query = NULL;
PyQuery* pyQuery = NULL; PyQuery* pyQuery = NULL;

6
hurricane/src/isobar/PyQueryMask.cpp
View File

@ -106,7 +106,7 @@ extern "C" {
static PyObject* PyQueryMask_new ( PyTypeObject* type, PyObject* args, PyObject* kwds ) static PyObject* PyQueryMask_new ( PyTypeObject* type, PyObject* args, PyObject* kwds )
{ {
cdebug.log(20) << "PyQueryMask_new()" << endl; cdebug_log(20,0) << "PyQueryMask_new()" << endl;
PyQueryMask* pyMask = (PyQueryMask*)type->tp_alloc(type,0); PyQueryMask* pyMask = (PyQueryMask*)type->tp_alloc(type,0);
@ -287,7 +287,7 @@ extern "C" {
static void PyQueryMask_DeAlloc ( PyQueryMask *self ) static void PyQueryMask_DeAlloc ( PyQueryMask *self )
{ {
cdebug.log(20) << "PyQueryMask_DeAlloc(" << hex << self << ") " << self->_object << endl; cdebug_log(20,0) << "PyQueryMask_DeAlloc(" << hex << self << ") " << self->_object << endl;
PyObject_DEL ( self ); PyObject_DEL ( self );
} }
@ -312,7 +312,7 @@ extern "C" {
extern void PyQueryMask_LinkPyType() extern void PyQueryMask_LinkPyType()
{ {
cdebug.log(20) << "PyQueryMask_LinkType()" << endl; cdebug_log(20,0) << "PyQueryMask_LinkType()" << endl;
PyTypeQueryMask.tp_new = PyQueryMask_new; PyTypeQueryMask.tp_new = PyQueryMask_new;
PyTypeQueryMask.tp_dealloc = (destructor) PyQueryMask_DeAlloc; PyTypeQueryMask.tp_dealloc = (destructor) PyQueryMask_DeAlloc;

Some files were not shown because too many files have changed in this diff Show More