Skip to content
Permalink
Branch: master
Commits on Dec 30, 2013
  1. Merge branch 'no_active_fd'

    yodalee committed Dec 30, 2013
    Conflicts:
    	sp_hw2r01942008/include/csiebox_server.h
    	sp_hw2r01942008/src/csiebox_server.c
    
    csiebox_server.c:
    run_path configuration
    no active_fd: use client info as index
  2. add run_path configuration

    yodalee committed Dec 30, 2013
    global server pointer allow signal handler accessment
    create fifo and signal handler for sigint and sigterm
Commits on Dec 29, 2013
  1. remove active_fd[] in select

    yodalee committed Dec 29, 2013
    old version:
    declare an active_fd, and block_fd in select
    once a new link come in, add it to active_fd.
    and if the active_fd is select, add it to block_fd to prevent other
    thread get it.
    In the end of send data, remove self from block_fd.
    
    new version:
    server act to login after get a new link from socket.
    Though this might prone to error, but I think it's OK.
    select check all server->client, and add all client into watching
    list. If there is a link come in, status of that client will changes
    to PROCESS from LINK. The status in PROCESS will not add to
    select list.
Commits on Dec 26, 2013
  1. web interface by assistant

    yodalee committed Dec 26, 2013
  2. hw5 initialization

    yodalee committed Dec 26, 2013
    modify Readme for hw4 upload.
    add csiebox_server.sh
    modify port_register.c
Commits on Dec 21, 2013
  1. merge hw1 "file merger"

    yodalee committed Dec 21, 2013
  2. generate *.merge version

    yodalee committed Dec 21, 2013
    1. remove all chdir, which should be removed before
    2. remove all notify to prevent causing file descriptor broken
    3. merge new file into filename.merge
Commits on Dec 20, 2013
  1. Merge branch 'nonblockinglock'

    yodalee committed Dec 20, 2013
    apply non blocking thread lock
    on thread and server launch
  2. handle conflict

    yodalee committed Dec 20, 2013
    add function handle conflict
    call when file conflict detected
  3. nonblocking thread

    yodalee committed Dec 20, 2013
    modify thread
    it will lock itself on control lock
    modify server
    add a block_fd, which prevent select detect the file descriptor again
    in the end of handle_request, set block_fd to non block
    
    TODO:
    move active_fd, and block_fd into server struct
Commits on Dec 18, 2013
  1. some little modification

    yodalee committed Dec 18, 2013
    thread.c: initial two dimension array in correct way
    csiebox_file.c: "file get end" message when get file end
    csiebox_client.c: handle "busy response" in login function
Commits on Dec 17, 2013
  1. Merge branch 'serverfilelock'

    yodalee committed Dec 15, 2013
    apply file lock before server write file
    
    temporary OK, file lock not complete yet
    
    Conflicts:
    	sp_hw2r01942008/src/csiebox_file.c
    	sp_hw2r01942008/src/csiebox_server.c
Commits on Dec 15, 2013
  1. handle client request by thread

    yodalee committed Dec 15, 2013
    current problem:
    send file down to client in the same time will GG, reason don't know
  2. revise basegetregfile

    yodalee committed Dec 15, 2013
    origin take fullpath, and open FILE* inside
    now take a FILE*, directly write file
  3. move getfile into getmeta

    yodalee committed Dec 15, 2013
Commits on Dec 14, 2013
  1. change getmeta and getfile into one function

    yodalee committed Dec 14, 2013
    origin:
    receive a header
    getmeta
    receive a header
    getfile
    
    now:
    receive a header
    getmeta
      wait heade
      getfile
Commits on Dec 12, 2013
  1. basic implementation about thread pool

    yodalee committed Dec 12, 2013
    1. thread_pool in csiebox_server struct
    1. parse argument on csiebox_server
    2. csome basic implementation in thread.c
    3. Makefile: -lpthread
Commits on Dec 11, 2013
  1. hw4 initialization

    yodalee committed Dec 11, 2013
You can’t perform that action at this time.