Merge lp:~epics-core/epics-base/get-cpus into lp:~epics-core/epics-base/3.15

[Ralph Lange]

Add int epicsThreadGetCPUs() to the epicsThread API.

epicsThreadGetCPUs() returns the number of logical CPUs that are available for the IOC. On systems that use Hyper-Threading, this number may be up to twice the number of physical cores.

The Posix and WIN32 implementations are returning the number of CPUs available for the process, which may be limited by the system.
For the time being, vxWorks just returns 1.

Only tested for Linux. The implementations for RTEMS, vxWorks and WIN32 need testing, please...

[mdavidsaver (mdavidsaver)]

I'd certainly like to see this merged. For possilbly more complete posix and win32 implementations see:

http://bazaar.launchpad.net/~epics-core/epics-base/thread-pool/revision/12255

[Andrew Johnson (anj)]

I'd prefer Ralph's routine name with Michael's implementations on WIN32 & Posix (and his test).

[lp:~epics-core/epics-base/get-cpus]

12412. By Ralph Lange on 2014-05-18

.bzrignore: add QtCreator project files

12413. By Ralph Lange on 2014-05-18

libCom/osi: use epicsThreadGetCPUs implementation from thread-pool branch (posix, WIN32)

[Ralph Lange (ralph-lange)]

I changed the branch in line with Andrew's preferences.

[Andrew Johnson (anj)]

Looks good and works for me, merging — thanks.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2012-06-22 23:16:26 +0000
+++ .bzrignore	2014-05-18 15:26:56 +0000
@@ -6,3 +6,4 @@
 ./include
 ./templates
 **/O.*
+./QtC-*
 
=== modified file 'src/libCom/osi/epicsThread.h'
--- src/libCom/osi/epicsThread.h	2012-07-06 21:33:10 +0000
+++ src/libCom/osi/epicsThread.h	2014-05-18 15:26:56 +0000
@@ -3,7 +3,7 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* Copyright (c) 2012 ITER Organization
+* Copyright (c) 2013 ITER Organization.
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
@@ -85,6 +85,7 @@
 epicsShareFunc double epicsShareAPI epicsThreadSleepQuantum(void);
 epicsShareFunc epicsThreadId epicsShareAPI epicsThreadGetIdSelf(void);
 epicsShareFunc epicsThreadId epicsShareAPI epicsThreadGetId(const char *name);
+epicsShareFunc int epicsThreadGetCPUs(void);
 
 epicsShareFunc const char * epicsShareAPI epicsThreadGetNameSelf(void);
 
 
=== modified file 'src/libCom/osi/os/RTEMS/osdThread.c'
--- src/libCom/osi/os/RTEMS/osdThread.c	2012-07-31 19:04:38 +0000
+++ src/libCom/osi/os/RTEMS/osdThread.c	2014-05-18 15:26:56 +0000
@@ -718,3 +718,12 @@
 
     return 1.0 / rtemsTicksPerSecond_double;
 }
+
+epicsShareFunc int epicsThreadGetCPUs(void)
+{
+#if defined(RTEMS_SMP)
+    return rtems_smp_get_number_of_processors();
+#else
+    return 1;
+#endif
+}
 
=== modified file 'src/libCom/osi/os/WIN32/osdThread.c'
--- src/libCom/osi/os/WIN32/osdThread.c	2013-12-17 18:54:04 +0000
+++ src/libCom/osi/os/WIN32/osdThread.c	2014-05-18 15:26:56 +0000
@@ -1101,6 +1101,18 @@
     return ( void * ) TlsGetValue ( pPvt->key );
 }
 
+/*
+ * epicsThreadGetCPUs ()
+ */
+epicsShareFunc int epicsThreadGetCPUs ( void )
+{
+    SYSTEM_INFO sysinfo;
+    GetSystemInfo(&sysinfo);
+    if (sysinfo.dwNumberOfProcessors > 0)
+        return sysinfo.dwNumberOfProcessors;
+    return 1;
+}
+
 #ifdef TEST_CODES
 void testPriorityMapping ()
 {
 
=== modified file 'src/libCom/osi/os/posix/osdThread.c'
--- src/libCom/osi/os/posix/osdThread.c	2012-09-20 19:55:32 +0000
+++ src/libCom/osi/os/posix/osdThread.c	2014-05-18 15:26:56 +0000
@@ -3,7 +3,7 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* Copyright (c) 2012 ITER Organization
+* Copyright (c) 2013 ITER Organization.
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
@@ -873,3 +873,18 @@
     return 1.0 / hz;
 }
 
+epicsShareFunc int epicsThreadGetCPUs(void)
+{
+    long ret;
+#ifdef _SC_NPROCESSORS_ONLN
+    ret = sysconf(_SC_NPROCESSORS_ONLN);
+    if (ret > 0)
+        return ret;
+#endif
+#ifdef _SC_NPROCESSORS_CONF
+    ret = sysconf(_SC_NPROCESSORS_CONF);
+    if (ret > 0)
+        return ret;
+#endif
+    return 1;
+}
 
=== modified file 'src/libCom/osi/os/vxWorks/osdThread.c'
--- src/libCom/osi/os/vxWorks/osdThread.c	2013-06-07 23:08:38 +0000
+++ src/libCom/osi/os/vxWorks/osdThread.c	2014-05-18 15:26:56 +0000
@@ -447,3 +447,8 @@
     double HZ = sysClkRateGet ();
     return 1.0 / HZ;
 }
+
+epicsShareFunc int epicsThreadGetCPUs(void)
+{
+    return 1;
+}
 
=== modified file 'src/libCom/test/epicsThreadTest.cpp'
--- src/libCom/test/epicsThreadTest.cpp	2006-11-09 22:38:41 +0000
+++ src/libCom/test/epicsThreadTest.cpp	2014-05-18 15:26:56 +0000
@@ -81,7 +81,11 @@
 
 MAIN(epicsThreadTest)
 {
-    testPlan(8);
+    testPlan(9);
+
+    unsigned int ncpus = epicsThreadGetCPUs();
+    testDiag("System has %u CPUs", ncpus);
+    testOk1(ncpus > 0);
 
     const int ntasks = 3;
     myThread *myThreads[ntasks];