Skip to content

Commit f748ba2

Browse files
committed
fixes
1 parent d9e92f0 commit f748ba2

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/plasma/plasma_client.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,12 @@ void plasma_fetch(plasma_connection *conn,
204204
* @param object_ids Object IDs wait is called on.
205205
* @param timeout Wait will time out and return after this number of ms.
206206
* @param num_returns Number of object IDs wait will return if it doesn't time
207-
* out.
207+
* out.
208208
* @param return_object_ids Out parameter for the object IDs returned by wait.
209-
* @Return Number of objects that are actually ready.
209+
* This is an array of size num_returns. If the number of objects that
210+
* are ready when we time out, the objects will be stored in the last
211+
* slots of the array and the number of objects is returned.
212+
* @return Number of objects that are actually ready.
210213
*/
211214
int plasma_wait(plasma_connection *conn,
212215
int num_object_ids,

src/plasma/plasma_manager.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ typedef struct client_object_connection client_object_connection;
3939

4040
/* Entry of the hashtable of objects that are available locally. */
4141
typedef struct {
42-
/* Object id of this object. */
42+
/** Object id of this object. */
4343
object_id object_id;
44-
/* Handle for the uthash table. */
44+
/** Handle for the uthash table. */
4545
UT_hash_handle hh;
4646
} available_object;
4747

@@ -155,7 +155,7 @@ int send_client_reply(client_connection *conn, plasma_reply *reply) {
155155
}
156156

157157
int send_client_failure_reply(object_id object_id, client_connection *conn) {
158-
plasma_reply reply = {.object_ids = {object_conn->object_id},
158+
plasma_reply reply = {.object_ids = {object_id},
159159
.num_object_ids = 1,
160160
.has_object = 0};
161161
return send_client_reply(conn, &reply);

0 commit comments

Comments
 (0)