summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorThorsten Behrens <thb@documentfoundation.org>2015-02-13 17:02:58 +0100
committerThorsten Behrens <thb@documentfoundation.org>2015-02-14 00:46:15 +0100
commit3d403f2af2e5b7d26254d45590764f279450fab6 (patch)
treed0e295f3f915cb36f38ddc335109f77858491665 /sal
parent7f5a0495eb5579101f58d9fec10153486c91a40a (diff)
Related: tdf#63690 - remove rtl_logfile
This was unused since the earlier cleanup. Change-Id: Ia56641c4242037a0ce501e43939b8dc862499f0e
Diffstat (limited to 'sal')
-rw-r--r--sal/Library_sal.mk1
-rw-r--r--sal/inc/pch/precompiled_sal.hxx1
-rw-r--r--sal/osl/w32/module.cxx1
-rw-r--r--sal/qa/rtl/logfile/rtl_logfile.cxx233
-rw-r--r--sal/rtl/logfile.cxx227
-rw-r--r--sal/util/sal.map3
6 files changed, 0 insertions, 466 deletions
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 833ba6d92e0d..12b66dd76bea 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -99,7 +99,6 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
sal/rtl/digest \
sal/rtl/hash \
sal/rtl/locale \
- sal/rtl/logfile \
sal/rtl/math \
sal/rtl/random \
sal/rtl/rtl_process \
diff --git a/sal/inc/pch/precompiled_sal.hxx b/sal/inc/pch/precompiled_sal.hxx
index 1ac777dcf076..4e93245df8d7 100644
--- a/sal/inc/pch/precompiled_sal.hxx
+++ b/sal/inc/pch/precompiled_sal.hxx
@@ -90,7 +90,6 @@
#include <rtl/crc.h>
#include <rtl/digest.h>
#include <rtl/instance.hxx>
-#include <rtl/logfile.h>
#include <rtl/malformeduriexception.hxx>
#include <rtl/process.h>
#include <rtl/random.h>
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index 86a8c4be0816..ac4e21128cce 100644
--- a/sal/osl/w32/module.cxx
+++ b/sal/osl/w32/module.cxx
@@ -27,7 +27,6 @@
#include <osl/diagnose.h>
#include <osl/thread.h>
#include <osl/file.h>
-#include <rtl/logfile.h>
#include <vector>
/*
diff --git a/sal/qa/rtl/logfile/rtl_logfile.cxx b/sal/qa/rtl/logfile/rtl_logfile.cxx
deleted file mode 100644
index 374f9c3ca48b..000000000000
--- a/sal/qa/rtl/logfile/rtl_logfile.cxx
+++ /dev/null
@@ -1,233 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(UNX)
-# include <unistd.h>
-#endif
-
-#include <rtl/logfile.hxx>
-
-#include <osl/file.hxx>
-#if ( defined WNT ) // Windows
-#include <tchar.h>
-#endif
-
-#include <sal/types.h>
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
-
-using namespace ::osl;
-
-inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = "" )
-{
-
- if (strlen(msg) > 0)
- {
- printf("%s: ", msg );
- }
- rtl::OString aString;
- aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
- printf("%s\n", (char *)aString.getStr( ) );
-}
-
-/** get the absolute source file URL "file:///.../sal/qa/rtl/logfile/"
- */
-
-inline ::rtl::OUString getTempPath( void )
-{
-#ifdef UNX
- rtl::OUString suDirURL( "file:///tmp/" );
-#else /* Windows */
- rtl::OUString suDirURL( "file:///c:/temp/" );
-#endif
- return suDirURL;
-}
-
-/** if the file exist
- */
-bool t_fileExist(rtl::OUString const& _sFilename)
-{
- ::osl::FileBase::RC nError1;
- ::osl::File aTestFile( _sFilename );
- nError1 = aTestFile.open ( osl_File_OpenFlag_Read );
- if ( ( ::osl::FileBase::E_NOENT != nError1 ) && ( ::osl::FileBase::E_ACCES != nError1 ) )
- {
- aTestFile.close( );
- return true;
- }
- return false;
-}
-/** get Current PID.
-*/
-inline ::rtl::OUString getCurrentPID( )
-{
- //~ Get current PID and turn it into OUString;
- int nPID = 0;
-#ifdef WNT
- nPID = GetCurrentProcessId();
-#else
- nPID = getpid();
-#endif
- return ( ::rtl::OUString::valueOf( ( long )nPID ) );
-}
-
-/*
- * LLA:
- * check if logfile is create
- * be careful with relative logfiles they will create near the source, maybe it's no write access to it.
- * use absolute path to logfile instead.
- */
-namespace rtl_logfile
-{
- class logfile : public CppUnit::TestFixture
- {
- public:
-
- //directly call rtl_logfile_trace
- void logfile_001()
- {
-#ifdef SOLARIS
- putenv(const_cast< char * >("RTL_LOGFILE=/tmp/logfile1"));
-#endif
-#ifdef WNT
- putenv("RTL_LOGFILE=c:\\temp\\logfile1");
-#endif
-#ifdef LINUX
- setenv("RTL_LOGFILE", "/tmp/logfile1", 0);
-#endif
- rtl_logfile_trace("trace %d\n", 2 );
- rtl_logfile_trace("trace %d %d\n" , 1,2 );
- rtl_logfile_trace("trace %d %d %d\n" , 1 , 2 ,3 );
-
- rtl::OUString suFilePath = getTempPath();
- suFilePath += rtl::OUString("logfile1_") + getCurrentPID( );
- suFilePath += rtl::OUString(".log");
-
- ::osl::FileBase::RC nError1;
- ::osl::File aTestFile( suFilePath );
- printUString( suFilePath );
- nError1 = aTestFile.open ( osl_File_OpenFlag_Read );
- CPPUNIT_ASSERT_MESSAGE("create the log file: but the logfile does not exist",
- ( ::osl::FileBase::E_NOENT != nError1 ) &&
- ( ::osl::FileBase::E_ACCES != nError1 ) );
- sal_Char buffer_read[400];
- sal_uInt64 nCount_read;
- nError1 = aTestFile.read( buffer_read, 400, nCount_read );
- //printf("buffer is %s\n", buffer_read );
- CPPUNIT_ASSERT_MESSAGE("write right logs", strstr( buffer_read, "trace 1 2 3") != NULL );
- aTestFile.sync();
- aTestFile.close();
- /*// delete logfile on the disk
-
- nError1 = osl::File::remove( suFilePath );
- printError( nError1 );
- CPPUNIT_ASSERT_MESSAGE( "In deleteTestFile Function: remove ", ( ::osl::FileBase::E_None == nError1 ) || ( nError1 == ::osl::FileBase::E_NOENT ) );
- */
- }
- //Profiling output should only be generated for a special product version of OpenOffice
- // which is compiled with a defined preprocessor symbol 'TIMELOG'. Now, the symbol not defined
- void logfile_002()
- {
-#ifdef SOLARIS
- putenv(const_cast< char * >("RTL_LOGFILE=/tmp/logfile2"));
-#endif
-#ifdef WNT
- putenv("RTL_LOGFILE=c:\\temp\\logfile2");
-#endif
-#ifdef LINUX
- setenv("RTL_LOGFILE", "/tmp/logfile2", 0);
-#endif
- RTL_LOGFILE_TRACE( "trace the log" );
- RTL_LOGFILE_TRACE1( "trace %d" , 1 );
- RTL_LOGFILE_TRACE2( "trace %d %d" , 1,2 );
- RTL_LOGFILE_TRACE3( "trace %d %d %d" , 1 , 2 ,3 );
-// TODO: assertion test!
- }
-
- void logfile_003()
- {
-#ifdef SOLARIS
- putenv(const_cast< char * >("RTL_LOGFILE=/tmp/logfile2"));
-#endif
-#ifdef WNT
- putenv("RTL_LOGFILE=c:\\temp\\logfile2");
-#endif
-#ifdef LINUX
- setenv("RTL_LOGFILE", "/tmp/logfile2", 0);
-#endif
- RTL_LOGFILE_CONTEXT ( foo , "foo-function" );
- RTL_LOGFILE_CONTEXT_TRACE ( foo , "trace" );
- RTL_LOGFILE_CONTEXT_TRACE1 ( foo , "trace %d" , 1 );
- RTL_LOGFILE_CONTEXT_TRACE2 ( foo , "trace %d %d" , 1 , 2 );
- RTL_LOGFILE_CONTEXT_TRACE3 ( foo , "trace %d %d %d" , 1 , 2 , 3);
-// TODO: assertion test!
- }
-
- CPPUNIT_TEST_SUITE( logfile );
- CPPUNIT_TEST( logfile_001 );
- CPPUNIT_TEST( logfile_002 );
- CPPUNIT_TEST( logfile_003 );
- CPPUNIT_TEST_SUITE_END( );
- };
-
-} // namespace rtl_logfile
-
-CPPUNIT_TEST_SUITE_REGISTRATION( rtl_logfile::logfile);
-
-CPPUNIT_PLUGIN_IMPLEMENT();
-
-//~ do some clean up work after all test completed.
-class GlobalObject
-{
-public:
- ~GlobalObject()
- {
- try
- {
- printf( "\n#Do some clean-ups ... only delete logfile1_*.log here!\n" );
- rtl::OUString suFilePath = getTempPath();
- suFilePath += rtl::OUString("logfile1_") + getCurrentPID( );
- suFilePath += rtl::OUString(".log");
-
- //if ( ifFileExist( suFilePath ) == sal_True )
- ::osl::FileBase::RC nError1;
- nError1 = osl::File::remove( suFilePath );
-#ifdef WNT
- printf("Please remove logfile* manully! Error is Permision denied!");
-#endif
- }
- catch (const CppUnit::Exception &e)
- {
- printf("Exception caught in GlobalObject dtor(). Exception message: '%s'. Source line: %d\n", e.what(), e.sourceLine().lineNumber());
- }
- catch (...)
- {
- printf("Exception caught (...) in GlobalObject dtor()\n");
- }
- }
-};
-
-GlobalObject theGlobalObject;
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/logfile.cxx b/sal/rtl/logfile.cxx
deleted file mode 100644
index 637f2eb8640e..000000000000
--- a/sal/rtl/logfile.cxx
+++ /dev/null
@@ -1,227 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cstdarg>
-#include <cstdio>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include <rtl/logfile.h>
-#include <osl/process.h>
-#include <osl/time.h>
-#include <osl/mutex.hxx>
-#include <rtl/bootstrap.h>
-#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/alloc.h>
-#include <rtl/instance.hxx>
-#include <sal/log.hxx>
-#include "osl/thread.h"
-#include "osl/thread.hxx"
-
-#include <algorithm>
-
-#ifdef _MSC_VER
-#define vsnprintf _vsnprintf
-#endif
-
-using namespace osl;
-using namespace std;
-
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-
-namespace {
-
-OUString getFileUrl( const OUString &name )
-{
- OUString aRet;
- if ( osl_getFileURLFromSystemPath( name.pData, &aRet.pData )
- != osl_File_E_None )
- {
- SAL_WARN(
- "sal.rtl", "osl_getFileURLFromSystemPath failed for \"" << name << '"');
- }
-
- OUString aWorkingDirectory;
- osl_getProcessWorkingDir( &(aWorkingDirectory.pData) );
- osl_getAbsoluteFileURL( aWorkingDirectory.pData, aRet.pData, &(aRet.pData) );
-
- return aRet;
-}
-
-static const sal_Int32 g_BUFFERSIZE = 4096;
-
-struct Logger {
- oslFileHandle aFile;
- sal_Char *buffer;
- osl::Mutex mutex;
-
- Logger();
-
- ~Logger();
-};
-
-Logger::Logger(): aFile(0), buffer(0)
-{
- OUString name( "RTL_LOGFILE" );
- OUString value;
- if( rtl_bootstrap_get( name.pData, &value.pData, 0 ) )
- {
- // Obtain process id.
- oslProcessIdentifier aProcessId = 0;
- oslProcessInfo info;
- info.Size = sizeof (oslProcessInfo);
- if (osl_getProcessInfo (0, osl_Process_IDENTIFIER, &info) == osl_Process_E_None)
- aProcessId = info.Ident;
-
- // Construct name of log file and open the file.
- OUStringBuffer buf( 128 );
- buf.append( value );
-
- // if the filename ends with .nopid, the incoming filename is not modified
- if( value.getLength() < 6 /* ".nopid" */ ||
- rtl_ustr_ascii_compare_WithLength(
- value.getStr() + (value.getLength()-6) , 6 , ".nopid" ) )
- {
- buf.appendAscii( "_" );
- buf.append( (sal_Int32) aProcessId );
- buf.appendAscii( ".log" );
- }
-
- OUString o = getFileUrl( buf.makeStringAndClear() );
- oslFileError e = osl_openFile(
- o.pData, &aFile, osl_File_OpenFlag_Write|osl_File_OpenFlag_Create);
-
- if( osl_File_E_None == e )
- {
- TimeValue aCurrentTime;
- buffer = ( sal_Char * ) rtl_allocateMemory( g_BUFFERSIZE );
- sal_Int64 nConverted = 0;
- if (osl_getSystemTime (&aCurrentTime))
- {
- nConverted = (sal_Int64 ) sprintf (
- buffer,
- "opening log file %f seconds past January 1st 1970\n"
- "corresponding to %" SAL_PRIuUINT32 " ms after timer start\n",
- aCurrentTime.Seconds + 1e-9 * aCurrentTime.Nanosec,
- osl_getGlobalTimer());
-
- if( nConverted > 0 )
- {
- sal_uInt64 nWritten;
- osl_writeFile( aFile, buffer, nConverted , &nWritten );
- }
- }
-
- nConverted = sprintf (buffer, "Process id is %" SAL_PRIuUINT32 "\n", aProcessId);
- if( nConverted )
- {
- sal_uInt64 nWritten;
- osl_writeFile( aFile, buffer, nConverted, &nWritten );
- }
- }
- else
- {
- SAL_WARN(
- "sal.rtl",
- "Couldn't open logfile " << o << '(' << +e << ')');
- }
- }
-}
-
-Logger::~Logger()
-{
- if( buffer )
- {
- sal_Int64 nConverted =
- sprintf( buffer, "closing log file at %06" SAL_PRIuUINT32, osl_getGlobalTimer() );
- if( nConverted > 0 )
- {
- sal_uInt64 nWritten;
- osl_writeFile( aFile, buffer, nConverted, &nWritten );
- }
- osl_closeFile( aFile );
- rtl_freeMemory( buffer );
- }
-}
-
-struct theLogger: public rtl::Static<Logger, theLogger> {};
-
-}
-
-extern "C" void SAL_CALL rtl_logfile_trace ( const char *pszFormat, ... )
-{
- Logger & logger = theLogger::get();
- if( logger.buffer )
- {
- va_list args;
- va_start(args, pszFormat);
- {
- sal_Int64 nConverted;
- MutexGuard guard( logger.mutex );
- nConverted = vsnprintf( logger.buffer , g_BUFFERSIZE, pszFormat, args );
- nConverted = (nConverted > g_BUFFERSIZE ? g_BUFFERSIZE : nConverted );
- if( nConverted > 0 )
- {
- sal_uInt64 nWritten;
- osl_writeFile( logger.aFile, logger.buffer, nConverted, &nWritten );
- }
- }
- va_end(args);
- }
-}
-
-extern "C" void SAL_CALL rtl_logfile_longTrace(char const * format, ...) {
- Logger & logger = theLogger::get();
- if (logger.buffer != 0) {
- sal_uInt32 time = osl_getGlobalTimer();
- oslThreadIdentifier threadId = osl::Thread::getCurrentIdentifier();
- va_list args;
- va_start(args, format);
- {
- MutexGuard g(logger.mutex);
- int n1 = snprintf(
- logger.buffer, g_BUFFERSIZE, "%06" SAL_PRIuUINT32 " %" SAL_PRIuUINT32 " ", time, threadId);
- if (n1 >= 0) {
- sal_uInt64 n2;
- osl_writeFile(
- logger.aFile, logger.buffer,
- static_cast< sal_uInt64 >(
- std::min(n1, static_cast< int >(g_BUFFERSIZE))),
- &n2);
- n1 = vsnprintf(logger.buffer, g_BUFFERSIZE, format, args);
- if (n1 > 0) {
- osl_writeFile(
- logger.aFile, logger.buffer,
- static_cast< sal_uInt64 >(
- std::min(n1, static_cast< int >(g_BUFFERSIZE))),
- &n2);
- }
- }
- }
- va_end(args);
- }
-}
-
-extern "C" sal_Bool SAL_CALL rtl_logfile_hasLogFile( void ) {
- return theLogger::get().buffer != 0;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 6acd9c44470e..bca9c880e044 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -500,7 +500,6 @@ UDK_3_0_0 {
rtl_addUnloadingListener;
rtl_removeUnloadingListener;
- rtl_logfile_trace;
osl_getProcessLocale;
osl_setProcessLocale;
local:
@@ -546,7 +545,6 @@ UDK_3.3 {
osl_setCommandArgs;
rtl_uStringbuffer_insertUtf32;
rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths;
- rtl_logfile_longTrace;
rtl_ustr_asciil_reverseEquals_WithLength;
} UDK_3.2;
@@ -608,7 +606,6 @@ UDK_3.9 { # OOo 3.1
UDK_3.10 { # OOo 3.2
global:
- rtl_logfile_hasLogFile;
rtl_math_erf;
rtl_math_erfc;
rtl_math_asinh;