From 6d7b8a3088899c98ee8bbbef1a0a6f1049f4aa89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 4 Dec 2017 21:51:41 +0100 Subject: [PATCH] launch_daemon: Renamed TeamRegistrator to TeamListener --- src/servers/launch/Job.cpp | 14 +++++++------- src/servers/launch/Job.h | 11 +++++------ src/servers/launch/LaunchDaemon.cpp | 8 ++++---- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/servers/launch/Job.cpp b/src/servers/launch/Job.cpp index a742518a9a..08ee72eb3a 100644 --- a/src/servers/launch/Job.cpp +++ b/src/servers/launch/Job.cpp @@ -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); } diff --git a/src/servers/launch/Job.h b/src/servers/launch/Job.h index 84048f5312..189dd17557 100644 --- a/src/servers/launch/Job.h +++ b/src/servers/launch/Job.h @@ -32,9 +32,9 @@ struct entry_ref; typedef std::map 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 fPendingLaunchDataReplies; - ::TeamRegistrator* fTeamRegistrator; + ::TeamListener* fTeamListener; }; diff --git a/src/servers/launch/LaunchDaemon.cpp b/src/servers/launch/LaunchDaemon.cpp index c1a1418a1e..4a628b73c7 100644 --- a/src/servers/launch/LaunchDaemon.cpp +++ b/src/servers/launch/LaunchDaemon.cpp @@ -125,7 +125,7 @@ typedef std::map 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);