Skip to content

Commit 635fc62

Browse files
noguchi-kadamjstewart
noguchi-k
authored and
adamjstewart
committed
powerapi: add a space between literal and identifier (spack#14645)
1 parent da091c0 commit 635fc62

File tree

2 files changed

+189
-0
lines changed

2 files changed

+189
-0
lines changed

‎var/spack/repos/builtin/packages/powerapi/add_space.patch‎

Lines changed: 186 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
1+
diff -ur spack-src.org/src/pwr/deviceStat.cc spack-src/src/pwr/deviceStat.cc
2+
--- spack-src.org/src/pwr/deviceStat.cc 2020-01-28 11:00:47.690108007 +0900
3+
+++ spack-src/src/pwr/deviceStat.cc 2020-01-28 11:04:02.630472034 +0900
4+
@@ -47,7 +47,7 @@
5+
6+
int DeviceStat::startObj( ) {
7+
int retval = m_obj->attrStartLog( m_attrName );
8+
- DBGX("%s time=%"PRIu64" sec\n",objTypeToString(m_obj->type()),m_startTime);
9+
+ DBGX("%s time=%" PRIu64 " sec\n",objTypeToString(m_obj->type()),m_startTime);
10+
return retval;
11+
}
12+
13+
@@ -64,7 +64,7 @@
14+
return PWR_RET_SUCCESS;
15+
}
16+
int DeviceStat::stopObj( ) {
17+
- DBGX("%s time=%"PRIu64" sec\n",objTypeToString(m_obj->type()),m_startTime);
18+
+ DBGX("%s time=%" PRIu64 " sec\n",objTypeToString(m_obj->type()),m_startTime);
19+
int retval = m_obj->attrStopLog( m_attrName );
20+
return retval;
21+
}
22+
@@ -85,7 +85,7 @@
23+
int DeviceStat::stop( ) {
24+
m_isLogging = false;
25+
m_stopTime = getTime();
26+
- DBGX("time=%"PRIu64" sec\n",m_stopTime);
27+
+ DBGX("time=%" PRIu64 " sec\n",m_stopTime);
28+
if ( m_obj ) {
29+
return stopObj();
30+
} else {
31+
@@ -135,7 +135,7 @@
32+
33+
statTimes->start = timeStamp;
34+
statTimes->stop = timeStamp + nSamples * m_period * 1000000000 ;
35+
- DBGX("actual: start=%lf stop=%lf count=%"PRIu32"\n",
36+
+ DBGX("actual: start=%lf stop=%lf count=%" PRIu32 "\n",
37+
(double) timeStamp/1000000000,
38+
(double) statTimes->stop/1000000000, nSamples);
39+
40+
@@ -146,7 +146,7 @@
41+
statTimes->instant = statTimes->start + pos * m_period * 1000000000;
42+
}
43+
44+
- DBGX("actual: start=%lf stop=%lf instant=%lf count=%"PRIu32"\n",
45+
+ DBGX("actual: start=%lf stop=%lf instant=%lf count=%" PRIu32 "\n",
46+
(double) timeStamp/1000000000,
47+
(double) statTimes->stop/1000000000,
48+
(double) statTimes->instant/1000000000,nSamples);
49+
diff -ur spack-src.org/src/pwr/distRequest.cc spack-src/src/pwr/distRequest.cc
50+
--- spack-src.org/src/pwr/distRequest.cc 2020-01-28 11:00:47.690108007 +0900
51+
+++ spack-src/src/pwr/distRequest.cc 2020-01-28 11:05:11.687685948 +0900
52+
@@ -56,7 +56,7 @@
53+
// can we use "this"
54+
void DistRequest::getSamples( DistCommReq* req, CommGetSamplesRespEvent* ev )
55+
{
56+
- DBGX("count %"PRIu32"\n",ev->count);
57+
+ DBGX("count %" PRIu32 "\n",ev->count);
58+
59+
#if 0
60+
// FIX ME
61+
@@ -67,7 +67,7 @@
62+
for ( unsigned i = 0; i< ev->count; i++ ) {
63+
((uint64_t*)value[0])[i] = ev->data[i];
64+
}
65+
- DBGX("start time %"PRIu64", samples %"PRIu32"n",*timeStamp[0], ev->count);
66+
+ DBGX("start time %" PRIu64 ", samples %" PRIu32 "n",*timeStamp[0], ev->count);
67+
*timeStamp[0] = ev->startTime;
68+
m_commReqs.erase( req );
69+
}
70+
diff -ur spack-src.org/tools/pwrdaemon/router/commCreateEvent.cc spack-src/tools/pwrdaemon/router/commCreateEvent.cc
71+
--- spack-src.org/tools/pwrdaemon/router/commCreateEvent.cc 2020-01-28 11:00:47.730112186 +0900
72+
+++ spack-src/tools/pwrdaemon/router/commCreateEvent.cc 2020-01-28 11:12:35.644062899 +0900
73+
@@ -21,7 +21,7 @@
74+
bool RtrCommCreateEvent::process( EventGenerator* _rtr, EventChannel* ec ) {
75+
Router& rtr = *static_cast<Router*>(_rtr);
76+
Router::Client* client = rtr.getClient( ec );
77+
- DBGX("id=%"PRIx64"\n",commID);
78+
+ DBGX("id=%" PRIx64 "\n",commID);
79+
80+
client->addComm( commID, this );
81+
82+
diff -ur spack-src.org/tools/pwrdaemon/router/commGetSamplesEvent.h spack-src/tools/pwrdaemon/router/commGetSamplesEvent.h
83+
--- spack-src.org/tools/pwrdaemon/router/commGetSamplesEvent.h 2020-01-28 11:00:47.730112186 +0900
84+
+++ spack-src/tools/pwrdaemon/router/commGetSamplesEvent.h 2020-01-28 11:07:20.211111872 +0900
85+
@@ -45,7 +45,7 @@
86+
info->resp->id = id;
87+
id = (EventId) info;
88+
89+
- DBGX("commID=%" PRIx64 " eventId=%"PRIx64" new eventId=%p\n",
90+
+ DBGX("commID=%" PRIx64 " eventId=%" PRIx64 " new eventId=%p\n",
91+
commID, id, info );
92+
93+
for ( unsigned int i=0; i < commList.size(); i++ ) {
94+
diff -ur spack-src.org/tools/pwrdaemon/router/commLogEvents.h spack-src/tools/pwrdaemon/router/commLogEvents.h
95+
--- spack-src.org/tools/pwrdaemon/router/commLogEvents.h 2020-01-28 11:00:47.730112186 +0900
96+
+++ spack-src/tools/pwrdaemon/router/commLogEvents.h 2020-01-28 11:09:28.254487649 +0900
97+
@@ -46,7 +46,7 @@
98+
info->resp->id = id;
99+
id = (EventId) info;
100+
101+
- DBGX("commID=%"PRIu64" eventId=%" PRIx64 " new eventId=%p\n",
102+
+ DBGX("commID=%" PRIu64 " eventId=%" PRIx64 " new eventId=%p\n",
103+
commID, id, info );
104+
105+
for ( unsigned int i=0; i < commList.size(); i++ ) {
106+
diff -ur spack-src.org/tools/pwrdaemon/router/commReqEvent.h spack-src/tools/pwrdaemon/router/commReqEvent.h
107+
--- spack-src.org/tools/pwrdaemon/router/commReqEvent.h 2020-01-28 11:00:47.730112186 +0900
108+
+++ spack-src/tools/pwrdaemon/router/commReqEvent.h 2020-01-28 11:09:59.347735739 +0900
109+
@@ -35,7 +35,7 @@
110+
111+
CommReqInfo* info = new CommReqInfo;
112+
113+
- DBGX("commID=%"PRIx64" eventId=%"PRIx64" new eventId=%p\n",
114+
+ DBGX("commID=%" PRIx64 " eventId=%" PRIx64 " new eventId=%p\n",
115+
commID, id, info );
116+
117+
info->src = ec;
118+
diff -ur spack-src.org/tools/pwrdaemon/router/commRespEvent.h spack-src/tools/pwrdaemon/router/commRespEvent.h
119+
--- spack-src.org/tools/pwrdaemon/router/commRespEvent.h 2020-01-28 11:00:47.730112186 +0900
120+
+++ spack-src/tools/pwrdaemon/router/commRespEvent.h 2020-01-28 11:10:43.862385866 +0900
121+
@@ -33,7 +33,7 @@
122+
123+
bool process( EventGenerator* _rtr, EventChannel* ) {
124+
125+
- DBGX("id=%p status=%"PRIi32" grpIndex=%" PRIu64 "\n",
126+
+ DBGX("id=%p status=%" PRIi32 " grpIndex=%" PRIu64 "\n",
127+
(void*)id, status, grpIndex );
128+
129+
CommReqInfo* info = (CommReqInfo*) id;
130+
@@ -44,7 +44,7 @@
131+
132+
CommRespEvent* resp = static_cast<CommRespEvent*>(info->resp);
133+
if ( Get == info->ev->op ) {
134+
- DBGX("index %"PRIu64" is ready, num attrs %zu\n",
135+
+ DBGX("index %" PRIu64 " is ready, num attrs %zu\n",
136+
grpIndex, info->valueOp.size() );
137+
resp->timeStamp[grpIndex].resize( info->valueOp.size() );
138+
resp->value[grpIndex].resize( info->valueOp.size() );
139+
diff -ur spack-src.org/tools/pwrdaemon/router/rtrRouterEvent.h spack-src/tools/pwrdaemon/router/rtrRouterEvent.h
140+
--- spack-src.org/tools/pwrdaemon/router/rtrRouterEvent.h 2020-01-28 11:00:47.730112186 +0900
141+
+++ spack-src/tools/pwrdaemon/router/rtrRouterEvent.h 2020-01-28 11:11:05.824680110 +0900
142+
@@ -25,7 +25,7 @@
143+
144+
bool process( EventGenerator* _rtr, EventChannel* ec ) {
145+
Router& rtr = *static_cast<Router*>(_rtr);
146+
- DBGX("dest=%"PRIx64"\n",dest);
147+
+ DBGX("dest=%" PRIx64 "\n",dest);
148+
rtr.sendEvent( dest, this );
149+
150+
return true;
151+
diff -ur spack-src.org/tools/pwrdaemon/server/commCreateEvent.h spack-src/tools/pwrdaemon/server/commCreateEvent.h
152+
--- spack-src.org/tools/pwrdaemon/server/commCreateEvent.h 2020-01-28 11:00:47.740113231 +0900
153+
+++ spack-src/tools/pwrdaemon/server/commCreateEvent.h 2020-01-28 11:13:00.426651760 +0900
154+
@@ -21,7 +21,7 @@
155+
bool process( EventGenerator* gen, EventChannel* ) {
156+
Server& info = *static_cast<Server*>(gen);
157+
158+
- DBGX("commID=%"PRIx64"\n", commID);
159+
+ DBGX("commID=%" PRIx64 "\n", commID);
160+
161+
CommInfo& cInfo = info.m_commMap[commID];
162+
cInfo.objects.resize( members.size() );
163+
diff -ur spack-src.org/tools/pwrdaemon/server/commDestroyEvent.h spack-src/tools/pwrdaemon/server/commDestroyEvent.h
164+
--- spack-src.org/tools/pwrdaemon/server/commDestroyEvent.h 2020-01-28 11:00:47.740113231 +0900
165+
+++ spack-src/tools/pwrdaemon/server/commDestroyEvent.h 2020-01-28 11:11:42.438504895 +0900
166+
@@ -24,7 +24,7 @@
167+
bool process( EventGenerator* gen, EventChannel* ) {
168+
Server& info = *static_cast<Server*>(gen);
169+
170+
- DBGX("commID=%"PRIx64"\n", commID);
171+
+ DBGX("commID=%" PRIx64 "\n", commID);
172+
173+
// We have a bunch of PWR_Obj hanging off of the comm.
174+
// How/should we clean them up?
175+
diff -ur spack-src.org/tools/pwrdaemon/server/commReqEvent.h spack-src/tools/pwrdaemon/server/commReqEvent.h
176+
--- spack-src.org/tools/pwrdaemon/server/commReqEvent.h 2020-01-28 11:00:47.740113231 +0900
177+
+++ spack-src/tools/pwrdaemon/server/commReqEvent.h 2020-01-28 11:12:06.881058234 +0900
178+
@@ -31,7 +31,7 @@
179+
180+
PWR_Obj obj = m_info->m_commMap[commID].objects[0];
181+
182+
- DBGX("commID=%"PRIx64" grpIndex=%"PRIu64"\n",commID, grpIndex);
183+
+ DBGX("commID=%" PRIx64 " grpIndex=%" PRIu64 "\n",commID, grpIndex);
184+
char name[100];
185+
PWR_ObjGetName(obj,name,100);
186+

‎var/spack/repos/builtin/packages/powerapi/package.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ class Powerapi(AutotoolsPackage):
2626
depends_on('hwloc', when='+hwloc')
2727
depends_on('mpi', when='+mpi')
2828

29+
# C++11 requires a space between literal and identifier.
30+
patch('add_space.patch')
31+
2932
def autoreconf(self, spec, prefix):
3033
bash = which('bash')
3134
bash('./autogen.sh')

0 commit comments

Comments
 (0)