various cleanup

This commit is contained in:
Jaremy Creechley 2023-08-29 13:14:33 -07:00 committed by Dmitriy Ryajov
parent 11267c842f
commit a2c9a7efc3
No known key found for this signature in database
GPG Key ID: DA8C680CE7C657A4
4 changed files with 6 additions and 14 deletions

View File

@ -70,7 +70,6 @@ method put*(
let dk = KeyBuffer.new(key) let dk = KeyBuffer.new(key)
let dv = ValueBuffer.new(data) let dv = ValueBuffer.new(data)
echo "MemoryDatastore:put: ", key, " => ", data.repr
self.store[dk] = dv self.store[dk] = dv
return success() return success()

View File

@ -136,11 +136,8 @@ proc put*(
key: Key, key: Key,
data: seq[byte] data: seq[byte]
) = ) =
echo "thrfrontend:put: "
let bkey = StringBuffer.new(key.id()) let bkey = StringBuffer.new(key.id())
let bval = DataBuffer.new(data) let bval = DataBuffer.new(data)
print "bkey: ", bkey
print "bval: ", bval
tds[].tp.spawn putTask(ret, tds, bkey, bval) tds[].tp.spawn putTask(ret, tds, bkey, bval)

View File

@ -37,10 +37,10 @@ method has*(
has(ret, self.tds, key) has(ret, self.tds, key)
await wait(ret[].signal) await wait(ret[].signal)
finally: finally:
echo "closing signal" # echo "closing signal"
ret[].signal.close() ret[].signal.close()
echo "\nSharedDataStore:has:value: ", ret[].repr # echo "\nSharedDataStore:has:value: ", ret[].repr
return success(ret[].value) return success(ret[].value)
method delete*( method delete*(
@ -55,10 +55,10 @@ method delete*(
delete(ret, self.tds, key) delete(ret, self.tds, key)
await wait(ret[].signal) await wait(ret[].signal)
finally: finally:
echo "closing signal" # echo "closing signal"
ret[].signal.close() ret[].signal.close()
echo "\nSharedDataStore:put:value: ", ret[].repr # echo "\nSharedDataStore:put:value: ", ret[].repr
return success() return success()
method delete*( method delete*(
@ -84,10 +84,9 @@ method get*(
get(ret, self.tds, key) get(ret, self.tds, key)
await wait(ret[].signal) await wait(ret[].signal)
finally: finally:
echo "closing signal"
ret[].signal.close() ret[].signal.close()
print "\nSharedDataStore:put:value: ", ret[] # print "\nSharedDataStore:put:value: ", ret[]
let data = ret[].value.toSeq(byte) let data = ret[].value.toSeq(byte)
return success(data) return success(data)
@ -100,15 +99,13 @@ method put*(
without ret =? newThreadResult(void), err: without ret =? newThreadResult(void), err:
return failure(err) return failure(err)
echo "res: ", ret
try: try:
put(ret, self.tds, key, data) put(ret, self.tds, key, data)
await wait(ret[].signal) await wait(ret[].signal)
finally: finally:
echo "closing signal"
ret[].signal.close() ret[].signal.close()
echo "\nSharedDataStore:put:value: ", ret[].repr # echo "\nSharedDataStore:put:value: ", ret[].repr
return success() return success()
method put*( method put*(
@ -126,7 +123,6 @@ method close*(
self: ThreadProxyDatastore self: ThreadProxyDatastore
): Future[?!void] {.async.} = ): Future[?!void] {.async.} =
# TODO: how to handle failed close? # TODO: how to handle failed close?
echo "ThreadDatastore: FREE: "
result = success() result = success()
without res =? self.tds[].ds.close(), err: without res =? self.tds[].ds.close(), err: