Various code cleanup & little performance improvement on HTTP download (

#5772) * Disable or remove unused enum members/functions * Tiny code style fixes * Make some functions const * Replace ClientMediaDownloader std::unordered_map with std::map
minetest · May 20, 2017 · ce98022 · ce98022
1 parent 3526740
commit ce98022
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 85 deletions.
diff --git a/src/activeobject.h b/src/activeobject.h
@@ -28,9 +28,9 @@ enum ActiveObjectType {
 	ACTIVEOBJECT_TYPE_TEST = 1,
 // Deprecated stuff
 	ACTIVEOBJECT_TYPE_ITEM = 2,
-	ACTIVEOBJECT_TYPE_RAT = 3,
-	ACTIVEOBJECT_TYPE_OERKKI1 = 4,
-	ACTIVEOBJECT_TYPE_FIREFLY = 5,
+//	ACTIVEOBJECT_TYPE_RAT = 3,
+//	ACTIVEOBJECT_TYPE_OERKKI1 = 4,
+//	ACTIVEOBJECT_TYPE_FIREFLY = 5,
 	ACTIVEOBJECT_TYPE_MOBV2 = 6,
 // End deprecated stuff
 	ACTIVEOBJECT_TYPE_LUAENTITY = 7,

diff --git a/src/camera.h b/src/camera.h
@@ -64,22 +64,6 @@ class Camera
 			Client *client);
 	~Camera();
 
-	// Get player scene node.
-	// This node is positioned at the player's torso (without any view bobbing),
-	// as given by Player::m_position. Yaw is applied but not pitch.
-	inline scene::ISceneNode* getPlayerNode() const
-	{
-		return m_playernode;
-	}
-
-	// Get head scene node.
-	// It has the eye transformation and pitch applied,
-	// but no view bobbing.
-	inline scene::ISceneNode* getHeadNode() const
-	{
-		return m_headnode;
-	}
-
 	// Get camera scene node.
 	// It has the eye transformation, pitch and view bobbing applied.
 	inline scene::ICameraSceneNode* getCameraNode() const
@@ -160,13 +144,13 @@ class Camera
 		else
 			m_camera_mode = CAMERA_MODE_FIRST;
 	}
-	
+
 	// Set the current camera mode
 	inline void setCameraMode(CameraMode mode)
 	{
 		m_camera_mode = mode;
 	}
-	
+
 	//read the current camera mode
 	inline CameraMode getCameraMode()
 	{

diff --git a/src/chat.cpp b/src/chat.cpp
@@ -77,11 +77,6 @@ u32 ChatBuffer::getLineCount() const
 	return m_unformatted.size();
 }
 
-u32 ChatBuffer::getScrollback() const
-{
-	return m_scrollback;
-}
-
 const ChatLine& ChatBuffer::getLine(u32 index) const
 {
 	assert(index < getLineCount());	// pre-condition

diff --git a/src/chat.h b/src/chat.h
@@ -86,8 +86,6 @@ class ChatBuffer
 
 	// Get number of lines currently in buffer.
 	u32 getLineCount() const;
-	// Get scrollback size, maximum number of lines in buffer.
-	u32 getScrollback() const;
 	// Get reference to i-th chat line.
 	const ChatLine& getLine(u32 index) const;
 
@@ -162,8 +160,7 @@ class ChatPrompt
 	std::wstring getLine() const { return m_line; }
 
 	// Get section of line that is currently selected
-	std::wstring getSelection() const
-		{ return m_line.substr(m_cursor, m_cursor_len); }
+	std::wstring getSelection() const { return m_line.substr(m_cursor, m_cursor_len); }
 
 	// Clear the current line
 	void clear();

diff --git a/src/client.cpp b/src/client.cpp
@@ -1723,7 +1723,7 @@ float Client::getRTT()
 
 float Client::getCurRate()
 {
-	return ( m_con.getLocalStat(con::CUR_INC_RATE) +
+	return (m_con.getLocalStat(con::CUR_INC_RATE) +
 			m_con.getLocalStat(con::CUR_DL_RATE));
 }
 

diff --git a/src/client.h b/src/client.h
@@ -467,8 +467,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
 	Minimap* getMinimap() { return m_minimap; }
 	void setCamera(Camera* camera) { m_camera = camera; }
 
-	Camera* getCamera ()
-	{ return m_camera; }
+	Camera* getCamera () { return m_camera; }
 
 	bool shouldShowMinimap() const;
 

diff --git a/src/clientiface.cpp b/src/clientiface.cpp
@@ -590,7 +590,7 @@ void RemoteClient::notifyEvent(ClientStateEvent event)
 	}
 }
 
-u32 RemoteClient::uptime()
+u32 RemoteClient::uptime() const
 {
 	return porting::getTime(PRECISION_SECONDS) - m_connection_time;
 }

diff --git a/src/clientiface.h b/src/clientiface.h
@@ -345,7 +345,7 @@ class RemoteClient
 		{ serialization_version = m_pending_serialization_version; }
 
 	/* get uptime */
-	u32 uptime();
+	u32 uptime() const;
 
 	/* set version information */
 	void setVersionInfo(u8 major, u8 minor, u8 patch, const std::string &full)
@@ -360,7 +360,6 @@ class RemoteClient
 	u8 getMajor() const { return m_version_major; }
 	u8 getMinor() const { return m_version_minor; }
 	u8 getPatch() const { return m_version_patch; }
-	std::string getVersion() const { return m_full_version; }
 private:
 	// Version is stored in here after INIT before INIT2
 	u8 m_pending_serialization_version;

diff --git a/src/clientmedia.cpp b/src/clientmedia.cpp
@@ -348,7 +348,7 @@ void ClientMediaDownloader::remoteMediaReceived(
 
 	std::string name;
 	{
-		std::map<unsigned long, std::string>::iterator it =
+		UNORDERED_MAP<unsigned long, std::string>::iterator it =
 			m_remote_file_transfers.find(fetch_result.request_id);
 		assert(it != m_remote_file_transfers.end());
 		name = it->second;

diff --git a/src/clientmedia.h b/src/clientmedia.h
@@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <map>
 #include <set>
 #include <vector>
+#include "util/cpp11_container.h"
 
 class Client;
 struct HTTPFetchResult;
@@ -137,7 +138,7 @@ class ClientMediaDownloader
 	s32 m_httpfetch_active;
 	s32 m_httpfetch_active_limit;
 	s32 m_outstanding_hash_sets;
-	std::map<unsigned long, std::string> m_remote_file_transfers;
+	UNORDERED_MAP<unsigned long, std::string> m_remote_file_transfers;
 
 	// All files up to this name have either been received from a
 	// remote server or failed on all remote servers, so those files

diff --git a/src/clientobject.h b/src/clientobject.h
@@ -49,18 +49,13 @@ class ClientActiveObject : public ActiveObject
 	virtual aabb3f *getSelectionBox() { return NULL; }
 	virtual bool getCollisionBox(aabb3f *toset) const { return false; }
 	virtual bool collideWithObjects() const { return false; }
-	virtual v3f getPosition(){return v3f(0,0,0);}
-	virtual float getYaw() const {return 0;}
-	virtual scene::ISceneNode *getSceneNode(){return NULL;}
-	virtual scene::IMeshSceneNode *getMeshSceneNode(){return NULL;}
-	virtual scene::IAnimatedMeshSceneNode *getAnimatedMeshSceneNode(){return NULL;}
-	virtual WieldMeshSceneNode *getWieldMeshSceneNode(){return NULL;}
-	virtual scene::IBillboardSceneNode *getSpriteSceneNode(){return NULL;}
-	virtual bool isPlayer() const {return false;}
+	virtual v3f getPosition(){ return v3f(0,0,0); }
+	virtual float getYaw() const { return 0; }
+	virtual scene::ISceneNode *getSceneNode() { return NULL; }
+	virtual scene::IAnimatedMeshSceneNode *getAnimatedMeshSceneNode() { return NULL; }
 	virtual bool isLocalPlayer() const {return false;}
-	virtual void setAttachments(){}
+	virtual void setAttachments() {}
 	virtual bool doShowSelectionBox(){return true;}
-	virtual void updateCameraOffset(v3s16 camera_offset){};
 
 	// Step object in time
 	virtual void step(float dtime, ClientEnvironment *env){}

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
@@ -706,26 +706,11 @@ scene::ISceneNode* GenericCAO::getSceneNode()
 	return NULL;
 }
 
-scene::IMeshSceneNode* GenericCAO::getMeshSceneNode()
-{
-	return m_meshnode;
-}
-
 scene::IAnimatedMeshSceneNode* GenericCAO::getAnimatedMeshSceneNode()
 {
 	return m_animated_meshnode;
 }
 
-WieldMeshSceneNode* GenericCAO::getWieldMeshSceneNode()
-{
-	return m_wield_meshnode;
-}
-
-scene::IBillboardSceneNode* GenericCAO::getSpriteSceneNode()
-{
-	return m_spritenode;
-}
-
 void GenericCAO::setChildrenVisible(bool toset)
 {
 	for (std::vector<u16>::size_type i = 0; i < m_children.size(); i++) {

diff --git a/src/content_cao.h b/src/content_cao.h
@@ -146,19 +146,8 @@ class GenericCAO : public ClientActiveObject
 
 	scene::ISceneNode *getSceneNode();
 
-	scene::IMeshSceneNode *getMeshSceneNode();
-
 	scene::IAnimatedMeshSceneNode *getAnimatedMeshSceneNode();
 
-	WieldMeshSceneNode *getWieldMeshSceneNode();
-
-	scene::IBillboardSceneNode *getSpriteSceneNode();
-
-	inline bool isPlayer() const
-	{
-		return m_is_player;
-	}
-
 	inline bool isLocalPlayer() const
 	{
 		return m_is_local_player;

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
@@ -881,7 +881,6 @@ class CNodeDefManager: public IWritableNodeDefManager {
 	void serialize(std::ostream &os, u16 protocol_version) const;
 	void deSerialize(std::istream &is);
 
-	inline virtual bool getNodeRegistrationStatus() const;
 	inline virtual void setNodeRegistrationStatus(bool completed);
 
 	virtual void pendNodeResolve(NodeResolver *nr);
@@ -1805,13 +1804,6 @@ void ContentFeatures::deSerializeOld(std::istream &is, int version)
 	}
 }
 
-
-inline bool CNodeDefManager::getNodeRegistrationStatus() const
-{
-	return m_node_registration_complete;
-}
-
-
 inline void CNodeDefManager::setNodeRegistrationStatus(bool completed)
 {
 	m_node_registration_complete = completed;

diff --git a/src/nodedef.h b/src/nodedef.h
@@ -432,8 +432,6 @@ class INodeDefManager {
 
 	virtual void serialize(std::ostream &os, u16 protocol_version) const=0;
 
-	virtual bool getNodeRegistrationStatus() const=0;
-
 	virtual void pendNodeResolve(NodeResolver *nr)=0;
 	virtual bool cancelNodeResolveCallback(NodeResolver *nr)=0;
 	virtual bool nodeboxConnects(const MapNode from, const MapNode to, u8 connect_face)=0;
@@ -491,7 +489,6 @@ class IWritableNodeDefManager : public INodeDefManager {
 	virtual void serialize(std::ostream &os, u16 protocol_version) const=0;
 	virtual void deSerialize(std::istream &is)=0;
 
-	virtual bool getNodeRegistrationStatus() const=0;
 	virtual void setNodeRegistrationStatus(bool completed)=0;
 
 	virtual void pendNodeResolve(NodeResolver *nr)=0;