Quick Search:

Context

Displaying 3 lines either side each change. None | Less | More | Full

Other Diffs

Ignore

Blank Lines Whitespace: Expand:

Diff

1.1.6.8
  
1.1.6.9
  
Orange-Migrate-Tools:wligon:20100730175907
  
mgmt-migrate.sm
_>1717 #include "pint-cached-config.h"
 1818 #include "PINT-reqproto-encode.h"
 1919 #include "pvfs2-internal.h"
<> 20+#include "bmi.h"
2021 
<>21 -
2222 extern job_context_id pint_client_sm_context;
 2323 
 2424 static int mgmt_migrate_comp_fn(
 2525                 void *v_p, struct PVFS_server_resp *resp, int i);
 2626 
 2727 %%
 2828 
<>29 -machine pvfs2_client_mgmt_migrate_sm{
  29+machine pvfs2_client_mgmt_migrate_sm
  30+{
3031         
<>31 -        state init{
  32+        state init
  33+        {
3234                 run mgmt_migrate_init;
 3335                 default => migrate_setup_msgpair;
 3436         }
 3537         
<>36 -        state migrate_setup_msgpair{
  38+        state migrate_setup_msgpair
  39+        {
3740                 run mgmt_migrate_setup_msgpair;
 3841                 success => migrate_xfer_msgpair;
 3942                 default => cleanup;
 4043         }
 4144         
<>42 -        state migrate_xfer_msgpair{
  45+        state migrate_xfer_msgpair
  46+        {
4347                 jump pvfs2_msgpairarray_sm;
 4448                 default => cleanup;
 4549         }
 4650                                 
<>47 -        state cleanup{
  51+        state cleanup
  52+        {
4853                 run mgmt_migrate_cleanup;
 4954                 default => terminate;
 5055         }
      
 !
 
…
5863                 PVFS_object_ref ref,
 5964                 const PVFS_credentials *credentials,
 6065                 PVFS_sys_op_id *op_id,
<>61 -                char *dist_ser,
  66+                char *dest_ser,
6267                 PVFS_hint hints,
 6368                 void *user_ptr)
 6469 {
      
 !
 
…
9398     PINT_init_sysint_credentials(sm_p->cred_p, credentials);
 9499     
 95100     /* fill in stuff in the union */
<>96 -    sm_p->u.migrate.dist_server = dist_ser;
  101+    sm_p->u.migrate.dest_server = dest_ser;
97102     sm_p->error_code = 0;
 98103     sm_p->object_ref = ref;
 99104     PVFS_hint_copy(hints, &sm_p->hints);
      
 !
 
…
106111 PVFS_error PVFS_mgmt_migrate(
 107112                 PVFS_object_ref ref,
 108113                 const PVFS_credentials *credentials,
<>109 -                char *dist_server,
  114+                char *dest_server,
110115                 PVFS_hint hints)
 111116 {
<>112 -        PVFS_error ret = -PVFS_EINVAL, error = 0;
  117+    PVFS_error ret = -PVFS_EINVAL, error = 0;
113118     PVFS_sys_op_id op_id;
 114119 
 115120     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_mgmt_migrate entered\n");           
 116121                         
<>117 -        ret = PVFS_imgmt_migrate(ref, credentials, &op_id, dist_server, hints, NULL);
  122+        ret = PVFS_imgmt_migrate(ref, credentials, &op_id, dest_server, hints, NULL);
118123         if(ret)
 119124         {
 120125                 PVFS_perror_gossip("PVFS_imgmt_migrate call", ret);
<>121 -        error = ret;                    
  126+                error = ret;                    
122127         }
 123128         else
 124129         {
      
 !
 
…
163168         struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
 164169         int ret = -PVFS_EINVAL;
 165170         PINT_sm_msgpair_state *msg_p = NULL;
<> 171+      
  172+
166173         
 167174         js_p->error_code = 0;
 168175         
 169176         PINT_msgpair_init(&sm_p->msgarray_op);
 170177         msg_p = &sm_p->msgarray_op.msgpair;
 171178         
<> 179+        
  180+    fprintf(stderr,"I made it here\n");
  181+
  182+    fprintf(stderr,"%s\n", sm_p->u.migrate.dest_server);
  183+
  184+        
  185+        
172186         PINT_SERVREQ_MGMT_MIGRATE_FILL( 
 173187             msg_p->req,
 174188             *sm_p->cred_p,
 175189             sm_p->object_ref.fs_id,
 176190             sm_p->object_ref.handle,
<>177 -            sm_p->u.migrate.dist_server,
 178 -            sm_p->hints);
  191+        sm_p->u.migrate.dest_server,
  192+        sm_p->hints);
179193     
 180194     /*stuff here as well */
<>181 -        msg_p->fs_id = sm_p->object_ref.fs_id;
 182 -        msg_p->handle = sm_p->object_ref.handle;
 183 -        msg_p->retry_flag = PVFS_MSGPAIR_NO_RETRY; 
  195+    msg_p->fs_id = sm_p->object_ref.fs_id;
  196+    msg_p->handle = sm_p->object_ref.handle;
  197+    msg_p->retry_flag = PVFS_MSGPAIR_RETRY; 
184198         msg_p->comp_fn = mgmt_migrate_comp_fn;
<>185 -                
  199+        fprintf(stderr,"fs_id %d\n",msg_p->fs_id);
  200+        fprintf(stderr,"handle %llu\n",llu(msg_p->handle));     
  201+                        
186202         ret = PINT_cached_config_map_to_server(
 187203         &msg_p->svr_addr, msg_p->handle, msg_p->fs_id);
<>188 -        
  204+                fprintf(stderr,"server = %lld\n", lld(msg_p->svr_addr));
189205         if(ret)
 190206         {
 191207                 gossip_err("Failed to map to server address\n");
 192208                 js_p->error_code = ret;
 193209         }
<>194 -        
  210+    
  211+        
195212         PINT_sm_push_frame(smcb, 0, &sm_p->msgarray_op);
 196213         
 197214         return SM_ACTION_COMPLETE;
      
 !
 
…
207224                 "mgmt_migrate state: mgmt_migrate_cleanup\n");
 208225                 
 209226         sm_p->error_code = js_p->error_code;    
<>210 -                
  227+        
  228+       fprintf(stderr,"I made it to client cleanup\n");
  229+        
211230         /*do something involving cache or free allocated stuff*/        
 212231                 
 213232         PINT_SET_OP_COMPLETE;
      
 !
 
…
222241  * End:
 223242  *
 224243  * vim: ft=c ts=8 sts=4 sw=4 expandtab
<_225 -*/
  244+ */ 
  245+