Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'aleric/master'

Browse Source
This commit is contained in:
Latif Khalifa
2013-06-03 01:33:03 +02:00
parent 5ee7244b45 24fb76907d
commit 986871c5a6
15 changed files with 474 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/CMakeLists.txt
View File

@@ -79,6 +79,7 @@ include_directories(
set(viewer_SOURCE_FILES
NACLantispam.cpp
aihttpview.cpp
aoremotectrl.cpp
ascentfloatercontactgroups.cpp
ascentkeyword.cpp
@@ -575,6 +576,7 @@ set(viewer_HEADER_FILES
ViewerInstall.cmake
NACLantispam.h
aihttpview.h
aoremotectrl.h
ascentfloatercontactgroups.h
ascentkeyword.h

311
indra/newview/aihttpview.cpp Normal file
View File

@@ -0,0 +1,311 @@
/**
* @file aihttpview.cpp
* @brief Definition of class AIHTTPView.
*
* Copyright (c) 2013, Aleric Inglewood.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution.
*
* CHANGELOG
* and additional copyright holders.
*
* 28/05/2013
* Initial version, written by Aleric Inglewood @ SL
*/
#include "llviewerprecompiledheaders.h"
#include "aihttpview.h"
#include "llrect.h"
#include "llerror.h"
#include "aicurlperservice.h"
#include "llviewerstats.h"
#include "llfontgl.h"
#include "aihttptimeout.h"
AIHTTPView* gHttpView = NULL;
static S32 sLineHeight;
// Forward declaration.
namespace AICurlInterface {
size_t getHTTPBandwidth(void);
U32 getNumHTTPAdded(void);
U32 getMaxHTTPAdded(void);
} // namespace AICurlInterface
//=============================================================================
//PerService_crat per_service_r(*service.second);
class AIServiceBar : public LLView
{
private:
AIHTTPView* mHTTPView;
std::string mName;
AIPerServicePtr mPerService;
public:
AIServiceBar(AIHTTPView* httpview, AIPerService::instance_map_type::value_type const& service)
: LLView("aiservice bar", LLRect(), FALSE), mHTTPView(httpview), mName(service.first), mPerService(service.second) { }
/*virtual*/ void draw(void);
/*virtual*/ LLRect getRequiredRect(void);
};
int const mc_col = number_of_capability_types; // Maximum connections column.
int const bw_col = number_of_capability_types + 1; // Bandwidth column.
void AIServiceBar::draw()
{
LLColor4 text_color = LLColor4::white;
F32 height = getRect().getHeight();
U32 start = 4;
LLFontGL::getFontMonospace()->renderUTF8(mName, 0, start, height, text_color, LLFontGL::LEFT, LLFontGL::TOP);
start += LLFontGL::getFontMonospace()->getWidth(mName);
std::string text;
PerService_rat per_service_r(*mPerService);
for (int col = 0; col < number_of_capability_types; ++col)
{
AIPerService::CapabilityType& ct(per_service_r->mCapabilityType[col]);
start = mHTTPView->updateColumn(col, start);
if (col < 2)
{
text = llformat(" | %hu-%hu-%lu,{%hu,%u}/%u", ct.mApprovedRequests, ct.mQueuedCommands, ct.mQueuedRequests.size(), ct.mAdded, ct.mDownloading, ct.mMaxPipelinedRequests);
}
else
{
text = llformat(" | --%hu-%lu,{%hu,%u}", ct.mQueuedCommands, ct.mQueuedRequests.size(), ct.mAdded, ct.mDownloading);
}
LLFontGL::getFontMonospace()->renderUTF8(text, 0, start, height, text_color, LLFontGL::LEFT, LLFontGL::TOP);
start += LLFontGL::getFontMonospace()->getWidth(text);
}
start = mHTTPView->updateColumn(mc_col, start);
text = llformat(" | %d/%d", per_service_r->mTotalAdded, per_service_r->mConcurrectConnections);
LLFontGL::getFontMonospace()->renderUTF8(text, 0, start, height, text_color, LLFontGL::LEFT, LLFontGL::TOP);
start += LLFontGL::getFontMonospace()->getWidth(text);
start = mHTTPView->updateColumn(bw_col, start);
size_t bandwidth = per_service_r->bandwidth().truncateData(AIHTTPView::getTime_40ms());
size_t max_bandwidth = mHTTPView->mMaxBandwidthPerService;
text = " | ";
LLFontGL::getFontMonospace()->renderUTF8(text, 0, start, height, text_color, LLFontGL::LEFT, LLFontGL::TOP);
start += LLFontGL::getFontMonospace()->getWidth(text);
text = llformat("%lu", bandwidth / 125);
LLColor4 color = (bandwidth > max_bandwidth) ? LLColor4::red : ((bandwidth > max_bandwidth * .75f) ? LLColor4::yellow : text_color);
LLFontGL::getFontMonospace()->renderUTF8(text, 0, start, height, color, LLFontGL::LEFT, LLFontGL::TOP);
start += LLFontGL::getFontMonospace()->getWidth(text);
text = llformat("/%lu", max_bandwidth / 125);
LLFontGL::getFontMonospace()->renderUTF8(text, 0, start, height, text_color, LLFontGL::LEFT, LLFontGL::TOP);
}
LLRect AIServiceBar::getRequiredRect(void)
{
LLRect rect;
rect.mTop = sLineHeight;
return rect;
}
//=============================================================================
static int const number_of_header_lines = 2;
class AIGLHTTPHeaderBar : public LLView
{
public:
AIGLHTTPHeaderBar(std::string const& name, AIHTTPView* httpview) :
LLView(name, FALSE), mHTTPView(httpview)
{
sLineHeight = llround(LLFontGL::getFontMonospace()->getLineHeight());
setRect(LLRect(0, 0, 200, sLineHeight * number_of_header_lines));
}
/*virtual*/ void draw(void);
/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
/*virtual*/ LLRect getRequiredRect(void);
private:
AIHTTPView* mHTTPView;
};
void AIGLHTTPHeaderBar::draw(void)
{
S32 const v_offset = -1; // Offset from the bottom. Move header one pixel down.
S32 const h_offset = 4;
LLGLSUIDefault gls_ui;
LLColor4 text_color(1.f, 1.f, 1.f, 0.75f);
std::string text;
// First header line.
F32 height = v_offset + sLineHeight * number_of_header_lines;
text = "HTTP console -- [approved]-commandQ-curlQ,{added,downloading}[/max]";
LLFontGL::getFontMonospace()->renderUTF8(text, 0, h_offset, height, text_color, LLFontGL::LEFT, LLFontGL::TOP);
text = " | Added/Max";
U32 start = mHTTPView->updateColumn(mc_col, 100);
LLFontGL::getFontMonospace()->renderUTF8(text, 0, start, height, LLColor4::green, LLFontGL::LEFT, LLFontGL::TOP);
start += LLFontGL::getFontMonospace()->getWidth(text);
text = " | Tot/Max BW (kbit/s)";
start = mHTTPView->updateColumn(bw_col, start);
LLFontGL::getFontMonospace()->renderUTF8(text, 0, start, height, LLColor4::green, LLFontGL::LEFT, LLFontGL::TOP);
mHTTPView->setWidth(start + LLFontGL::getFontMonospace()->getWidth(text) + h_offset);
// Second header line.
height -= sLineHeight;
start = h_offset;
text = "Service (host:port)";
static char const* caption[number_of_capability_types] = {
" | Textures", " | Inventory", " | Mesh", " | Other"
};
LLFontGL::getFontMonospace()->renderUTF8(text, 0, start, height, LLColor4::green, LLFontGL::LEFT, LLFontGL::TOP);
start += LLFontGL::getFontMonospace()->getWidth(text);
for (int col = 0; col < number_of_capability_types; ++col)
{
start = mHTTPView->updateColumn(col, start);
text = caption[col];
LLFontGL::getFontMonospace()->renderUTF8(text, 0, start, height, LLColor4::green, LLFontGL::LEFT, LLFontGL::TOP);
start += LLFontGL::getFontMonospace()->getWidth(text);
}
start = mHTTPView->updateColumn(mc_col, start);
text = llformat(" | %u/%u", AICurlInterface::getNumHTTPAdded(), AICurlInterface::getMaxHTTPAdded());
LLFontGL::getFontMonospace()->renderUTF8(text, 0, start, height, text_color, LLFontGL::LEFT, LLFontGL::TOP);
start += LLFontGL::getFontMonospace()->getWidth(text);
// This bandwidth is averaged over 1 seconds (in bytes/s).
size_t const bandwidth = AICurlInterface::getHTTPBandwidth();
size_t const max_bandwidth = AIPerService::getHTTPThrottleBandwidth125();
mHTTPView->mMaxBandwidthPerService = max_bandwidth * AIPerService::throttleFraction();
LLColor4 color = (bandwidth > max_bandwidth) ? LLColor4::red : ((bandwidth > max_bandwidth * .75f) ? LLColor4::yellow : text_color);
color[VALPHA] = text_color[VALPHA];
start = mHTTPView->updateColumn(bw_col, start);
text = " | ";
LLFontGL::getFontMonospace()->renderUTF8(text, 0, start, height, LLColor4::green, LLFontGL::LEFT, LLFontGL::TOP);
start += LLFontGL::getFontMonospace()->getWidth(text);
text = llformat("%lu", bandwidth / 125);
LLFontGL::getFontMonospace()->renderUTF8(text, 0, start, height, color, LLFontGL::LEFT, LLFontGL::TOP);
start += LLFontGL::getFontMonospace()->getWidth(text);
text = llformat("/%lu", max_bandwidth / 125);
LLFontGL::getFontMonospace()->renderUTF8(text, 0, start, height, text_color, LLFontGL::LEFT, LLFontGL::TOP);
}
BOOL AIGLHTTPHeaderBar::handleMouseDown(S32 x, S32 y, MASK mask)
{
return FALSE;
}
LLRect AIGLHTTPHeaderBar::getRequiredRect()
{
LLRect rect;
rect.mTop = sLineHeight * number_of_header_lines;
return rect;
}
//=============================================================================
AIHTTPView::AIHTTPView(AIHTTPView::Params const& p) :
LLContainerView(p), mGLHTTPHeaderBar(NULL), mWidth(200)
{
setVisible(FALSE);
setRectAlpha(0.5);
}
AIHTTPView::~AIHTTPView()
{
delete mGLHTTPHeaderBar;
mGLHTTPHeaderBar = NULL;
}
U32 AIHTTPView::updateColumn(int col, U32 start)
{
llassert(col <= mStartColumn.size());
if (col == mStartColumn.size())
{
mStartColumn.push_back(start);
}
else if (mStartColumn[col] < start)
{
mStartColumn[col] = start;
}
return mStartColumn[col];
}
U64 AIHTTPView::sTime_40ms;
struct KillView
{
void operator()(LLView* viewp)
{
viewp->getParent()->removeChild(viewp);
viewp->die();
}
};
struct CreateServiceBar
{
AIHTTPView* mHTTPView;
CreateServiceBar(AIHTTPView* httpview) : mHTTPView(httpview) { }
void operator()(AIPerService::instance_map_type::value_type const& service)
{
AIServiceBar* service_bar = new AIServiceBar(mHTTPView, service);
mHTTPView->addChild(service_bar);
mHTTPView->mServiceBars.push_back(service_bar);
}
};
void AIHTTPView::draw()
{
for_each(mServiceBars.begin(), mServiceBars.end(), KillView());
mServiceBars.clear();
if (mGLHTTPHeaderBar)
{
removeChild(mGLHTTPHeaderBar);
mGLHTTPHeaderBar->die();
}
CreateServiceBar functor(this);
AIPerService::copy_forEach(functor);
sTime_40ms = get_clock_count() * AICurlPrivate::curlthread::HTTPTimeout::sClockWidth_40ms;
mGLHTTPHeaderBar = new AIGLHTTPHeaderBar("gl httpheader bar", this);
addChild(mGLHTTPHeaderBar);
reshape(mWidth, getRect().getHeight(), TRUE);
for (child_list_const_iter_t child_iter = getChildList()->begin(); child_iter != getChildList()->end(); ++child_iter)
{
LLView* viewp = *child_iter;
if (viewp->getRect().mBottom < 0)
{
viewp->setVisible(FALSE);
}
}
LLContainerView::draw();
}
BOOL AIHTTPView::handleMouseUp(S32 x, S32 y, MASK mask)
{
return FALSE;
}
BOOL AIHTTPView::handleKey(KEY key, MASK mask, BOOL called_from_parent)
{
return FALSE;
}

73
indra/newview/aihttpview.h Normal file
View File

@@ -0,0 +1,73 @@
/**
* @file aihttpview.h
* @brief Declaration for AIHTTPView.
*
* Copyright (c) 2013, Aleric Inglewood.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution.
*
* CHANGELOG
* and additional copyright holders.
*
* 28/05/2013
* Initial version, written by Aleric Inglewood @ SL
*/
#ifndef AIHTTPVIEW_H
#define AIHTTPVIEW_H
#include "llcontainerview.h"
#include <vector>
class AIGLHTTPHeaderBar;
class AIServiceBar;
struct CreateServiceBar;
class AIHTTPView : public LLContainerView
{
friend class AIGLHTTPHeaderBar;
friend class AIServiceBar;
friend struct CreateServiceBar;
public:
AIHTTPView(AIHTTPView::Params const& p);
~AIHTTPView();
/*virtual*/ void draw(void);
/*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask);
/*virtual*/ BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
U32 updateColumn(int col, U32 start);
void setWidth(S32 width) { mWidth = width; }
private:
AIGLHTTPHeaderBar* mGLHTTPHeaderBar;
std::vector<AIServiceBar*> mServiceBars;
std::vector<U32> mStartColumn;
size_t mMaxBandwidthPerService;
S32 mWidth;
static U64 sTime_40ms;
public:
static U64 getTime_40ms(void) { return sTime_40ms; }
};
extern AIHTTPView *gHttpView;
#endif // AIHTTPVIEW_H

12
indra/newview/lldebugview.cpp
View File

@@ -39,6 +39,7 @@
#include "llfasttimerview.h"
#include "llconsole.h"
#include "lltextureview.h"
#include "aihttpview.h"
#include "llresmgr.h"
#include "imageids.h"
#include "llvelocitybar.h"
@@ -93,6 +94,16 @@ LLDebugView::LLDebugView(const std::string& name, const LLRect &rect)
addChild(gTextureView);
//gTextureView->reshape(r.getWidth(), r.getHeight(), TRUE);
r.set(150, rect.getHeight() - 50, 870, 100);
AIHTTPView::Params hvp;
hvp.name("gHttpView");
hvp.rect(r);
hvp.visible(false);
gHttpView = LLUICtrlFactory::create<AIHTTPView>(hvp);
//gHttpView->setFollowsBottom();
//gHttpView->setFollowsLeft();
addChild(gHttpView);
if(gAuditTexture)
{
r.set(150, rect.getHeight() - 50, 900 + LLImageGL::sTextureLoadedCounter.size() * 30, 100);
@@ -129,6 +140,7 @@ LLDebugView::~LLDebugView()
// These have already been deleted. Fix the globals appropriately.
gDebugView = NULL;
gTextureView = NULL;
gHttpView = NULL;
gTextureSizeView = NULL;
gTextureCategoryView = NULL;
}

1
indra/newview/llpathfindingmanager.cpp
View File

@@ -165,6 +165,7 @@ public:
/*virtual*/ void result(const LLSD &pContent);
/*virtual*/ void error(U32 pStatus, const std::string& pReason);
/*virtual*/ bool followRedir(void) const { return true; }
/*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return agentStateResponder_timeout; }
/*virtual*/ char const* getName(void) const { return "AgentStateResponder"; }

10
indra/newview/llviewermenu.cpp
View File

@@ -221,6 +221,8 @@ void handle_test_load_url(void*);
//
// Evil hackish imported globals
class AIHTTPView;
//extern BOOL gHideSelectedObjects;
//extern BOOL gAllowSelectAvatar;
//extern BOOL gDebugAvatarRotation;
@@ -229,6 +231,7 @@ extern BOOL gDebugWindowProc;
extern BOOL gDebugTextEditorTips;
extern BOOL gShowOverlayTitle;
extern BOOL gOcclusionCull;
extern AIHTTPView* gHttpView;
//
// Globals
//
@@ -817,6 +820,13 @@ void init_client_menu(LLMenuGL* menu)
'6', MASK_CONTROL|MASK_SHIFT ) );
}
sub->addChild(new LLMenuItemCheckGL("HTTP Console",
&toggle_visibility,
NULL,
&get_visibility,
(void*)gHttpView,
'7', MASK_CONTROL|MASK_SHIFT ) );
sub->addChild(new LLMenuItemCheckGL("Region Debug Console", handle_singleton_toggle<LLFloaterRegionDebugConsole>, NULL, handle_singleton_check<LLFloaterRegionDebugConsole>,NULL,'`', MASK_CONTROL|MASK_SHIFT));
sub->addChild(new LLMenuItemCheckGL("Fast Timers",

1
indra/newview/statemachine/aidirpicker.h
View File

@@ -43,6 +43,7 @@
// Objects of this type can be reused multiple times, see
// also the documentation of AIStateMachine.
class AIDirPicker : protected AIFilePicker {
LOG_CLASS(AIDirPicker);
public:
// Allow to pass the arguments to open upon creation.
//

1
indra/newview/statemachine/aifilepicker.h
View File

@@ -151,6 +151,7 @@ new AIFilePicker
// Objects of this type can be reused multiple times, see
// also the documentation of AIStateMachine.
class AIFilePicker : public AIStateMachine {
LOG_CLASS(AIFilePicker);
protected:
// The base class of this state machine.
typedef AIStateMachine direct_base_type;