From cf98224949822c3f8d97e6ca460ac04c8b2bb3ce Mon Sep 17 00:00:00 2001
From: junchao <junchao@mellanox.com>
Date: Thu, 28 Nov 2019 10:25:08 +0200
Subject: [PATCH 1/2] Add make support for thermal control feature

---
 dockers/docker-platform-monitor/critical_processes    |  1 +
 .../docker-pmon.supervisord.conf.j2                   | 11 +++++++++++
 dockers/docker-platform-monitor/start.sh.j2           |  4 ++++
 rules/docker-platform-monitor.mk                      |  2 +-
 rules/sonic-thermalctld.mk                            |  5 +++++
 5 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 rules/sonic-thermalctld.mk

diff --git a/dockers/docker-platform-monitor/critical_processes b/dockers/docker-platform-monitor/critical_processes
index 4233cda34982..663fadc9bf3a 100644
--- a/dockers/docker-platform-monitor/critical_processes
+++ b/dockers/docker-platform-monitor/critical_processes
@@ -3,3 +3,4 @@ ledd
 xcvrd
 psud
 syseepromd
+thermalctld
diff --git a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
index 9a2414c30d05..d57e0956c249 100644
--- a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
+++ b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
@@ -86,3 +86,14 @@ stdout_logfile=syslog
 stderr_logfile=syslog
 startsecs=0
 {% endif %}
+
+{% if not skip_thermalctld %}
+[program:thermalctld]
+command=/usr/bin/thermalctld
+priority=9
+autostart=false
+autorestart=true
+stdout_logfile=syslog
+stderr_logfile=syslog
+startsecs=0
+{% endif %}
diff --git a/dockers/docker-platform-monitor/start.sh.j2 b/dockers/docker-platform-monitor/start.sh.j2
index 44f8f159f612..a72f4fa8eb85 100644
--- a/dockers/docker-platform-monitor/start.sh.j2
+++ b/dockers/docker-platform-monitor/start.sh.j2
@@ -71,3 +71,7 @@ supervisorctl start psud
 supervisorctl start syseepromd
 {% endif %}
 
+{% if not skip_thermalctld %}
+supervisorctl start thermalctld
+{% endif %}
+
diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk
index 7a319e4bf120..2a3b2a2b98de 100644
--- a/rules/docker-platform-monitor.mk
+++ b/rules/docker-platform-monitor.mk
@@ -10,7 +10,7 @@ $(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSENSORS) $(LM_SENSORS) $(FANCONTROL)
 ifeq ($(CONFIGURED_PLATFORM),barefoot)
 $(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(PYTHON_THRIFT)
 endif
-$(DOCKER_PLATFORM_MONITOR)_PYTHON_DEBS += $(SONIC_LEDD) $(SONIC_XCVRD) $(SONIC_PSUD) $(SONIC_SYSEEPROMD)
+$(DOCKER_PLATFORM_MONITOR)_PYTHON_DEBS += $(SONIC_LEDD) $(SONIC_XCVRD) $(SONIC_PSUD) $(SONIC_SYSEEPROMD) $(SONIC_THERMALCTLD)
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2)
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SWSSSDK_PY2)
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_API_PY2)
diff --git a/rules/sonic-thermalctld.mk b/rules/sonic-thermalctld.mk
new file mode 100644
index 000000000000..7ba9a3619310
--- /dev/null
+++ b/rules/sonic-thermalctld.mk
@@ -0,0 +1,5 @@
+# sonic-thermalctld (SONiC Thermal control daemon) Debian package
+
+SONIC_THERMALCTLD = python-sonic-thermalctld_1.0-1_all.deb
+$(SONIC_THERMALCTLD)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-thermalctld
+SONIC_PYTHON_STDEB_DEBS += $(SONIC_THERMALCTLD)
\ No newline at end of file

From 1d837177b1914ac6f1562f6f1902faa1cbc81bfa Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Fri, 6 Dec 2019 12:23:29 +0800
Subject: [PATCH 2/2] Move task_base form sonic-platform-daemon to
 sonic-daemon-base so that all sonic pmon daemon can use it

---
 .../sonic_daemon_base/task_base.py            | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 src/sonic-daemon-base/sonic_daemon_base/task_base.py

diff --git a/src/sonic-daemon-base/sonic_daemon_base/task_base.py b/src/sonic-daemon-base/sonic_daemon_base/task_base.py
new file mode 100644
index 000000000000..e1738ffba213
--- /dev/null
+++ b/src/sonic-daemon-base/sonic_daemon_base/task_base.py
@@ -0,0 +1,50 @@
+import multiprocessing
+import os
+import signal
+import threading
+
+
+#
+# ProcessTaskBase =====================================================================
+#
+class ProcessTaskBase(object):  # TODO: put this class to swss-platform-common
+    def __init__(self):
+        self.task_process = None
+        self.task_stopping_event = multiprocessing.Event()
+
+    def task_worker(self):
+        pass
+
+    def task_run(self):
+        if self.task_stopping_event.is_set():
+            return
+
+        self.task_process = multiprocessing.Process(target=self.task_worker)
+        self.task_process.start()
+
+    def task_stop(self):
+        self.task_stopping_event.set()
+        os.kill(self.task_process.pid, signal.SIGKILL)
+
+
+#
+# ThreadTaskBase =====================================================================
+#
+class ThreadTaskBase(object):  # TODO: put this class to swss-platform-common;
+    def __init__(self):
+        self.task_thread = None
+        self.task_stopping_event = threading.Event()
+
+    def task_worker(self):
+        pass
+
+    def task_run(self):
+        if self.task_stopping_event.is_set():
+            return
+
+        self.task_thread = threading.Thread(target=self.task_worker)
+        self.task_thread.start()
+
+    def task_stop(self):
+        self.task_stopping_event.set()
+        self.task_thread.join()