Show
Ignore:
Timestamp:
06/18/10 20:02:50 (3 years ago)
Author:
nlmills
Message:

initial merge with Orange-Branch. much will be broken

Location:
branches/cu-security-branch
Files:
9 modified

Legend:

Unmodified
Added
Removed

  • branches/cu-security-branch

    • Property svn:ignore

      •  

        old new  
        33aclocal.m4 
        44autom4te.cache 
        5 config.status 
        6 Makefile 
        7 pvfs2-config.h 
        8 module.mk 

  • branches/cu-security-branch/src/io/flow

    • Property svn:ignore deleted

  • branches/cu-security-branch/src/io/flow/flow.h

    r7941 r8397  
    100100 
    101101    /* function to be triggered upon completion */ 
    102     void(*callback)(struct flow_descriptor* flow_d); 
     102    void(*callback)(struct flow_descriptor* flow_d, int cancel_path); 
    103103 
    104104    struct flow_endpoint src;   /* src endpoint */ 

  • branches/cu-security-branch/src/io/flow/flowproto-bmi-cache

    • Property svn:ignore deleted

  • branches/cu-security-branch/src/io/flow/flowproto-bmi-cache/flowproto-bmi-cache-server.c

    r7941 r8397  
    490490                free(flow_data); 
    491491                flow_d->release(flow_d); 
    492                 flow_d->callback(flow_d); 
     492                flow_d->callback(flow_d, 0); 
    493493                fprintf(stderr, "bmi_cache_request_init: exit with return 1. zero request.\n"); 
    494494                return(1); 
    … …  
    801801                        flow_d->state = FLOW_COMPLETE; 
    802802                        flow_d->release(flow_d); 
    803                         flow_d->callback(flow_d); 
     803                        flow_d->callback(flow_d, 0); 
    804804                        fprintf(stderr, "bmi_recv_callback_fn: request is done\n"); 
    805805                        return; 

  • branches/cu-security-branch/src/io/flow/flowproto-bmi-trove

    • Property svn:ignore deleted

  • branches/cu-security-branch/src/io/flow/flowproto-bmi-trove/flowproto-multiqueue.c

    r7941 r8397  
    3131#define MAX_REGIONS 64 
    3232 
    33 #define FLOW_CLEANUP(__flow_data)                                     \ 
     33#define FLOW_CLEANUP_CANCEL_PATH(__flow_data, __cancel_path)          \ 
    3434do {                                                                  \ 
    3535    struct flow_descriptor *__flow_d = (__flow_data)->parent;         \ 
    … …  
    4040    free(__flow_data);                                                \ 
    4141    __flow_d->release(__flow_d);                                      \ 
    42     __flow_d->callback(__flow_d);                                     \ 
     42    __flow_d->callback(__flow_d, __cancel_path);                      \ 
    4343} while(0) 
     44 
     45#define FLOW_CLEANUP(___flow_data) FLOW_CLEANUP_CANCEL_PATH(___flow_data, 0) 
    4446 
    4547struct result_chain_entry 
    … …  
    480482        { 
    481483            gen_mutex_unlock(&flow_data->parent->flow_mutex); 
    482             FLOW_CLEANUP(flow_data); 
     484            FLOW_CLEANUP_CANCEL_PATH(flow_data, 1); 
    483485            return(0); 
    484486        } 

  • branches/cu-security-branch/src/io/flow/flowproto-dump-offsets

    • Property svn:ignore deleted

  • branches/cu-security-branch/src/io/flow/flowproto-template

    • Property svn:ignore deleted