Menu
▾
▴
[openorb-commits] CVS: TransactionService/src/main/org/openorb/ots/log package.html,NONE,1.1 LogTimer.java,1.6,1.7 Reader.java,1.6,1.7 Writer.java,1.7,1.8
|
From: Michael R. <mr...@us...> - 2002-08-30 14:21:52
|
Update of /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/log
In directory usw-pr-cvs1:/tmp/cvs-serv18603/src/main/org/openorb/ots/log
Modified Files:
LogTimer.java Reader.java Writer.java
Added Files:
package.html
Log Message:
Final checkstyle cleanups...
--- NEW FILE: package.html ---
<body>
<p>
Logging classes for the OTS.
</p>
</body>
Index: LogTimer.java
===================================================================
RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/log/LogTimer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- LogTimer.java 29 Aug 2002 12:55:52 -0000 1.6
+++ LogTimer.java 30 Aug 2002 14:21:49 -0000 1.7
@@ -61,7 +61,7 @@
// If day is ok, change log
//
if ( time_ok )
- org.openorb.ots.log.Writer.out.changeLog();
+ org.openorb.ots.log.Writer.getOut().changeLog();
}
}
Index: Reader.java
===================================================================
RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/log/Reader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Reader.java 30 Aug 2002 10:07:36 -0000 1.6
+++ Reader.java 30 Aug 2002 14:21:49 -0000 1.7
@@ -18,56 +18,56 @@
/**
* Log kind
*/
- private final int TR_BEGIN = 0;
- private final int TR_COMMIT_END = 1;
- private final int TR_ROLLBACK_BEGIN = 2;
- private final int TR_ROLLBACK_END = 3;
- private final int TR_COMMIT_BEGIN = 4;
- private final int TR_COMMIT_ONE_BEGIN = 5;
- private final int TR_ROLLBACK_RESOURCE = 6;
- private final int TR_PREPARE_RESOURCE = 7;
[...1538 lines suppressed...]
- _log.readUTF();
+ m_log.readUTF();
break;
case TR_UNCOMPLETED :
- _log.readUTF();
+ m_log.readUTF();
break;
}
@@ -1401,7 +1405,7 @@
{
try
{
- if ( _log.getFilePointer() == _log.length() )
+ if ( m_log.getFilePointer() == m_log.length() )
return true;
}
catch ( java.io.IOException ex )
Index: Writer.java
===================================================================
RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/log/Writer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Writer.java 30 Aug 2002 10:07:36 -0000 1.7
+++ Writer.java 30 Aug 2002 14:21:49 -0000 1.8
@@ -18,64 +18,70 @@
/**
* Log kind
*/
- private final int TR_BEGIN = 0;
- private final int TR_COMMIT_END = 1;
- private final int TR_ROLLBACK_BEGIN = 2;
- private final int TR_ROLLBACK_END = 3;
- private final int TR_COMMIT_BEGIN = 4;
- private final int TR_COMMIT_ONE_BEGIN = 5;
- private final int TR_ROLLBACK_RESOURCE = 6;
- private final int TR_PREPARE_RESOURCE = 7;
- private final int TR_PREPARE_BEGIN = 8;
- private final int TR_PREPARE_END = 9;
- private final int TR_REGISTER = 10;
- private final int TR_COMMIT_RESOURCE = 11;
- private final int TR_COMPLETED = 12;
- private final int TR_BEGIN_SUB = 13;
- private final int TR_RECOVERY = 14;
- private final int TR_PREVIOUS_LOG = 15;
- private final int TR_UNCOMPLETED = 16;
- private final int TR_ROLLBACK_ONLY = 17;
+ private static final int TR_BEGIN = 0;
+ private static final int TR_COMMIT_END = 1;
+ private static final int TR_ROLLBACK_BEGIN = 2;
+ private static final int TR_ROLLBACK_END = 3;
+ private static final int TR_COMMIT_BEGIN = 4;
+ private static final int TR_COMMIT_ONE_BEGIN = 5;
+ private static final int TR_ROLLBACK_RESOURCE = 6;
+ private static final int TR_PREPARE_RESOURCE = 7;
+ private static final int TR_PREPARE_BEGIN = 8;
+ private static final int TR_PREPARE_END = 9;
+ private static final int TR_REGISTER = 10;
+ private static final int TR_COMMIT_RESOURCE = 11;
+ private static final int TR_COMPLETED = 12;
+ private static final int TR_BEGIN_SUB = 13;
+ private static final int TR_RECOVERY = 14;
+ private static final int TR_PREVIOUS_LOG = 15;
+ private static final int TR_UNCOMPLETED = 16;
+ private static final int TR_ROLLBACK_ONLY = 17;
/**
* An external access to writer
*/
- public static Writer out;
+ private static Writer s_out;
+ public static Writer getOut()
+ {
+ return s_out;
+ }
/**
* Reference to the ORB
*/
- private org.omg.CORBA.ORB _orb;
+ private org.omg.CORBA.ORB m_orb;
/**
* Reference to the output stream
*/
- private java.io.RandomAccessFile log;
+ private java.io.RandomAccessFile m_log;
/**
* Is log enable ?
*/
- private boolean _log_enable;
+ private boolean m_log_enable;
/**
* Previous log date
*/
- private int _date_month, _date_day, _date_year;
+ private int m_date_month;
+ private int m_date_day;
+ private int m_date_year;
/**
* Previous log name
*/
- private String _previous_log;
+ private String m_previous_log;
/**
* Constructor
*/
protected Writer( org.omg.CORBA.ORB orb, boolean recovery )
{
- _orb = orb;
- _log_enable = false;
+ m_orb = orb;
+ m_log_enable = false;
- org.openorb.CORBA.kernel.ORBLoader cfg = ( ( org.openorb.CORBA.ORB ) _orb ).getLoader();
+ org.openorb.CORBA.kernel.ORBLoader cfg = ( ( org.openorb.CORBA.ORB ) m_orb ).getLoader();
String logs = null;
try
@@ -84,7 +90,8 @@
}
catch ( org.openorb.CORBA.kernel.PropertyNotFoundException pnf )
{
- org.openorb.ots.Verbose.exception( "Writer", "Unable to find OTS.log.enable property", pnf );
+ org.openorb.ots.Verbose.exception( "Writer", "Unable to find OTS.log.enable property",
+ pnf );
}
if ( logs != null )
@@ -97,26 +104,28 @@
}
catch ( org.openorb.CORBA.kernel.PropertyNotFoundException pnf )
{
- org.openorb.ots.Verbose.exception( "Writer", "Unable to get the log directory", pnf );
+ org.openorb.ots.Verbose.exception( "Writer", "Unable to get the log directory",
+ pnf );
throw new org.omg.CORBA.INITIALIZE();
}
if ( logs == null )
{
- System.out.println( "OpenORB OTS fatal error : Unable to get the log directory" );
+ System.out.println( "OpenORB OTS fatal error :"
+ + " Unable to get the log directory" );
throw new org.omg.CORBA.INITIALIZE();
}
openLog( logs, recovery );
- _log_enable = true;
+ m_log_enable = true;
}
}
}
/**
- * This operation is used to open a log. It first try to open an existing log and if no log exist, it creates
- * a new one.
+ * This operation is used to open a log. It first try to open an existing log and
+ * if no log exist, it creates a new one.
*/
private void openLog( String directory, boolean recovery )
{
@@ -127,27 +136,28 @@
java.util.GregorianCalendar calendar = new java.util.GregorianCalendar();
- _date_month = calendar.get( calendar.MONTH ) + 1;
+ m_date_month = calendar.get( calendar.MONTH ) + 1;
- _date_day = calendar.get( calendar.DAY_OF_MONTH );
+ m_date_day = calendar.get( calendar.DAY_OF_MONTH );
- _date_year = calendar.get( calendar.YEAR );
+ m_date_year = calendar.get( calendar.YEAR );
- log_name = "openorb_ots_" + ( calendar.get( calendar.MONTH ) + 1 ) + "_" + calendar.get( calendar.DAY_OF_MONTH ) + "_" + calendar.get( calendar.YEAR ) + ".log";
+ log_name = "openorb_ots_" + ( calendar.get( calendar.MONTH ) + 1 ) + "_" + calendar.get(
+ calendar.DAY_OF_MONTH ) + "_" + calendar.get( calendar.YEAR ) + ".log";
try
{
boolean exist = new java.io.File( directory + log_name ).exists();
- _previous_log = directory + log_name;
+ m_previous_log = directory + log_name;
- log = new java.io.RandomAccessFile( directory + log_name, "rw" );
+ m_log = new java.io.RandomAccessFile( directory + log_name, "rw" );
if ( !recovery )
write_last_log( directory + log_name );
if ( exist )
- log.seek( log.length() );
+ m_log.seek( m_log.length() );
}
catch ( java.io.IOException ex )
{
@@ -161,7 +171,7 @@
//
// Now, starts the log timer
//
- org.openorb.ots.log.LogTimer timer = new org.openorb.ots.log.LogTimer( _date_day );
+ org.openorb.ots.log.LogTimer timer = new org.openorb.ots.log.LogTimer( m_date_day );
timer.setDaemon( true );
@@ -171,12 +181,12 @@
public void recovery_completed()
{
- write_last_log( _previous_log );
+ write_last_log( m_previous_log );
//
// Now, starts the log timer
//
- org.openorb.ots.log.LogTimer timer = new org.openorb.ots.log.LogTimer( _date_day );
+ org.openorb.ots.log.LogTimer timer = new org.openorb.ots.log.LogTimer( m_date_day );
timer.setDaemon( true );
@@ -193,16 +203,16 @@
*/
public void begin_transaction( org.openorb.ots.Impl.Control control )
{
- if ( !_log_enable )
+ if ( !m_log_enable )
return;
synchronized ( Writer.class )
{
- org.openorb.ots.Impl.XID xid = control.getCoordinator()._xid;
+ org.openorb.ots.Impl.XID xid = control.getCoordinator().getXID();
try
{
- log.writeInt( TR_BEGIN );
- log.writeUTF( xid.toString() );
+ m_log.writeInt( TR_BEGIN );
+ m_log.writeUTF( xid.toString() );
}
catch ( java.io.IOException ex )
{
@@ -222,16 +232,16 @@
*/
public void begin_transaction_sub( org.openorb.ots.Impl.Control control )
{
- if ( !_log_enable )
+ if ( !m_log_enable )
return;
synchronized ( Writer.class )
{
- org.openorb.ots.Impl.XID xid = control.getCoordinator()._xid;
+ org.openorb.ots.Impl.XID xid = control.getCoordinator().getXID();
try
{
- log.writeInt( TR_BEGIN_SUB );
- log.writeUTF( xid.toString() );
+ m_log.writeInt( TR_BEGIN_SUB );
+ m_log.writeUTF( xid.toString() );
}
catch ( java.io.IOException ex )
{
@@ -252,16 +262,16 @@
*/
public void rollback_only( org.openorb.ots.Impl.XID xid )
{
- if ( !_log_enable )
+ if ( !m_log_enable )
return ;
synchronized ( Writer.class )
{
try
{
- log.writeInt( TR_ROLLBACK_ONLY );
+ m_log.writeInt( TR_ROLLBACK_ONLY );
- log.writeUTF( xid.toString() );
+ m_log.writeUTF( xid.toString() );
}
catch ( java.io.IOException ex )
{
@@ -281,20 +291,21 @@
* xid : string
* resource : ior
*/
- public void register_resource( org.openorb.ots.Impl.XID xid, org.omg.CosTransactions.Resource resource )
+ public void register_resource( org.openorb.ots.Impl.XID xid,
+ org.omg.CosTransactions.Resource resource )
{
- if ( !_log_enable )
+ if ( !m_log_enable )
return ;
synchronized ( Writer.class )
{
try
{
- log.writeInt( TR_REGISTER );
+ m_log.writeInt( TR_REGISTER );
- log.writeUTF( xid.toString() );
+ m_log.writeUTF( xid.toString() );
- log.writeUTF( _orb.object_to_string( resource ) );
+ m_log.writeUTF( m_orb.object_to_string( resource ) );
}
catch ( java.io.IOException ex )
{
@@ -314,20 +325,21 @@
* xid : string
* resource : ior
*/
- public void commit_resource( org.openorb.ots.Impl.XID xid, org.omg.CosTransactions.Resource resource )
+ public void commit_resource( org.openorb.ots.Impl.XID xid,
+ org.omg.CosTransactions.Resource resource )
{
- if ( !_log_enable )
+ if ( !m_log_enable )
return ;
synchronized ( Writer.class )
{
try
{
- log.writeInt( TR_COMMIT_RESOURCE );
+ m_log.writeInt( TR_COMMIT_RESOURCE );
- log.writeUTF( xid.toString() );
+ m_log.writeUTF( xid.toString() );
- log.writeUTF( _orb.object_to_string( resource ) );
+ m_log.writeUTF( m_orb.object_to_string( resource ) );
}
catch ( java.io.IOException ex )
{
@@ -349,18 +361,18 @@
*/
public void commit_end( org.openorb.ots.Impl.XID xid, org.omg.CosTransactions.Status status )
{
- if ( !_log_enable )
+ if ( !m_log_enable )
return ;
synchronized ( Writer.class )
{
try
{
- log.writeInt( TR_COMMIT_END );
+ m_log.writeInt( TR_COMMIT_END );
- log.writeUTF( xid.toString() );
+ m_log.writeUTF( xid.toString() );
- log.writeInt( status.value() );
+ m_log.writeInt( status.value() );
}
catch ( java.io.IOException ex )
{
@@ -381,16 +393,16 @@
*/
public void commit_begin( org.openorb.ots.Impl.XID xid )
{
- if ( !_log_enable )
+ if ( !m_log_enable )
return ;
synchronized ( Writer.class )
{
try
{
- log.writeInt( TR_COMMIT_BEGIN );
+ m_log.writeInt( TR_COMMIT_BEGIN );
- log.writeUTF( xid.toString() );
+ m_log.writeUTF( xid.toString() );
}
catch ( java.io.IOException ex )
{
@@ -410,20 +422,21 @@
* xid : string
* resource : ior
*/
- public void commit_one_phase_begin( org.openorb.ots.Impl.XID xid, org.omg.CosTransactions.Resource resource )
+ public void commit_one_phase_begin( org.openorb.ots.Impl.XID xid,
+ org.omg.CosTransactions.Resource resource )
{
- if ( !_log_enable )
+ if ( !m_log_enable )
return ;
synchronized ( Writer.class )
{
try
{
- log.writeInt( TR_COMMIT_ONE_BEGIN );
+ m_log.writeInt( TR_COMMIT_ONE_BEGIN );
- log.writeUTF( xid.toString() );
+ m_log.writeUTF( xid.toString() );
- log.writeUTF( _orb.object_to_string( resource ) );
+ m_log.writeUTF( m_orb.object_to_string( resource ) );
}
catch ( java.io.IOException ex )
{
@@ -445,18 +458,18 @@
*/
public void rollback_end( org.openorb.ots.Impl.XID xid, org.omg.CosTransactions.Status status )
{
- if ( !_log_enable )
+ if ( !m_log_enable )
return ;
synchronized ( Writer.class )
{
try
{
- log.writeInt( TR_ROLLBACK_END );
+ m_log.writeInt( TR_ROLLBACK_END );
- log.writeUTF( xid.toString() );
+ m_log.writeUTF( xid.toString() );
- log.writeInt( status.value() );
+ m_log.writeInt( status.value() );
}
catch ( java.io.IOException ex )
{
@@ -476,16 +489,16 @@
*/
public void rollback_begin( org.openorb.ots.Impl.XID xid )
{
- if ( !_log_enable )
+ if ( !m_log_enable )
return ;
synchronized ( Writer.class )
{
try
{
- log.writeInt( TR_ROLLBACK_BEGIN );
+ m_log.writeInt( TR_ROLLBACK_BEGIN );
- log.writeUTF( xid.toString() );
+ m_log.writeUTF( xid.toString() );
}
catch ( java.io.IOException ex )
{
@@ -504,20 +517,21 @@
* xid : string
* resource : ior
*/
- public void rollback_resource( org.openorb.ots.Impl.XID xid, org.omg.CosTransactions.Resource resource )
+ public void rollback_resource( org.openorb.ots.Impl.XID xid,
+ org.omg.CosTransactions.Resource resource )
{
- if ( !_log_enable )
+ if ( !m_log_enable )
return ;
synchronized ( Writer.class )
{
try
{
- log.writeInt( TR_ROLLBACK_RESOURCE );
+ m_log.writeInt( TR_ROLLBACK_RESOURCE );
- log.writeUTF( xid.toString() );
+ m_log.writeUTF( xid.toString() );
- log.writeUTF( _orb.object_to_string( resource ) );
+ m_log.writeUTF( m_orb.object_to_string( resource ) );
}
catch ( java.io.IOException ex )
{
@@ -538,22 +552,23 @@
* resource : ior
* vote : int
*/
- public void prepare_resource( org.openorb.ots.Impl.XID xid, org.omg.CosTransactions.Resource resource, org.omg.CosTransactions.Vote vote )
+ public void prepare_resource( org.openorb.ots.Impl.XID xid,
+ org.omg.CosTransactions.Resource resource, org.omg.CosTransactions.Vote vote )
{
- if ( !_log_enable )
+ if ( !m_log_enable )
return ;
synchronized ( Writer.class )
{
try
{
- log.writeInt( TR_PREPARE_RESOURCE );
+ m_log.writeInt( TR_PREPARE_RESOURCE );
- log.writeUTF( xid.toString() );
+ m_log.writeUTF( xid.toString() );
- log.writeUTF( _orb.object_to_string( resource ) );
+ m_log.writeUTF( m_orb.object_to_string( resource ) );
- log.writeInt( vote.value() );
+ m_log.writeInt( vote.value() );
}
catch ( java.io.IOException ex )
{
@@ -573,16 +588,16 @@
*/
public void prepare_begin( org.openorb.ots.Impl.XID xid )
{
- if ( !_log_enable )
+ if ( !m_log_enable )
return ;
synchronized ( Writer.class )
{
try
{
- log.writeInt( TR_PREPARE_BEGIN );
+ m_log.writeInt( TR_PREPARE_BEGIN );
- log.writeUTF( xid.toString() );
+ m_log.writeUTF( xid.toString() );
}
catch ( java.io.IOException ex )
{
@@ -602,22 +617,23 @@
* status : int
* vote : int
*/
- public void prepare_end( org.openorb.ots.Impl.XID xid, org.omg.CosTransactions.Status status, org.omg.CosTransactions.Vote vote )
+ public void prepare_end( org.openorb.ots.Impl.XID xid, org.omg.CosTransactions.Status status,
+ org.omg.CosTransactions.Vote vote )
{
- if ( !_log_enable )
+ if ( !m_log_enable )
return ;
synchronized ( Writer.class )
{
try
{
- log.writeInt( TR_PREPARE_END );
+ m_log.writeInt( TR_PREPARE_END );
- log.writeUTF( xid.toString() );
+ m_log.writeUTF( xid.toString() );
- log.writeInt( status.value() );
+ m_log.writeInt( status.value() );
- log.writeInt( vote.value() );
+ m_log.writeInt( vote.value() );
}
catch ( java.io.IOException ex )
{
@@ -637,16 +653,16 @@
*/
public void completed( org.openorb.ots.Impl.XID xid )
{
- if ( !_log_enable )
+ if ( !m_log_enable )
return ;
synchronized ( Writer.class )
{
try
{
- log.writeInt( TR_COMPLETED );
+ m_log.writeInt( TR_COMPLETED );
- log.writeUTF( xid.toString() );
+ m_log.writeUTF( xid.toString() );
}
catch ( java.io.IOException ex )
{
@@ -666,16 +682,16 @@
*/
public void uncompleted( org.openorb.ots.Impl.XID xid )
{
- if ( !_log_enable )
+ if ( !m_log_enable )
return ;
synchronized ( Writer.class )
{
try
{
- log.writeInt( TR_UNCOMPLETED );
+ m_log.writeInt( TR_UNCOMPLETED );
- log.writeUTF( xid.toString() );
+ m_log.writeUTF( xid.toString() );
}
catch ( java.io.IOException ex )
{
@@ -685,7 +701,8 @@
}
/**
- * Add a log for a recovery. It means that everything above is no more needed for a next recovery
+ * Add a log for a recovery. It means that everything above is no more
+ * needed for a next recovery
*
* Log is :
*
@@ -693,14 +710,14 @@
*/
public void recovery()
{
- if ( !_log_enable )
+ if ( !m_log_enable )
return ;
synchronized ( Writer.class )
{
try
{
- log.writeInt( TR_RECOVERY );
+ m_log.writeInt( TR_RECOVERY );
}
catch ( java.io.IOException ex )
{
@@ -719,16 +736,16 @@
*/
public void previous_log( String previous_log_name )
{
- if ( !_log_enable )
+ if ( !m_log_enable )
return ;
synchronized ( Writer.class )
{
try
{
- log.writeInt( TR_PREVIOUS_LOG );
+ m_log.writeInt( TR_PREVIOUS_LOG );
- log.writeUTF( previous_log_name );
+ m_log.writeUTF( previous_log_name );
}
catch ( java.io.IOException ex )
{
@@ -742,7 +759,7 @@
*/
public void changeLog()
{
- if ( !_log_enable )
+ if ( !m_log_enable )
return ;
synchronized ( Writer.class )
@@ -752,12 +769,13 @@
//
// Close the current log
//
- log.close();
+ m_log.close();
//
// Get the log directory
//
- org.openorb.CORBA.kernel.ORBLoader cfg = ( ( org.openorb.CORBA.ORB ) _orb ).getLoader();
+ org.openorb.CORBA.kernel.ORBLoader cfg = ( ( org.openorb.CORBA.ORB )
+ m_orb ).getLoader();
String log_directory = null;
try
@@ -766,7 +784,8 @@
}
catch ( org.openorb.CORBA.kernel.PropertyNotFoundException pnf )
{
- org.openorb.ots.Verbose.exception( "Writer", "Unable to find OTS.log.directory property", pnf );
+ org.openorb.ots.Verbose.exception( "Writer",
+ "Unable to find OTS.log.directory property", pnf );
}
//
@@ -784,13 +803,13 @@
_day = calendar.get( calendar.DAY_OF_MONTH );
_year = calendar.get( calendar.YEAR );
- if ( _year > _date_year )
+ if ( _year > m_date_year )
date_ok = true;
else
- if ( _month > _date_month )
+ if ( _month > m_date_month )
date_ok = true;
else
- if ( _day > _date_day )
+ if ( _day > m_date_day )
date_ok = true;
else
{
@@ -811,18 +830,15 @@
//
// Look for uncompleted transactions
//
-
-
- org.openorb.ots.log.Reader reader = new org.openorb.ots.log.Reader( _previous_log, _orb );
-
+ org.openorb.ots.log.Reader reader = new org.openorb.ots.log.Reader(
+ m_previous_log, m_orb );
org.openorb.ots.Impl.XID [] xids = reader.uncompleted_transactions();
-
reader.close();
//
// Create the new log
//
- String _previous_log_name = _previous_log;
+ String _previous_log_name = m_previous_log;
openLog( log_directory, false );
@@ -852,7 +868,7 @@
*/
private void write_last_log( String last_log )
{
- org.openorb.CORBA.kernel.ORBLoader cfg = ( ( org.openorb.CORBA.ORB ) _orb ).getLoader();
+ org.openorb.CORBA.kernel.ORBLoader cfg = ( ( org.openorb.CORBA.ORB ) m_orb ).getLoader();
String directory = null;
try
@@ -861,7 +877,8 @@
}
catch ( org.openorb.CORBA.kernel.PropertyNotFoundException pnf )
{
- org.openorb.ots.Verbose.exception( "Writer", "Unable to find OTS.log.directory property", pnf );
+ org.openorb.ots.Verbose.exception( "Writer",
+ "Unable to find OTS.log.directory property", pnf );
}
if ( !directory.endsWith( java.io.File.separator ) )
@@ -886,6 +903,6 @@
public static void newWriter( org.omg.CORBA.ORB orb, boolean recovery )
{
- out = new Writer( orb, recovery );
+ s_out = new Writer( orb, recovery );
}
}
|