Skip to content

Commit

Permalink
Chore/pragma gcc cleansweep (#1226)
Browse files Browse the repository at this point in the history 
* Remove all GCC warning suppression pragmas.

* For Linux just just raise(SIGSEGV) as the crash driver. This has a much higher chance of the compiler understanding out intent and figuring out we end the program here.

* Remove -Wno-stringop-overflow and -Wno-stringop-truncation from GCC_WARNINGS. After calling raise(SIGSEGV) as the crash driver I saw no issue with those warnings anymore

After removing thoses GCC pragmas there is also no need for clang -Wno-unknown-warning-option anymore.

* Remove CMakePresets from this PR.

* Remove Lindens from comments :)
  • Loading branch information
@Nicky-D
Nicky-D committed Apr 15, 2024
1 parent 295cff0 commit 8f0c41c
Show file tree
Hide file tree
Showing 6 changed files with 265 additions and 274 deletions.
3 changes: 0 additions & 3 deletions indra/cmake/00-Common.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,10 @@ if (LINUX)
set(CLANG_WARNINGS
${GCC_CLANG_COMPATIBLE_WARNINGS}
# Put clang specific warning configuration here
-Wno-unknown-warning-option
)

set(GCC_WARNINGS
${GCC_CLANG_COMPATIBLE_WARNINGS}
-Wno-stringop-overflow
-Wno-stringop-truncation
-Wno-dangling-pointer
)

Expand Down
103 changes: 57 additions & 46 deletions indra/llcommon/llerror.h
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
/**
/**
* @file llerror.h
* @date December 2006
* @brief error message system
*
* $LicenseInfo:firstyear=2006&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
*
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
Expand Down Expand Up @@ -95,6 +95,11 @@ const int LL_ERR_NOERR = 0;
#define LL_STATIC_ASSERT(func, msg) static_assert(func, msg)
#define LL_BAD_TEMPLATE_INSTANTIATION(type, msg) static_assert(false, msg)
#else
#if LL_LINUX
// We need access to raise and SIGSEGV
#include <signal.h>
#endif

#define LL_STATIC_ASSERT(func, msg) BOOST_STATIC_ASSERT(func)
#define LL_BAD_TEMPLATE_INSTANTIATION(type, msg) BOOST_STATIC_ASSERT(sizeof(type) != 0 && false);
#endif
Expand All @@ -103,58 +108,58 @@ const int LL_ERR_NOERR = 0;
/** Error Logging Facility
Information for most users:
Code can log messages with constructions like this:
LL_INFOS("StringTag") << "request to fizzbip agent " << agent_id
<< " denied due to timeout" << LL_ENDL;
Messages can be logged to one of four increasing levels of concern,
using one of four "streams":
LL_DEBUGS("StringTag") - debug messages that are normally suppressed
LL_INFOS("StringTag") - informational messages that are normal shown
LL_WARNS("StringTag") - warning messages that signal a problem
LL_ERRS("StringTag") - error messages that are major, unrecoverable failures
The later (LL_ERRS("StringTag")) automatically crashes the process after the message
is logged.
Note that these "streams" are actually #define magic. Rules for use:
* they cannot be used as normal streams, only to start a message
* messages written to them MUST be terminated with LL_ENDL
* between the opening and closing, the << operator is indeed
writing onto a std::ostream, so all conversions and stream
formating are available
These messages are automatically logged with function name, and (if enabled)
file and line of the message. (Note: Existing messages that already include
the function name don't get name printed twice.)
If you have a class, adding LOG_CLASS line to the declaration will cause
all messages emitted from member functions (normal and static) to be tagged
with the proper class name as well as the function name:
class LLFoo
{
LOG_CLASS(LLFoo);
public:
...
};
void LLFoo::doSomething(int i)
{
if (i > 100)
{
LL_WARNS("FooBarTag") << "called with a big value for i: " << i << LL_ENDL;
LL_WARNS("FooBarTag") << "called with a big value for i: " << i << LL_ENDL;
}
...
}
will result in messages like:
WARN #FooBarTag# llcommon/llfoo(100) LLFoo::doSomething : called with a big value for i: 283
the syntax is:
<timestamp> SPACE <level> SPACE <tags> SPACE <location> SPACE <function> SPACE COLON SPACE <message>
Expand All @@ -169,7 +174,7 @@ const int LL_ERR_NOERR = 0;
A copy of that file named logcontrol-dev.xml can be made in the users personal settings
directory; that will override the installed default file. See the logcontrol.xml
file or http://wiki.secondlife.com/wiki/Logging_System_Overview for configuration details.
Lastly, logging is now very efficient in both compiled code and execution
when skipped. There is no need to wrap messages, even debugging ones, in
#ifdef _DEBUG constructs. LL_DEBUGS("StringTag") messages are compiled into all builds,
Expand All @@ -182,12 +187,12 @@ namespace LLError
{
LEVEL_ALL = 0,
// used to indicate that all messages should be logged

LEVEL_DEBUG = 0,
LEVEL_INFO = 1,
LEVEL_WARN = 2,
LEVEL_ERROR = 3, // used to be called FATAL

LEVEL_NONE = 4
// not really a level
// used to indicate that no messages should be logged
Expand Down Expand Up @@ -223,13 +228,13 @@ namespace LLError
// Represents a specific place in the code where a message is logged
// This is public because it is used by the macros below. It is not
// intended for public use.
CallSite(ELevel level,
const char* file,
CallSite(ELevel level,
const char* file,
int line,
const std::type_info& class_info,
const char* function,
bool print_once,
const char** tags,
const std::type_info& class_info,
const char* function,
bool print_once,
const char** tags,
size_t tag_count);

~CallSite();
Expand All @@ -238,16 +243,16 @@ namespace LLError
bool shouldLog();
#else // LL_LIBRARY_INCLUDE
bool shouldLog()
{
return mCached
? mShouldLog
: Log::shouldLog(*this);
{
return mCached
? mShouldLog
: Log::shouldLog(*this);
}
// this member function needs to be in-line for efficiency
#endif // LL_LIBRARY_INCLUDE

void invalidate();

// these describe the call site and never change
const ELevel mLevel;
const char* const mFile;
Expand All @@ -263,22 +268,22 @@ namespace LLError
mTagString;
bool mCached,
mShouldLog;

friend class Log;
};


class End { };
inline std::ostream& operator<<(std::ostream& s, const End&)
{ return s; }
// used to indicate the end of a message

class LL_COMMON_API NoClassInfo { };
// used to indicate no class info known for logging

//LLCallStacks keeps track of call stacks and output the call stacks to log file
//
//Note: to be simple, efficient and necessary to keep track of correct call stacks,
//Note: to be simple, efficient and necessary to keep track of correct call stacks,
//LLCallStacks is designed not to be thread-safe.
//so try not to use it in multiple parallel threads at same time.
//Used in a single thread at a time is fine.
Expand All @@ -287,8 +292,8 @@ namespace LLError
private:
typedef std::vector<std::string> StringVector;
static StringVector sBuffer ;
public:

public:
static void push(const char* function, const int line) ;
static void insert(std::ostream& out, const char* function, const int line) ;
static void print() ;
Expand Down Expand Up @@ -326,7 +331,7 @@ namespace LLError
};
}

//this is cheaper than llcallstacks if no need to output other variables to call stacks.
//this is cheaper than llcallstacks if no need to output other variables to call stacks.
#define LL_PUSH_CALLSTACKS() LLError::LLCallStacks::push(__FUNCTION__, __LINE__)

#define llcallstacks \
Expand All @@ -341,7 +346,7 @@ namespace LLError
}

#define LL_CLEAR_CALLSTACKS() LLError::LLCallStacks::clear()
#define LL_PRINT_CALLSTACKS() LLError::LLCallStacks::print()
#define LL_PRINT_CALLSTACKS() LLError::LLCallStacks::print()

/*
Class type information for logging
Expand All @@ -350,7 +355,7 @@ namespace LLError
#define LOG_CLASS(s) typedef s _LL_CLASS_TO_LOG
// Declares class to tag logged messages with.
// See top of file for example of how to use this

typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
// Outside a class declaration, or in class without LOG_CLASS(), this
// typedef causes the messages to not be associated with any class.
Expand Down Expand Up @@ -392,7 +397,7 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;

//Use this construct if you need to do computation in the middle of a
//message:
//
//
// LL_INFOS("AgentGesture") << "the agent " << agend_id;
// switch (f)
// {
Expand All @@ -401,17 +406,23 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
// case FOP_SAYS: LL_CONT << "says " << message; break;
// }
// LL_CONT << " for " << t << " seconds" << LL_ENDL;
//
//
//Such computation is done iff the message will be logged.
#define LL_CONT _out

#define LL_NEWLINE '\n'

// Use this only in LL_ERRS or in a place that LL_ERRS may not be used

#ifndef LL_LINUX
#define LLERROR_CRASH \
{ \
crashdriver([](int* ptr){ *ptr = 0; exit(*ptr); }); \
}
#else
// For Linux we just call raise and be done with it. No fighting the compiler to create a crashing code snippet.
#define LLERROR_CRASH raise(SIGSEGV );
#endif

#define LL_ENDL \
LLError::End(); \
Expand Down Expand Up @@ -510,7 +521,7 @@ LL_ENDL;
LL_DEBUGS("SomeTag") performs the locking and map-searching ONCE, then caches
the result in a static variable.
*/
*/

// used by LLERROR_CRASH
void crashdriver(void (*)(int*));
Expand Down
23 changes: 11 additions & 12 deletions indra/llcommon/llsdutil.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/**
* @file llsdutil.cpp
* @author Phoenix
* @date 2006-05-24
Expand All @@ -7,21 +7,21 @@
* $LicenseInfo:firstyear=2006&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
*
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
Expand All @@ -36,7 +36,6 @@
# include <winsock2.h> // for htonl
#elif LL_LINUX
# include <netinet/in.h>
#pragma GCC diagnostic ignored "-Wstringop-truncation" // It's actually okay what happens here
#elif LL_DARWIN
# include <arpa/inet.h>
#endif
Expand Down Expand Up @@ -325,7 +324,7 @@ BOOL compare_llsd_with_template(
return TRUE;
}

// filter_llsd_with_template() is a direct clone (copy-n-paste) of
// filter_llsd_with_template() is a direct clone (copy-n-paste) of
// compare_llsd_with_template with the following differences:
// (1) bool vs BOOL return types
// (2) A map with the key value "*" is a special value and maps any key in the
Expand Down Expand Up @@ -387,7 +386,7 @@ bool filter_llsd_with_template(
else
{
// Traditional compare_llsd_with_template matching

for (template_iter = template_llsd.beginArray();
template_iter != template_llsd.endArray() &&
test_iter != llsd_to_test.endArray();
Expand Down Expand Up @@ -418,7 +417,7 @@ bool filter_llsd_with_template(
else if (llsd_to_test.isMap())
{
resultant_llsd = LLSD::emptyMap();

//now we loop over the keys of the two maps
//any excess is taken from the template
//excess is ignored in the test
Expand Down Expand Up @@ -465,7 +464,7 @@ bool filter_llsd_with_template(
{
LLSD sub_value;
LLSD::map_const_iterator test_iter;

for (test_iter = llsd_to_test.beginMap();
test_iter != llsd_to_test.endMap();
++test_iter)
Expand Down Expand Up @@ -945,9 +944,9 @@ LLSD drill(const LLSD& blob, const LLSD& path)

} // namespace llsd

// Construct a deep partial clone of of an LLSD object. primitive types share
// Construct a deep partial clone of of an LLSD object. primitive types share
// references, however maps, arrays and binary objects are duplicated. An optional
// filter may be include to exclude/include keys in a map.
// filter may be include to exclude/include keys in a map.
LLSD llsd_clone(LLSD value, LLSD filter)
{
LL_PROFILE_ZONE_SCOPED
Expand Down
Loading

0 comments on commit 8f0c41c

Please sign in to comment.