launch_daemon: Renamed TeamRegistrator to TeamListener

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
+7 -7
View File
@@ -87,17 +87,17 @@ Job::~Job()
}
::TeamRegistrator*
Job::TeamRegistrator() const
::TeamListener*
Job::TeamListener() const
{
return fTeamRegistrator;
return fTeamListener;
}
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) {
resume_thread(mainThread);
if (fTeamRegistrator != NULL)
fTeamRegistrator->RegisterTeam(this);
if (fTeamListener != NULL)
fTeamListener->TeamLaunched(this);
} else
kill_thread(mainThread);
}
+5 -6
View File
@@ -32,9 +32,9 @@ struct entry_ref;
typedef std::map<BString, BMessage> PortMap;
class TeamRegistrator {
class TeamListener {
public:
virtual void RegisterTeam(Job* job) = 0;
virtual void TeamLaunched(Job* job) = 0;
};
@@ -44,9 +44,8 @@ public:
Job(const Job& other);
virtual ~Job();
::TeamRegistrator* TeamRegistrator() const;
void SetTeamRegistrator(
::TeamRegistrator* registrator);
::TeamListener* TeamListener() const;
void SetTeamListener(::TeamListener* listener);
bool IsEnabled() const;
void SetEnabled(bool enable);
@@ -144,7 +143,7 @@ private:
BStringList fPendingJobs;
BObjectList<BMessage>
fPendingLaunchDataReplies;
::TeamRegistrator* fTeamRegistrator;
::TeamListener* fTeamListener;
};
+4 -4
View File
@@ -125,7 +125,7 @@ typedef std::map<team_id, Job*> TeamMap;
class LaunchDaemon : public BServer, public Finder, public ConditionContext,
public EventRegistrator, public TeamRegistrator {
public EventRegistrator, public TeamListener {
public:
LaunchDaemon(bool userMode,
const EventMap& events, status_t& error);
@@ -146,8 +146,8 @@ public:
virtual void UnregisterExternalEvent(Event* event,
const char* name);
// TeamRegistrator
virtual void RegisterTeam(Job* job);
// TeamListener
virtual void TeamListener(Job* job);
virtual void ReadyToRun();
virtual void MessageReceived(BMessage* message);
@@ -1412,7 +1412,7 @@ LaunchDaemon::_AddJob(Target* target, bool service, BMessage& message)
if (job == NULL)
return;
job->SetTeamRegistrator(this);
job->SetTeamListener(this);
job->SetService(service);
job->SetCreateDefaultPort(service);
job->SetTarget(target);