WebSVN – Kolibri OS – Diff – /kernel/branches/net/network/socket.inc

 ;;         GNU GENERAL PUBLIC LICENSE                              ;;
 ;;          Version 2, June 1991                                   ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 3253 $
+$Revision: 3257 $
         xchg    al, ah
         mov     [last_TCP_port], ax
-}
-;-----------------------------------------------------------------
-;
-; SOCKET_block
-;
-;-----------------------------------------------------------------
-macro   SOCKET_block socket, loop, done {
-        test    [socket + SOCKET.options], SO_BLOCK     ; Is this a blocking socket?
-        jz      done                                    ; No, return immediately
-        pusha
-        mov     eax, EVENT_NETWORK
-        mov     ebx, 1337                   ; UID: ????
-        call    wait_event
-        popa
-        jmp     loop
-}
+}
 ;-----------------------------------------------------------------
+;
 ; Socket API (function 74)
         jz      s_error
         mov     [esp+32], edi                   ; return socketnumber
+        DEBUGF  2,"socknum=%u\n", edi
+;        push    edx
+;        and     edx, SO_NONBLOCK
+        or      [eax + SOCKET.options], SO_NONBLOCK ;edx
+;        pop     edx
-        DEBUGF  2,"socknum=%u\n", edi
+;        and     edx, not SO_NONBLOCK
         mov     [eax + SOCKET.Domain], ecx
         mov     [eax + SOCKET.Type], edx
 ; and return it to caller
         mov     [esp+32], eax
         ret
+  .block:
-  .block:
+        test    [eax + SOCKET.options], SO_NONBLOCK
+        jnz     s_error
+        call    SOCKET_block
-        SOCKET_block    eax, .loop, s_error
+        jmp     .loop
 ;-----------------------------------------------------------------
+;
         DEBUGF  2,"SOCKET_receive: Buffer too small\n"
         jmp     s_error
-  .block:
-        SOCKET_block    eax, .loop, s_error
-align 4
-SOCKET_receive_local:
-        ; does this socket have a PID yet?
+  .block:
-        cmp     [eax + SOCKET.PID], 0
-        jne     @f
+        test    [eax + SOCKET.options], SO_NONBLOCK
-        ; Change PID to that of current process
+        jnz     s_error
-        mov     ebx, [TASK_BASE]
-        mov     ebx, [ebx + TASKDATA.pid]
         mov     [eax + SOCKET.PID], ebx
-      @@:
+        call    SOCKET_block
         jmp     .loop
         mov     [eax + SOCKET.rcv_proc], SOCKET_receive_stream
 align 4
-SOCKET_receive_stream:
 SOCKET_receive_stream:
-        DEBUGF  1,"SOCKET_receive: STREAM\n"
         DEBUGF  1,"SOCKET_receive: STREAM\n"
         mov     ecx, esi
         mov     edi, edx
         xor     edx, edx
-        add     eax, STREAM_SOCKET.rcv
+  .loop:
-  .loop:
+        cmp     [eax + STREAM_SOCKET.rcv + RING_BUFFER.size], 0
-        cmp     [eax + RING_BUFFER.size], 0
+        je      .block
+        add     eax, STREAM_SOCKET.rcv
+        call    SOCKET_ring_read
+        call    SOCKET_ring_free
-        je      .block
+        mov     [esp+32], ecx                                   ; return number of bytes copied
-        call    SOCKET_ring_read
+        ret
         call    SOCKET_ring_free
+align 4
+SOCKET_send_local:
 align 4
-SOCKET_send_local:
+        DEBUGF  1,"SOCKET_send: LOCAL\n"
         ; does this socket have a PID yet?
         cmp     [eax + SOCKET.PID], 0
         jne     @f
         ; Change PID to that of current process
-        mov     ebx, [TASK_BASE]
-        mov     ebx, [ebx + TASKDATA.pid]
-        mov     [eax + SOCKET.PID], ebx
-      @@:
-        mov     [eax + SOCKET.snd_proc], SOCKET_send_local_
-align 4
+        mov     ebx, [TASK_BASE]
-SOCKET_send_local_:
+        mov     ebx, [ebx + TASKDATA.pid]
         mov     [eax + SOCKET.PID], ebx
-        DEBUGF  1,"SOCKET_send: LOCAL\n"
+      @@:
         ; return the number of written bytes (or errorcode) to application
         mov     [esp+32], ecx
         ; and notify the other end
-        call    SOCKET_notify_owner
+        call    SOCKET_notify
   .block:
         cmp     dword [edx+8], 0
         je      .unblock
-        or      [eax + SOCKET.options], SO_BLOCK
+        and     [eax + SOCKET.options], not SO_NONBLOCK
         mov     dword [esp+32], 0       ; success!
         ret
         mov     [eax + SOCKET.Domain], AF_LOCAL
         mov     [eax + SOCKET.Type], SOCK_STREAM
         mov     [eax + SOCKET.Protocol], 0              ;;; CHECKME
         mov     [eax + SOCKET.snd_proc], SOCKET_send_local
-        mov     [eax + SOCKET.rcv_proc], SOCKET_receive_local
+        mov     [eax + SOCKET.rcv_proc], SOCKET_receive_stream
         mov     ebx, eax
         call    SOCKET_alloc
         jz      .error
         mov     [esp+24], edi   ; application's ebx
         mov     [eax + SOCKET.Domain], AF_LOCAL
         mov     [eax + SOCKET.Type], SOCK_STREAM
         mov     [eax + SOCKET.Protocol], 0              ;;; CHECKME
         mov     [eax + SOCKET.snd_proc], SOCKET_send_local
-        mov     [eax + SOCKET.rcv_proc], SOCKET_receive_local
+        mov     [eax + SOCKET.rcv_proc], SOCKET_receive_stream
         pusha
         lea     ecx, [eax + SOCKET.mutex]
         call    mutex_unlock
         popa
-        jmp     SOCKET_notify_owner
+        jmp     SOCKET_notify
   .full:
         ret
+;-----------------------------------------------------------------
+;
+; SOCKET_block
+;
+; Suspends the thread attached to a socket
+;
+;  IN:  eax = socket ptr
+;  OUT: /
+;
+;-----------------------------------------------------------------
+align 4
+SOCKET_block:
+        DEBUGF  1,"SOCKET_block: %x\n", eax
+        pushf
+        cli
+        ; Set the 'socket is blocked' flag
+        or      [eax + SOCKET.state], SS_BLOCKED
+        ; Suspend the thread
+        push    edx
+        mov     edx, [TASK_BASE]
+        DEBUGF  1,"SOCKET_block: suspending PID: %u\n", [edx + TASKDATA.pid]
+        mov     [edx + TASKDATA.state], 1               ; Suspended
+        pop     edx
+        call    change_task
+        popf
+        DEBUGF  1,"SOCKET_block: continueing\n"
+        ret
 ;-----------------------------------------------------------------
+;
-; SOCKET_notify_owner
+; SOCKET_notify
+;
 ; notify's the owner of a socket that something happened
+;
 ;  IN:  eax = socket ptr
 ;  OUT: /
+;
 ;-----------------------------------------------------------------
 align 4
-SOCKET_notify_owner:
+SOCKET_notify:
+        DEBUGF  1,"SOCKET_notify: %x\n", eax
+        call    SOCKET_check
+        jz      .error
+        test    [eax + SOCKET.state], SS_BLOCKED
-        DEBUGF  1,"SOCKET_notify_owner: %x\n", eax
+        jnz     .unblock
+        test    [eax + SOCKET.options], SO_NONBLOCK
-        call    SOCKET_check
+        jz      .error
         jz      .error
+        push    eax ecx esi
         push    eax ecx esi
 ; socket exists and is of non blocking type.
-; socket exists, now try to flag an event to the application
+; We'll try to flag an event to the thread
         mov     eax, [eax + SOCKET.PID]
         test    eax, eax
-        jz      .error2
+        jz      .done
         mov     ecx, 1
         mov     esi, TASK_DATA + TASKDATA.pid
        .next_pid:
-        cmp     [esi], eax
-        je      .found_pid
+  .next_pid:
-        inc     ecx
+        cmp     [esi], eax
-        add     esi, 0x20
+        je      .found_pid
-        cmp     ecx, [TASK_COUNT]
+        inc     ecx
-        jbe     .next_pid
+        add     esi, 0x20
+        cmp     ecx, [TASK_COUNT]
+        jbe     .next_pid
+; PID not found, TODO: close socket!
+        jmp     .done
+  .found_pid:
+        shl     ecx, 8
+        or      [ecx + SLOT_BASE + APPDATA.event_mask], EVENT_NETWORK
+        mov     [check_idle_semaphore], 200                             ; What does this mean??
+        DEBUGF  1,"SOCKET_notify: Raised a network event!\n"
+        jmp     .done
+  .unblock:
+        push    eax ecx esi
+        ; Clear the 'socket is blocked' flag
+        and     [eax + SOCKET.state], not SS_BLOCKED
+        ; Find the thread's TASK_DATA
+        mov     eax, [eax + SOCKET.PID]
+        test    eax, eax
+        jz      .error
+        xor     ecx, ecx
+        inc     ecx
+        mov     esi, TASK_DATA
+  .next:
+        cmp     [esi + TASKDATA.pid], eax
+        je      .found
-; PID not found, TODO: close socket!
+        inc     ecx
         add     esi, 0x20
-        jmp     .error2
+        cmp     ecx, [TASK_COUNT]
-       .found_pid:
+        jbe     .next
-        shl     ecx, 8
+        jmp     .error
-        or      [ecx + SLOT_BASE + APPDATA.event_mask], EVENT_NETWORK
+  .found:
         DEBUGF  1,"SOCKET_check_owner: %x\n", eax
         push    ebx
         mov     ebx, [TASK_BASE]
-        mov     ebx, [ecx + TASKDATA.pid]
+        mov     ebx, [ebx + TASKDATA.pid]
         cmp     [eax + SOCKET.PID], ebx
         DEBUGF  1,"SOCKET_is_connecting: %x\n", eax
         and     [eax + SOCKET.options], not (SS_ISCONNECTED + SS_ISDISCONNECTING + SS_ISCONFIRMING)
         or      [eax + SOCKET.options], SS_ISCONNECTING
-        jmp     SOCKET_notify_owner
+        jmp     SOCKET_notify
         DEBUGF  1,"SOCKET_is_connected: %x\n", eax
         and     [eax + SOCKET.options], not (SS_ISCONNECTING + SS_ISDISCONNECTING + SS_ISCONFIRMING)
         or      [eax + SOCKET.options], SS_ISCONNECTED
         DEBUGF  1,"SOCKET_is_disconnecting: %x\n", eax
         and     [eax + SOCKET.options], not (SS_ISCONNECTING)
         or      [eax + SOCKET.options], SS_ISDISCONNECTING + SS_CANTRCVMORE + SS_CANTSENDMORE
-        jmp     SOCKET_notify_owner
+        jmp     SOCKET_notify
         DEBUGF  1,"SOCKET_is_disconnected: %x\n", eax
         and     [eax + SOCKET.options], not (SS_ISCONNECTING + SS_ISCONNECTED + SS_ISDISCONNECTING)
         or      [eax + SOCKET.options], SS_CANTRCVMORE + SS_CANTSENDMORE
-        jmp     SOCKET_notify_owner
+        jmp     SOCKET_notify

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/socket.inc – Rev 3253 → 3257