Revert "Merge pull request #2 from 702nADOS/genode-taskmanager"

This reverts commit 1e8613f, reversing
changes made to 18307e7.

repos/base-foc/src/core/include/cpu_session_component.h

@@ -92,8 +92,7 @@ namespace Genode {
 			{
 				return { _session_label, _name,
 				         _platform_thread.execution_time(),
-				         _platform_thread.affinity(),
-					 _platform_thread.prio() };
+				         _platform_thread.affinity() };
 			}
 
 
@@ -246,8 +245,6 @@ namespace Genode {
 			int transfer_quota(Cpu_session_capability, size_t);
 			Quota quota() override;
 
-			void set(Ram_session_capability ram_cap);
-
 
 			/***********************************
 			 ** Fiasco.OC specific extensions **

repos/base-foc/src/core/include/platform_thread.h

@@ -31,7 +31,6 @@ namespace Genode {
 	class Platform_pd;
 	class Platform_thread
 	{
-
 		private:
 
 			enum State { DEAD, RUNNING };
@@ -176,11 +175,8 @@ namespace Genode {
 			/**
 			 * Return execution time consumed by the thread
 			 */
-			unsigned long long execution_time() const;
-
-			unsigned prio() const;
+			unsigned long long execution_time() const { return 0; }
 
-			unsigned id() const;
 
 			/*******************************
 			 ** Fiasco-specific Accessors **

repos/base-foc/src/core/platform_thread.cc

@@ -266,28 +266,6 @@ Weak_ptr<Address_space> Platform_thread::address_space()
 }
 
 
-unsigned long long Platform_thread::execution_time() const
-{
-	unsigned long long time = 0;
-
-	if (_utcb) {
-		l4_thread_stats_time(_thread.local.dst());
-		time = *(l4_kernel_clock_t*)&l4_utcb_mr()->mr[0];
-	}
-
-	return time;
-}
-
-unsigned Platform_thread::prio() const
-{
-	return _prio;
-}
-
-unsigned Platform_thread::id() const
-{ 	
-	return _thread.local.dst();
-}
-
 Platform_thread::Platform_thread(const char *name, unsigned prio, addr_t)
 : _state(DEAD),
   _core_thread(false),

repos/base/include/base/trace/types.h

@@ -32,8 +32,7 @@ namespace Genode { namespace Trace {
 	struct Policy_id;
 	struct Subject_id;
 	struct Execution_time;
-	struct CPU_info;
-	struct RAM_info;
+	struct Subject_info;
 } }
 
 
@@ -82,7 +81,7 @@ struct Genode::Trace::Execution_time
 /**
  * Subject information
  */
-class Genode::Trace::CPU_info
+class Genode::Trace::Subject_info
 {
 	public:
 
@@ -109,23 +108,20 @@ class Genode::Trace::CPU_info
 		Policy_id          _policy_id;
 		Execution_time     _execution_time;
 		Affinity::Location _affinity;
-		unsigned	   _prio;
 
 	public:
 
-		CPU_info() : _state(INVALID) { }
+		Subject_info() : _state(INVALID) { }
 
-		CPU_info(Session_label const &session_label,
+		Subject_info(Session_label const &session_label,
 		             Thread_name   const &thread_name,
 		             State state, Policy_id policy_id,
 		             Execution_time execution_time,
-		             Affinity::Location affinity,
-			     unsigned prio
-				)
+		             Affinity::Location affinity)
 		:
 			_session_label(session_label), _thread_name(thread_name),
 			_state(state), _policy_id(policy_id),
-			_execution_time(execution_time), _affinity(affinity), _prio(prio)
+			_execution_time(execution_time), _affinity(affinity)
 		{ }
 
 		Session_label const &session_label()  const { return _session_label; }
@@ -134,36 +130,6 @@ class Genode::Trace::CPU_info
 		Policy_id            policy_id()      const { return _policy_id; }
 		Execution_time       execution_time() const { return _execution_time; }
 		Affinity::Location   affinity()       const { return _affinity; }
-		unsigned	     prio()	      const { return _prio; }
-};
-
-class Genode::Trace::RAM_info
-{
-	private:
-
-		Session_label      _session_label;
-		Thread_name        _thread_name;
-		size_t		   _ram_quota;
-		size_t		   _ram_used;
-
-	public:
-
-		RAM_info() {}
-
-		RAM_info(Session_label const &session_label,
-		             Thread_name   const &thread_name,
-			     size_t ram_quota,
-			     size_t ram_used
-				)
-		:
-			_session_label(session_label), _thread_name(thread_name),
-			_ram_quota(ram_quota), _ram_used(ram_used)
-		{ }
-
-		Session_label const &session_label()  const { return _session_label; }
-		Thread_name   const &thread_name()    const { return _thread_name; }
-		size_t		     ram_quota()      const { return _ram_quota; }
-		size_t		     ram_used()	      const { return _ram_used; }
 };
 
 #endif /* _INCLUDE__BASE__TRACE__TYPES_H_ */

repos/base/include/cpu_session/client.h

@@ -32,9 +32,6 @@ struct Genode::Cpu_session_client : Rpc_client<Cpu_session>
 	Ram_dataspace_capability utcb(Thread_capability thread) override {
 		return call<Rpc_utcb>(thread); }
 
-	void set(Ram_session_capability ram_cap) override {
-		call<Rpc_set>(ram_cap); }
-
 	void kill_thread(Thread_capability thread) override {
 		call<Rpc_kill_thread>(thread); }
 

repos/base/include/cpu_session/cpu_session.h

@@ -299,8 +299,6 @@ struct Genode::Cpu_session : Session
 	static size_t quota_lim_downscale(size_t const value, size_t const limit) {
 		return ((T)value * limit) >> Cpu_session::QUOTA_LIMIT_LOG2; }
 
-	virtual void set(Ram_session_capability ram_cap) = 0;
-
 	/*********************
 	 ** RPC declaration **
 	 *********************/
@@ -333,7 +331,6 @@ struct Genode::Cpu_session : Session
 	GENODE_RPC(Rpc_ref_account, int, ref_account, Cpu_session_capability);
 	GENODE_RPC(Rpc_transfer_quota, int, transfer_quota, Cpu_session_capability, size_t);
 	GENODE_RPC(Rpc_quota, Quota, quota);
-	GENODE_RPC(Rpc_set, void, set, Ram_session_capability);
 
 	/*
 	 * 'GENODE_RPC_INTERFACE' declaration done manually
@@ -364,9 +361,8 @@ struct Genode::Cpu_session : Session
 	        Meta::Type_tuple<Rpc_ref_account,
 	        Meta::Type_tuple<Rpc_transfer_quota,
 	        Meta::Type_tuple<Rpc_quota,
-		Meta::Type_tuple<Rpc_set,
 	                         Meta::Empty>
-	        > > > > > > > > > > > > > > > > > > > > > Rpc_functions;
+	        > > > > > > > > > > > > > > > > > > > > Rpc_functions;
 };
 
 struct Genode::Cpu_session::Quota

repos/base/include/ram_session/client.h

@@ -41,8 +41,6 @@ struct Genode::Ram_session_client : Rpc_client<Ram_session>
 	size_t quota() override { return call<Rpc_quota>(); }
 
 	size_t used() override { return call<Rpc_used>(); }
-
-	void set_label(char *label) override { call<Rpc_set_label>(label); }
 };
 
 #endif /* _INCLUDE__RAM_SESSION__CLIENT_H_ */

repos/base/include/ram_session/ram_session.h

@@ -120,8 +120,6 @@ struct Genode::Ram_session : Session
 		return q > u ? q - u : 0;
 	}
 
-	virtual void set_label(char *label) = 0;
-
 
 	/*********************
 	 ** RPC declaration **
@@ -135,10 +133,9 @@ struct Genode::Ram_session : Session
 	GENODE_RPC(Rpc_transfer_quota, int, transfer_quota, Ram_session_capability, size_t);
 	GENODE_RPC(Rpc_quota, size_t, quota);
 	GENODE_RPC(Rpc_used, size_t, used);
-	GENODE_RPC(Rpc_set_label, void, set_label, char*);
 
 	GENODE_RPC_INTERFACE(Rpc_alloc, Rpc_free, Rpc_ref_account,
-	                     Rpc_transfer_quota, Rpc_quota, Rpc_used, Rpc_set_label);
+	                     Rpc_transfer_quota, Rpc_quota, Rpc_used);
 };
 
 #endif /* _INCLUDE__RAM_SESSION__RAM_SESSION_H_ */

repos/base/include/trace_session/client.h

@@ -95,11 +95,8 @@ struct Genode::Trace::Session_client : Genode::Rpc_client<Genode::Trace::Session
 		void resume(Subject_id subject) override {
 			call<Rpc_resume>(subject); }
 
-		CPU_info cpu_info(Subject_id subject) override {
-			return call<Rpc_cpu_info>(subject); }
-
-		RAM_info ram_info(Subject_id subject) override {
-			return call<Rpc_ram_info>(subject); }
+		Subject_info subject_info(Subject_id subject) override {
+			return call<Rpc_subject_info>(subject); }
 
 		Dataspace_capability buffer(Subject_id subject) override {
 			return call<Rpc_buffer>(subject); }