i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

launch_daemon: Renamed TeamRegistrator to TeamListener

Browse Source
This commit is contained in:
Axel Dörfler
2018-04-25 10:10:43 +02:00
parent 95cebb26c7
commit 6d7b8a3088
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/launch/Job.cpp
+7 -7
View File
@@ -87,17 +87,17 @@ Job::~Job()
} }
::TeamRegistrator* ::TeamListener*
Job::TeamRegistrator() const Job::TeamListener() const
{ {
return fTeamRegistrator; return fTeamListener;
} }
void void
Job::SetTeamRegistrator(::TeamRegistrator* registrator) Job::SetTeamListener(::TeamListener* listener)
{ {
fTeamRegistrator = registrator; fTeamListener = listener;
} }
@@ -693,8 +693,8 @@ Job::_Launch(const char* signature, entry_ref* ref, int argCount,
if (result == B_OK) { if (result == B_OK) {
resume_thread(mainThread); resume_thread(mainThread);
if (fTeamRegistrator != NULL) if (fTeamListener != NULL)
fTeamRegistrator->RegisterTeam(this); fTeamListener->TeamLaunched(this);
} else } else
kill_thread(mainThread); kill_thread(mainThread);
} }
src/servers/launch/Job.h
+5 -6
View File
@@ -32,9 +32,9 @@ struct entry_ref;
typedef std::map<BString, BMessage> PortMap; typedef std::map<BString, BMessage> PortMap;
class TeamRegistrator { class TeamListener {
public: public:
virtual void RegisterTeam(Job* job) = 0; virtual void TeamLaunched(Job* job) = 0;
}; };
@@ -44,9 +44,8 @@ public:
Job(const Job& other); Job(const Job& other);
virtual ~Job(); virtual ~Job();
::TeamRegistrator* TeamRegistrator() const; ::TeamListener* TeamListener() const;
void SetTeamRegistrator( void SetTeamListener(::TeamListener* listener);
::TeamRegistrator* registrator);
bool IsEnabled() const; bool IsEnabled() const;
void SetEnabled(bool enable); void SetEnabled(bool enable);
@@ -144,7 +143,7 @@ private:
BStringList fPendingJobs; BStringList fPendingJobs;
BObjectList<BMessage> BObjectList<BMessage>
fPendingLaunchDataReplies; fPendingLaunchDataReplies;
::TeamRegistrator* fTeamRegistrator; ::TeamListener* fTeamListener;
}; };
src/servers/launch/LaunchDaemon.cpp
+4 -4
View File
@@ -125,7 +125,7 @@ typedef std::map<team_id, Job*> TeamMap;
class LaunchDaemon : public BServer, public Finder, public ConditionContext, class LaunchDaemon : public BServer, public Finder, public ConditionContext,
public EventRegistrator, public TeamRegistrator { public EventRegistrator, public TeamListener {
public: public:
LaunchDaemon(bool userMode, LaunchDaemon(bool userMode,
const EventMap& events, status_t& error); const EventMap& events, status_t& error);
@@ -146,8 +146,8 @@ public:
virtual void UnregisterExternalEvent(Event* event, virtual void UnregisterExternalEvent(Event* event,
const char* name); const char* name);
// TeamRegistrator // TeamListener
virtual void RegisterTeam(Job* job); virtual void TeamListener(Job* job);
virtual void ReadyToRun(); virtual void ReadyToRun();
virtual void MessageReceived(BMessage* message); virtual void MessageReceived(BMessage* message);
@@ -1412,7 +1412,7 @@ LaunchDaemon::_AddJob(Target* target, bool service, BMessage& message)
if (job == NULL) if (job == NULL)
return; return;
job->SetTeamRegistrator(this); job->SetTeamListener(this);
job->SetService(service); job->SetService(service);
job->SetCreateDefaultPort(service); job->SetCreateDefaultPort(service);
job->SetTarget(target); job->SetTarget(target);