New upstream version 3.1.1upstream/3.1.1

11 files changed, 17 insertions, 13 deletions

diff --git a/pcp/PCPDynamicColumn.c b/pcp/PCPDynamicColumn.c
index 29dc9f9..aab2525 100644
--- a/pcp/PCPDynamicColumn.c
+++ b/pcp/PCPDynamicColumn.c
@@ -3,7 +3,7 @@ htop - PCPDynamicColumn.c
 (C) 2021 Sohaib Mohammed
 (C) 2021 htop dev team
 (C) 2021 Red Hat, Inc.
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/pcp/PCPDynamicMeter.c b/pcp/PCPDynamicMeter.c
index ccea813..7c55e4b 100644
--- a/pcp/PCPDynamicMeter.c
+++ b/pcp/PCPDynamicMeter.c
@@ -2,7 +2,7 @@
 htop - PCPDynamicMeter.c
 (C) 2021 htop dev team
 (C) 2021 Red Hat, Inc.
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 #include "config.h" // IWYU pragma: keep
diff --git a/pcp/PCPMetric.c b/pcp/PCPMetric.c
index c8cfe71..f6d4c97 100644
--- a/pcp/PCPMetric.c
+++ b/pcp/PCPMetric.c
@@ -2,7 +2,7 @@
 htop - PCPMetric.c
 (C) 2020-2021 htop dev team
 (C) 2020-2021 Red Hat, Inc.
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
@@ -164,7 +164,10 @@ bool PCPMetric_fetch(struct timeval* timestamp) {
       pmFreeResult(pcp->result);
       pcp->result = NULL;
    }
-   int sts = pmFetch(pcp->totalMetrics, pcp->fetch, &pcp->result);
+   int sts, count = 0;
+   do {
+       sts = pmFetch(pcp->totalMetrics, pcp->fetch, &pcp->result);
+   } while (sts == PM_ERR_IPC && ++count < 3);
    if (sts < 0) {
       if (pmDebugOptions.appl0)
          fprintf(stderr, "Error: cannot fetch metric values: %s\n",
diff --git a/pcp/PCPMetric.h b/pcp/PCPMetric.h
index 7d62503..aa0e2a7 100644
--- a/pcp/PCPMetric.h
+++ b/pcp/PCPMetric.h
@@ -4,7 +4,7 @@
 htop - PCPMetric.h
 (C) 2020-2021 htop dev team
 (C) 2020-2021 Red Hat, Inc.
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/pcp/PCPProcess.c b/pcp/PCPProcess.c
index fa61506..a983a96 100644
--- a/pcp/PCPProcess.c
+++ b/pcp/PCPProcess.c
@@ -3,7 +3,7 @@ htop - PCPProcess.c
 (C) 2014 Hisham H. Muhammad
 (C) 2020-2021 htop dev team
 (C) 2020-2021 Red Hat, Inc.
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/pcp/PCPProcess.h b/pcp/PCPProcess.h
index e844097..46ba07f 100644
--- a/pcp/PCPProcess.h
+++ b/pcp/PCPProcess.h
@@ -5,7 +5,7 @@ htop - PCPProcess.h
 (C) 2014 Hisham H. Muhammad
 (C) 2020 htop dev team
 (C) 2020-2021 Red Hat, Inc.  All Rights Reserved.
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/pcp/PCPProcessList.c b/pcp/PCPProcessList.c
index b55b5a4..554e43d 100644
--- a/pcp/PCPProcessList.c
+++ b/pcp/PCPProcessList.c
@@ -3,7 +3,7 @@ htop - PCPProcessList.c
 (C) 2014 Hisham H. Muhammad
 (C) 2020-2021 htop dev team
 (C) 2020-2021 Red Hat, Inc.
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
@@ -680,7 +680,8 @@ void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) {
    PCPMetric_enable(PCP_PROC_SMAPS_SWAPPSS, smaps_flag && enabled);
 
    struct timeval timestamp;
-   PCPMetric_fetch(&timestamp);
+   if (PCPMetric_fetch(&timestamp) != true)
+      return;
 
    double sample = this->timestamp;
    this->timestamp = pmtimevalToReal(&timestamp);
diff --git a/pcp/PCPProcessList.h b/pcp/PCPProcessList.h
index 07f6c39..a3a7372 100644
--- a/pcp/PCPProcessList.h
+++ b/pcp/PCPProcessList.h
@@ -3,7 +3,7 @@
 /*
 htop - PCPProcessList.h
 (C) 2014 Hisham H. Muhammad
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/pcp/Platform.c b/pcp/Platform.c
index 29055b9..cd7b1f4 100644
--- a/pcp/Platform.c
+++ b/pcp/Platform.c
@@ -3,7 +3,7 @@ htop - linux/Platform.c
 (C) 2014 Hisham H. Muhammad
 (C) 2020-2021 htop dev team
 (C) 2020-2021 Red Hat, Inc.
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/pcp/Platform.h b/pcp/Platform.h
index 14e5746..37a8799 100644
--- a/pcp/Platform.h
+++ b/pcp/Platform.h
@@ -5,7 +5,7 @@ htop - pcp/Platform.h
 (C) 2014 Hisham H. Muhammad
 (C) 2020-2021 htop dev team
 (C) 2020-2021 Red Hat, Inc.  All Rights Reserved.
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/pcp/ProcessField.h b/pcp/ProcessField.h
index 979addc..b3ba265 100644
--- a/pcp/ProcessField.h
+++ b/pcp/ProcessField.h
@@ -5,7 +5,7 @@ htop - pcp/ProcessField.h
 (C) 2014 Hisham H. Muhammad
 (C) 2021 htop dev team
 (C) 2020-2021 Red Hat, Inc.  All Rights Reserved.
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */