Changeset 8950

Timestamp:

07/14/11 12:18:12 (23 months ago)

Author:

bligon

Message:

Corrected compiler errors. Files affected:

src/server/create-immutable-copies.sm
src/server/get-attr.sm

Location:

branches/orange-next/src/server

Files:

• create-immutable-copies.sm (modified) (12 diffs)
• get-attr.sm (modified) (1 diff)

branches/orange-next/src/server/create-immutable-copies.sm

@@ -23 +23 @@
 /*Global Variables*/
 
+static char PVFS_handle_string[PVFS_HANDLE_STRING_LEN]={0};
+
 /*attribute keys used for the mirroring process*/
 static char handle_key[]     = USER_PVFS2_MIRROR_HANDLES;
@@ -225 +227 @@
    }
 
-   memset(PVFS_handle_string,0,PVFS_HANDLE_STRING_LENGTH);
    PVFS_handle_unparse(imm_p->metadata_handle,PVFS_handle_string);
    gossip_debug(GOSSIP_MIRROR_DEBUG,"\tdfile_count: %d\tmetadata_handle: %s"
@@ -582 +583 @@
          goto error_exit;
       }
-      memset(PVFS_handle_string,0,PVFS_HANDLE_STRING_LENGTH);
       PVFS_handle_unparse(imm_p->handle_array_base[i],PVFS_handle_string);
       gossip_debug(GOSSIP_MIRROR_DEBUG,"\tValue of server_name is %s "
@@ -634 +634 @@
 
             imm_p->handle_array_base_local_count++;
-            PVFS_handle_unparse(imm_p->handle_array_base_local[imm_p->handle_array_base_local_count
+            PVFS_handle_unparse(imm_p->handle_array_base_local[imm_p->handle_array_base_local_count]
                                ,PVFS_handle_string);
             gossip_debug(GOSSIP_MIRROR_DEBUG,"\tlocal source handle(%d):%s\n"
@@ -1441 +1441 @@
                //imm_p->writes_completed[index] = UINT64_HIGH;
                 imm_p->writes_completed[index].status = STATUS_INIT;
-                PVFS_handle_clear(imm_p->writes_competed[index].handle);
+                PVFS_handle_clear(imm_p->writes_completed[index].handle);
            } 
        }
@@ -1527 +1527 @@
    for (i=0; i<(imm_p->dfile_count * imm_p->copies); i++)
    {
-       char PVFS_handle_string[PVFS_handle_string_len] = {0};
        PVFS_handle_unparse(imm_p->writes_completed[i].handle,PVFS_handle_string);
        gossip_debug(GOSSIP_MIRROR_DEBUG,"\twrites_complete[%d]:%s\n"
                                        ,i,PVFS_handle_string);
        //if (imm_p->writes_completed[i] != 0)
-        if ( !PVFS_handle_is_null(imm_p->writes_completed[i]) )
+        if ( !PVFS_handle_is_null(imm_p->writes_completed[i].handle) )
        {
           js_p->error_code = RETRY;
@@ -1625 +1624 @@
         //memcpy(sm_p->val_a[i].buffer,imm_p->writes_completed
         //                       ,sm_p->val_a[i].buffer_sz);
-        sm_p->val_a[i].buffer[j] = imm_p->writes_completed[j].status;
+        memcpy(&((PVFS_error *)(sm_p->val_a[i].buffer))[j]
+              ,&(imm_p->writes_completed[j].status)
+              ,sizeof(PVFS_error));
    }
    /*verify inputs*/
@@ -1633 +1634 @@
    gossip_debug(GOSSIP_MIRROR_DEBUG,"\tsize of buffer : %d\n"
                                    ,sm_p->key_a[i].buffer_sz);
-   PVFS_error *myStatus = (PVFS_error *)sm_p->val_a[i].buffer;
+   PVFS_handle *myHandle = (PVFS_handle *)sm_p->val_a[i].buffer;
    for (j=0; j<(imm_p->dfile_count*imm_p->copies); j++)
    {
-       gossip_debug(GOSSIP_MIRROR_DEBUG,"\t\tstatus(%d):%d\n"
+       PVFS_handle_unparse(myHandle[j],PVFS_handle_string);
+       gossip_debug(GOSSIP_MIRROR_DEBUG,"\t\thandle(%d):%s\n"
        ,j
-       ,myStatus[j]);
+       ,PVFS_handle_string);
    }
 
@@ -1652 +1654 @@
 
    i++; assert(i<key_count);
-   PVFS_handle *myStatus = (PVFS_handle *)sm_p->val_a[i].buffer;
+   PVFS_error *myStatus = (PVFS_error *)(sm_p->val_a[i].buffer);
    for (j=0; j<(imm_p->dfile_count * imm_p->copies); j++)
    {
-       memset(PVFS_handle_string,0,PVFS_HANDLE_STRING_LEN);
-       PVFS_handle_unparse(myStatus[j],PVFS_handle_string);
-       gossip_debug(GOSSIP_MIRROR_DEBUG,"\thandle(%d):status(%s)\n"
+       gossip_debug(GOSSIP_MIRROR_DEBUG,"\thandle(%d):status(%d)\n"
                                        ,j
-                                       ,PVFS_handle_string);
+                                       ,myStatus[j]);
    }
 
@@ -1740 +1740 @@
    if (js_p->error_code)
    {
-      memset(PVFS_handle_string,0,PVFS_HANDLE_STRING_LENGTH);
-      PVFS_handle_unparse(imm_p->metadata_handle);
+      PVFS_handle_unparse(imm_p->metadata_handle,PVFS_handle_string);
       gossip_err("Unable to store datahandles and number of copies for this "
                  "mirror operation.\n");
@@ -2049 +2048 @@
    for (i=0; i<(in_cols*rows); i++)
    {
-       memset(PVFS_handle_string,0,PVFS_HANDLE_STRING_LEN);
-       PVFS_unparse(copies_in[i],PVFS_handle_string);
+       PVFS_handle_unparse(copies_in[i],PVFS_handle_string);
        gossip_debug(GOSSIP_MIRROR_DEBUG,"\thandle_array_copies(%d):%s\n"
                                        ,(int)i
@@ -2073 +2071 @@
        for (j=0; j<out_cols; j++)
        {
-           memset(PVFS_handle_string,0,PVFS_HANDLE_STRING_LENGTH);
            PVFS_handle_unparse(copies_out[(i*out_cols)+j],PVFS_handle_string);
            gossip_debug(GOSSIP_MIRROR_DEBUG,"\t\t(%d,%d):%s\n"

branches/orange-next/src/server/get-attr.sm

@@ -1053 +1053 @@
          index = (row*meta->dfile_count) + col;
          if ( s_op->u.getattr.mirror_dfile_status_array[index] == STATUS_INIT )
-              meta->mirror_dfile_array[index] = 0;
+              PVFS_handle_clear(meta->mirror_dfile_array[index]);
          gossip_debug(GOSSIP_MIRROR_DEBUG,
                       "\tmirror handle[%d]:%llu \t"