Skip to content

Commit 8eb272c

Browse files
kwolekrkwolekr
committedJul 10, 2015
Misc. minor fixes
·
5.11.00.4.13
1 parent e6f0178 commit 8eb272c

File tree

5 files changed

+67
-94
lines changed

5 files changed

+67
-94
lines changed
 

Diff for: ‎src/client/inputhandler.h

+6-7
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,14 @@ class MyEventReceiver : public IEventReceiver
8888
} else if (event.EventType == irr::EET_LOG_TEXT_EVENT) {
8989
static const enum LogMessageLevel irr_loglev_conv[] = {
9090
LMT_VERBOSE, // ELL_DEBUG
91-
LMT_INFO, // ELL_INFORMATION
92-
LMT_ACTION, // ELL_WARNING
93-
LMT_ERROR, // ELL_ERROR
94-
LMT_ERROR, // ELL_NONE
91+
LMT_INFO, // ELL_INFORMATION
92+
LMT_ACTION, // ELL_WARNING
93+
LMT_ERROR, // ELL_ERROR
94+
LMT_ERROR, // ELL_NONE
9595
};
96-
assert(event.LogEvent.Level < sizeof(irr_loglev_conv));
96+
assert(event.LogEvent.Level < ARRLEN(irr_loglev_conv));
9797
log_printline(irr_loglev_conv[event.LogEvent.Level],
98-
std::string("Irrlicht: ")
99-
+ (const char*) event.LogEvent.Text);
98+
std::string("Irrlicht: ") + (const char *)event.LogEvent.Text);
10099
return true;
101100
}
102101
/* always return false in order to continue processing events */

Diff for: ‎src/mapblock.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ static const char *modified_reason_strings[] = {
5757
"deactivateFarObjects: Static data moved in",
5858
"deactivateFarObjects: Static data moved out",
5959
"deactivateFarObjects: Static data changed considerably",
60-
"finishBlockMake: expireDayNightDiff"
60+
"finishBlockMake: expireDayNightDiff",
6161
"unknown",
6262
};
6363

Diff for: ‎src/minimap.h

+1-5
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,7 @@ class MinimapUpdateThread : public UpdateThread {
105105
MinimapData *data;
106106

107107
protected:
108-
const char *getName()
109-
{
110-
return "MinimapUpdateThread";
111-
}
112-
108+
const char *getName() { return "MinimapUpdateThread"; }
113109
virtual void doUpdate();
114110

115111
private:

Diff for: ‎src/noise.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ void PcgRandom::bytes(void *out, size_t len)
138138
*outb = r & 0xFF;
139139
outb++;
140140
bytes_left--;
141-
r >>= 8;
141+
r >>= CHAR_BIT;
142142
}
143143
}
144144

Diff for: ‎src/util/thread.h

+58-80
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2828
#include "log.h"
2929

3030
template<typename T>
31-
class MutexedVariable
32-
{
31+
class MutexedVariable {
3332
public:
3433
MutexedVariable(T value):
3534
m_value(value)
36-
{
37-
}
35+
{}
3836

3937
T get()
4038
{
@@ -47,13 +45,13 @@ class MutexedVariable
4745
JMutexAutoLock lock(m_mutex);
4846
m_value = value;
4947
}
50-
48+
5149
// You'll want to grab this in a SharedPtr
52-
JMutexAutoLock * getLock()
50+
JMutexAutoLock *getLock()
5351
{
5452
return new JMutexAutoLock(m_mutex);
5553
}
56-
54+
5755
// You pretty surely want to grab the lock when accessing this
5856
T m_value;
5957

@@ -65,43 +63,35 @@ class MutexedVariable
6563
A single worker thread - multiple client threads queue framework.
6664
*/
6765
template<typename Key, typename T, typename Caller, typename CallerData>
68-
class GetResult
69-
{
66+
class GetResult {
7067
public:
7168
Key key;
7269
T item;
7370
std::pair<Caller, CallerData> caller;
7471
};
7572

7673
template<typename Key, typename T, typename Caller, typename CallerData>
77-
class ResultQueue: public MutexedQueue< GetResult<Key, T, Caller, CallerData> >
78-
{
74+
class ResultQueue : public MutexedQueue<GetResult<Key, T, Caller, CallerData> > {
7975
};
8076

8177
template<typename Caller, typename Data, typename Key, typename T>
82-
class CallerInfo
83-
{
78+
class CallerInfo {
8479
public:
8580
Caller caller;
8681
Data data;
87-
ResultQueue< Key, T, Caller, Data>* dest;
82+
ResultQueue<Key, T, Caller, Data> *dest;
8883
};
8984

9085
template<typename Key, typename T, typename Caller, typename CallerData>
91-
class GetRequest
92-
{
86+
class GetRequest {
9387
public:
94-
GetRequest()
95-
{
96-
}
97-
GetRequest(Key a_key)
98-
{
88+
GetRequest() {}
89+
~GetRequest() {}
90+
91+
GetRequest(Key a_key) {
9992
key = a_key;
10093
}
101-
~GetRequest()
102-
{
103-
}
104-
94+
10595
Key key;
10696
std::list<CallerInfo<Caller, CallerData, Key, T> > callers;
10797
};
@@ -114,49 +104,44 @@ class GetRequest
114104
* @param CallerData data passed back to caller
115105
*/
116106
template<typename Key, typename T, typename Caller, typename CallerData>
117-
class RequestQueue
118-
{
107+
class RequestQueue {
119108
public:
120109
bool empty()
121110
{
122111
return m_queue.empty();
123112
}
124113

125114
void add(Key key, Caller caller, CallerData callerdata,
126-
ResultQueue<Key, T, Caller, CallerData> *dest)
115+
ResultQueue<Key, T, Caller, CallerData> *dest)
127116
{
117+
typename std::deque<GetRequest<Key, T, Caller, CallerData> >::iterator i;
118+
typename std::list<CallerInfo<Caller, CallerData, Key, T> >::iterator j;
119+
128120
{
129121
JMutexAutoLock lock(m_queue.getMutex());
130122

131123
/*
132124
If the caller is already on the list, only update CallerData
133125
*/
134-
for(typename std::deque< GetRequest<Key, T, Caller, CallerData> >::iterator
135-
i = m_queue.getQueue().begin();
136-
i != m_queue.getQueue().end(); ++i)
137-
{
126+
for (i = m_queue.getQueue().begin(); i != m_queue.getQueue().end(); ++i) {
138127
GetRequest<Key, T, Caller, CallerData> &request = *i;
139-
140-
if(request.key == key)
141-
{
142-
for(typename std::list< CallerInfo<Caller, CallerData, Key, T> >::iterator
143-
i = request.callers.begin();
144-
i != request.callers.end(); ++i)
145-
{
146-
CallerInfo<Caller, CallerData, Key, T> &ca = *i;
147-
if(ca.caller == caller)
148-
{
149-
ca.data = callerdata;
150-
return;
151-
}
128+
if (request.key != key)
129+
continue;
130+
131+
for (j = request.callers.begin(); j != request.callers.end(); ++j) {
132+
CallerInfo<Caller, CallerData, Key, T> &ca = *j;
133+
if (ca.caller == caller) {
134+
ca.data = callerdata;
135+
return;
152136
}
153-
CallerInfo<Caller, CallerData, Key, T> ca;
154-
ca.caller = caller;
155-
ca.data = callerdata;
156-
ca.dest = dest;
157-
request.callers.push_back(ca);
158-
return;
159137
}
138+
139+
CallerInfo<Caller, CallerData, Key, T> ca;
140+
ca.caller = caller;
141+
ca.data = callerdata;
142+
ca.dest = dest;
143+
request.callers.push_back(ca);
144+
return;
160145
}
161146
}
162147

@@ -171,7 +156,7 @@ class RequestQueue
171156
ca.data = callerdata;
172157
ca.dest = dest;
173158
request.callers.push_back(ca);
174-
159+
175160
m_queue.push_back(request);
176161
}
177162

@@ -185,13 +170,11 @@ class RequestQueue
185170
return m_queue.pop_frontNoEx();
186171
}
187172

188-
void pushResult(GetRequest<Key, T, Caller, CallerData> req,
189-
T res) {
190-
191-
for(typename std::list< CallerInfo<Caller, CallerData, Key, T> >::iterator
173+
void pushResult(GetRequest<Key, T, Caller, CallerData> req, T res)
174+
{
175+
for (typename std::list<CallerInfo<Caller, CallerData, Key, T> >::iterator
192176
i = req.callers.begin();
193-
i != req.callers.end(); ++i)
194-
{
177+
i != req.callers.end(); ++i) {
195178
CallerInfo<Caller, CallerData, Key, T> &ca = *i;
196179

197180
GetResult<Key,T,Caller,CallerData> result;
@@ -206,24 +189,13 @@ class RequestQueue
206189
}
207190

208191
private:
209-
MutexedQueue< GetRequest<Key, T, Caller, CallerData> > m_queue;
192+
MutexedQueue<GetRequest<Key, T, Caller, CallerData> > m_queue;
210193
};
211194

212-
class UpdateThread : public JThread
213-
{
214-
private:
215-
JSemaphore m_update_sem;
216-
217-
protected:
218-
virtual void doUpdate() = 0;
219-
virtual const char *getName() = 0;
220-
195+
class UpdateThread : public JThread {
221196
public:
222-
UpdateThread()
223-
{
224-
}
225-
~UpdateThread()
226-
{}
197+
UpdateThread() {}
198+
virtual ~UpdateThread() {}
227199

228200
void deferUpdate()
229201
{
@@ -243,30 +215,36 @@ class UpdateThread : public JThread
243215
ThreadStarted();
244216

245217
const char *thread_name = getName();
246-
247218
log_register_thread(thread_name);
219+
porting::setThreadName(thread_name);
248220

249221
DSTACK(__FUNCTION_NAME);
250-
251222
BEGIN_DEBUG_EXCEPTION_HANDLER
252223

253-
porting::setThreadName(thread_name);
254-
255224
while (!StopRequested()) {
256-
257225
m_update_sem.Wait();
258226

259227
// Empty the queue, just in case doUpdate() is expensive
260-
while (m_update_sem.GetValue()) m_update_sem.Wait();
228+
while (m_update_sem.GetValue())
229+
m_update_sem.Wait();
261230

262-
if (StopRequested()) break;
231+
if (StopRequested())
232+
break;
263233

264234
doUpdate();
265235
}
236+
266237
END_DEBUG_EXCEPTION_HANDLER(errorstream)
267238

268239
return NULL;
269240
}
241+
242+
protected:
243+
virtual void doUpdate() = 0;
244+
virtual const char *getName() = 0;
245+
246+
private:
247+
JSemaphore m_update_sem;
270248
};
271249

272250
#endif

0 commit comments

Comments
 (0)
Please sign in to comment.