Skip to content

Commit cde1939

Browse files
trondndaverigby
authored andcommitted
Refactor: remove return value for reserve/release
The functions may only fail with invalid input to the functions and if that happens an exception is thrown Change-Id: Ie36b0888205281e4a0207fe1ff6ea0283a98f0b3 Reviewed-on: http://review.couchbase.org/c/kv_engine/+/143490 Tested-by: Build Bot <[email protected]> Reviewed-by: Dave Rigby <[email protected]>
1 parent e34efb3 commit cde1939

File tree

7 files changed

+20
-31
lines changed

7 files changed

+20
-31
lines changed

auditd/tests/testauditd.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ class AuditMockServerCookieApi : public ServerCookieIface {
9393
throw std::runtime_error("Not implemented");
9494
}
9595

96-
ENGINE_ERROR_CODE reserve(gsl::not_null<const void*> cookie) override {
96+
void reserve(gsl::not_null<const void*> cookie) override {
9797
throw std::runtime_error("Not implemented");
9898
}
99-
ENGINE_ERROR_CODE release(gsl::not_null<const void*> cookie) override {
99+
void release(gsl::not_null<const void*> cookie) override {
100100
throw std::runtime_error("Not implemented");
101101
}
102102
void set_priority(gsl::not_null<const void*> cookie,

daemon/server_api.cc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,12 +191,11 @@ struct ServerCookieApi : public ServerCookieIface {
191191
::scheduleDcpStep(getCookie(cookie));
192192
}
193193

194-
ENGINE_ERROR_CODE reserve(gsl::not_null<const void*> void_cookie) override {
194+
void reserve(gsl::not_null<const void*> void_cookie) override {
195195
getCookie(void_cookie).incrementRefcount();
196-
return ENGINE_SUCCESS;
197196
}
198197

199-
ENGINE_ERROR_CODE release(gsl::not_null<const void*> void_cookie) override {
198+
void release(gsl::not_null<const void*> void_cookie) override {
200199
auto& cookie = getCookie(void_cookie);
201200
auto& connection = cookie.getConnection();
202201
auto& thr = connection.getThread();
@@ -216,8 +215,6 @@ struct ServerCookieApi : public ServerCookieIface {
216215
if (thr.notification.push(&connection)) {
217216
notify_thread(thr);
218217
}
219-
220-
return ENGINE_SUCCESS;
221218
}
222219

223220
void set_priority(gsl::not_null<const void*> cookie,

engines/ep/src/ep_engine.cc

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1934,16 +1934,14 @@ EventuallyPersistentEngine::EventuallyPersistentEngine(
19341934
serverApi = getServerApiFunc();
19351935
}
19361936

1937-
ENGINE_ERROR_CODE EventuallyPersistentEngine::reserveCookie(const void *cookie)
1938-
{
1937+
void EventuallyPersistentEngine::reserveCookie(const void* cookie) {
19391938
NonBucketAllocationGuard guard;
1940-
return serverApi->cookie->reserve(cookie);
1939+
serverApi->cookie->reserve(cookie);
19411940
}
19421941

1943-
ENGINE_ERROR_CODE EventuallyPersistentEngine::releaseCookie(const void *cookie)
1944-
{
1942+
void EventuallyPersistentEngine::releaseCookie(const void* cookie) {
19451943
NonBucketAllocationGuard guard;
1946-
return serverApi->cookie->release(cookie);
1944+
serverApi->cookie->release(cookie);
19471945
}
19481946

19491947
void EventuallyPersistentEngine::setDcpConnHandler(
@@ -6196,12 +6194,7 @@ ENGINE_ERROR_CODE EventuallyPersistentEngine::dcpOpen(
61966194
}
61976195

61986196
// Success creating dcp object which has stored the cookie, now reserve it.
6199-
if (reserveCookie(cookie) != ENGINE_SUCCESS) {
6200-
EP_LOG_WARN(
6201-
"Cannot create DCP connection because cookie "
6202-
"cannot be reserved");
6203-
return ENGINE_DISCONNECT;
6204-
}
6197+
reserveCookie(cookie);
62056198
setDcpConnHandler(cookie, handler);
62066199

62076200
return ENGINE_SUCCESS;

engines/ep/src/ep_engine.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,8 +532,8 @@ class EventuallyPersistentEngine : public EngineIface, public DcpIface {
532532
void notifyIOComplete(const void* cookie, ENGINE_ERROR_CODE status);
533533
void scheduleDcpStep(gsl::not_null<const void*> cookie);
534534

535-
ENGINE_ERROR_CODE reserveCookie(const void *cookie);
536-
ENGINE_ERROR_CODE releaseCookie(const void *cookie);
535+
void reserveCookie(const void* cookie);
536+
void releaseCookie(const void* cookie);
537537

538538
void setDcpConnHandler(const void* cookie, DcpConnHandlerIface* handler);
539539
DcpConnHandlerIface* getDcpConnHandler(const void* cookie);

engines/ep/tests/module_tests/dcp_test.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@ class WrappedServerCookieIface : public ServerCookieIface {
123123
void scheduleDcpStep(gsl::not_null<const void*> cookie) override {
124124
wrapped->scheduleDcpStep(cookie);
125125
}
126-
ENGINE_ERROR_CODE reserve(gsl::not_null<const void*> cookie) override {
127-
return wrapped->reserve(cookie);
126+
void reserve(gsl::not_null<const void*> cookie) override {
127+
wrapped->reserve(cookie);
128128
}
129-
ENGINE_ERROR_CODE release(gsl::not_null<const void*> cookie) override {
130-
return wrapped->release(cookie);
129+
void release(gsl::not_null<const void*> cookie) override {
130+
wrapped->release(cookie);
131131
}
132132
void set_priority(gsl::not_null<const void*> cookie,
133133
ConnectionPriority priority) override {

include/memcached/server_cookie_iface.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,14 +170,14 @@ struct ServerCookieIface {
170170
* future use. (The core guarantees it will not invalidate the
171171
* memory until the cookie is invalidated by calling release())
172172
*/
173-
virtual ENGINE_ERROR_CODE reserve(gsl::not_null<const void*> cookie) = 0;
173+
virtual void reserve(gsl::not_null<const void*> cookie) = 0;
174174

175175
/**
176176
* Notify the core that we're releasing the reference to the
177177
* The engine is not allowed to use the cookie (the core may invalidate
178178
* the memory)
179179
*/
180-
virtual ENGINE_ERROR_CODE release(gsl::not_null<const void*> cookie) = 0;
180+
virtual void release(gsl::not_null<const void*> cookie) = 0;
181181

182182
/**
183183
* Set the priority for this connection

programs/engine_testapp/mock_server.cc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,23 +294,22 @@ struct MockServerCookieApi : public ServerCookieIface {
294294
session_ctr--;
295295
}
296296

297-
ENGINE_ERROR_CODE reserve(gsl::not_null<const void*> cookie) override {
297+
void reserve(gsl::not_null<const void*> cookie) override {
298298
std::lock_guard<std::mutex> guard(mock_server_cookie_mutex);
299299
auto* c = cookie_to_mock_cookie(cookie.get());
300300
c->references++;
301-
return ENGINE_SUCCESS;
302301
}
303302

304-
ENGINE_ERROR_CODE release(gsl::not_null<const void*> cookie) override {
303+
void release(gsl::not_null<const void*> cookie) override {
305304
std::lock_guard<std::mutex> guard(mock_server_cookie_mutex);
306305
auto* c = cookie_to_mock_cookie(cookie.get());
307306

308307
const int new_rc = --c->references;
309308
if (new_rc == 0) {
310309
delete c;
311310
}
312-
return ENGINE_SUCCESS;
313311
}
312+
314313
void set_priority(gsl::not_null<const void*> cookie,
315314
ConnectionPriority) override {
316315
(void)cookie_to_mock_cookie(cookie.get()); // validate cookie

0 commit comments

Comments
 (0)