Fixed RIAP_NUMBER_OF_PARTITIONS attribute by adding obj_pcount function

SNSL · Oct 18, 2011 · 3b0aded · 3b0aded
1 parent 893407a
commit 3b0aded
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 2 deletions.
diff --git a/osd-target/obj.c b/osd-target/obj.c
@@ -39,6 +39,7 @@ struct obj_tab {
 	sqlite3_stmt *nextpid;  /* get next pid */
 	sqlite3_stmt *isprsnt;  /* is object present */
 	sqlite3_stmt *emptypid; /* is partition empty */
+	sqlite3_stmt *pcount;   /* count of partitions */
 	sqlite3_stmt *gettype;  /* get type of the object */
 	sqlite3_stmt *getoids;  /* get oids in a pid */
 	sqlite3_stmt *getcids;  /* get cids in pid */
@@ -124,6 +125,12 @@ int obj_initialize(struct db_context *dbc)
 	if (ret != SQLITE_OK)
 		goto out_finalize_emptypid;
 
+	sprintf(SQL, "SELECT COUNT(pid) FROM %s WHERE oid = %llu AND type = %u;",
+		dbc->obj->name, llu(PARTITION_OID), PARTITION);
+	ret = sqlite3_prepare(dbc->db, SQL, -1, &dbc->obj->pcount, NULL);
+	if (ret != SQLITE_OK)
+		goto out_finalize_pcount;
+
 	sprintf(SQL, "SELECT type FROM %s WHERE pid = ? AND oid = ?;",
 		dbc->obj->name);
 	ret = sqlite3_prepare(dbc->db, SQL, -1, &dbc->obj->gettype, NULL);
@@ -163,6 +170,9 @@ int obj_initialize(struct db_context *dbc)
 out_finalize_gettype:
 	db_sqfinalize(dbc->db, dbc->obj->gettype, SQL);
 	SQL[0] = '\0';
+out_finalize_pcount:
+	db_sqfinalize(dbc->db, dbc->obj->pcount, SQL);
+	SQL[0] = '\0';
 out_finalize_emptypid:
 	db_sqfinalize(dbc->db, dbc->obj->emptypid, SQL);
 	SQL[0] = '\0';
@@ -202,6 +212,7 @@ int obj_finalize(struct db_context *dbc)
 	sqlite3_finalize(dbc->obj->nextpid);
 	sqlite3_finalize(dbc->obj->isprsnt);
 	sqlite3_finalize(dbc->obj->emptypid);
+	sqlite3_finalize(dbc->obj->pcount);
 	sqlite3_finalize(dbc->obj->gettype);
 	sqlite3_finalize(dbc->obj->getoids);
 	sqlite3_finalize(dbc->obj->getcids);
@@ -444,6 +455,34 @@ int obj_isempty_pid(struct db_context *dbc, uint64_t pid, int *isempty)
 }
 
 
+/*
+ * returns number of partitions
+ *
+ * returns:
+ * -EINVAL: invalid arg
+ * OSD_ERROR: in case of other errors, ignore value of *isempty
+ * OSD_OK: success, *isempty set to:
+ * 	==1: if partition is empty or absent or in case of sqlite error
+ * 	==0: if partition is not empty
+ */
+int obj_pcount(struct db_context *dbc, uint64_t *pcount)
+{
+	int ret = 0;
+	int bound = 0;
+	*pcount = 0;
+
+	assert(dbc && dbc->db && dbc->obj && dbc->obj->pcount);
+
+repeat:
+	while ((ret = sqlite3_step(dbc->obj->pcount)) == SQLITE_BUSY);
+	if (ret == SQLITE_ROW)
+		*pcount = sqlite3_column_int64(dbc->obj->pcount, 0);
+
+out:
+	return ret;
+}
+
+
 /*
  * return the type of the object
  *

diff --git a/osd-target/obj.h b/osd-target/obj.h
@@ -43,6 +43,8 @@ int obj_ispresent(struct db_context *dbc, uint64_t pid, uint64_t oid,
 
 int obj_isempty_pid(struct db_context *dbc, uint64_t pid, int *isempty);
 
+int obj_pcount(struct db_context *dbc, uint64_t *pcount);
+
 int obj_get_type(struct db_context *dbc, uint64_t pid, uint64_t oid, 
 		 uint8_t *obj_type);
 

diff --git a/osd-target/osd.c b/osd-target/osd.c
@@ -731,6 +731,7 @@ static int get_riap(struct osd_device *osd, uint64_t pid, uint64_t oid,
 	struct stat sb;
 	uint8_t ll[8];
 	off_t sz = 0;
+	uint64_t pcount;
 
 	switch (number) {
 	case 0:
@@ -784,9 +785,9 @@ static int get_riap(struct osd_device *osd, uint64_t pid, uint64_t oid,
 		val = ll;
 		break;
 	case RIAP_NUMBER_OF_PARTITIONS:
-		/*FIXME: How to find this information*/
+		ret = obj_pcount(osd->dbc, &pcount);
 		len = RIAP_NUMBER_OF_PARTITIONS_LEN;
-		set_htonll(ll, 17);
+		set_htonll(ll, pcount);
 		val = ll;
 		break;
 	case RIAP_CLOCK: