Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 05f5fbf in mainline


Ignore:
Timestamp:
2012-08-09T16:08:22Z (9 years ago)
Author:
Sean Bartell <wingedtachikoma@…>
Branches:
lfn, master
Children:
c9797067
Parents:
71450c8 (diff), 371cb6c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes

Files:
8 edited

Legend:

Unmodified
Added
Removed
  • contrib/arch/HelenOS.adl

    r71450c8 r05f5fbf  
    1 system architecture HelenOS version 0.4.1 {
     1system architecture HelenOS version 0.5.0 {
    22        /* SPARTAN kernel */
    33        inst kernel kernel;
  • contrib/bazaar/bzreml/__init__.py

    r71450c8 r05f5fbf  
    102102        return ""
    103103
     104def iter_reverse_revision_history(repository, revision_id):
     105        """Iterate backwards through revision ids in the lefthand history"""
     106       
     107        graph = repository.get_graph()
     108        stop_revisions = (None, _mod_revision.NULL_REVISION)
     109        return graph.iter_lefthand_ancestry(revision_id, stop_revisions)
     110
    104111def revision_sequence(branch, revision_old_id, revision_new_id):
    105112        """Calculate a sequence of revisions"""
    106113       
    107         for revision_ac_id in branch.repository.iter_reverse_revision_history(revision_new_id):
     114        for revision_ac_id in iter_reverse_revision_history(branch.repository, revision_new_id):
    108115                if (revision_ac_id == revision_old_id):
    109116                        break
  • contrib/bazaar/mbprotect/__init__.py

    r71450c8 r05f5fbf  
    4545from bzrlib.errors import TipChangeRejected
    4646
     47def iter_reverse_revision_history(repository, revision_id):
     48        """Iterate backwards through revision ids in the lefthand history"""
     49       
     50        graph = repository.get_graph()
     51        stop_revisions = (None, _mod_revision.NULL_REVISION)
     52        return graph.iter_lefthand_ancestry(revision_id, stop_revisions)
     53
    4754def pre_change_branch_tip(params):
    4855        repo = params.branch.repository
     
    5461        # First permitted case is appending changesets to main branch.Look for
    5562        # old tip in new main branch.
    56         for revision_id in repo.iter_reverse_revision_history(params.new_revid):
     63        for revision_id in iter_reverse_revision_history(repo, params.new_revid):
    5764                if revision_id == params.old_revid:
    5865                        return  # Found old tip
     
    6067        # Another permitted case is backing out changesets. Look for new tip
    6168        # in old branch.
    62         for revision_id in repo.iter_reverse_revision_history(params.old_revid):
     69        for revision_id in iter_reverse_revision_history(repo, params.old_revid):
    6370                if revision_id == params.new_revid:
    6471                        return  # Found new tip
  • defaults/sparc64/ultra/Makefile.config

    r71450c8 r05f5fbf  
    44# CPU type
    55PROCESSOR = us
     6
     7# Barebone build with essential binaries only
     8CONFIG_BAREBONE = y
  • release/Makefile

    r71450c8 r05f5fbf  
    3333
    3434PROFILES = amd64 arm32/GXemul arm32/integratorcp arm32/gta02 ia32 \
    35     ia64/i460GX ia64/ski mips32/GXemul mips32/msim sparc64/niagara \
     35    ia64/i460GX ia64/ski mips32/GXemul mips32/msim ppc32 \
    3636    sparc64/ultra
    3737
     
    7171release: src_rel
    7272        for profile in $(PROFILES); do \
    73                 $(MAKE) -C $(EXPORT_DIR) clean ; \
     73                $(MAKE) -C $(EXPORT_DIR) distclean ; \
    7474                $(MAKE) -C $(EXPORT_DIR) PROFILE=$$profile ; \
    7575                $(MAKE) PROFILE=$$profile releasefile ; \
     
    7979        rm -rf $(EXPORT_DIR)
    8080        mkdir -p $(EXPORT_DIR)
    81         $(BZR) export $(EXPORT_DIR)
     81        $(BZR) export $(EXPORT_DIR) ../
    8282
    8383src_rel $(SRC_ARCHIVE): export
  • uspace/lib/c/arch/amd64/include/elf_linux.h

    r71450c8 r05f5fbf  
    6666        uint64_t rsp;
    6767        uint64_t ss;
     68
     69        /*
     70         * The following registers need to be part of elf_regs_t.
     71         * Unfortunately, we don't have any information about them in our
     72         * istate_t.
     73         */
     74        uint64_t unused_fs_base;
     75        uint64_t unused_gs_base;
     76        uint64_t unused_ds;
     77        uint64_t unused_es;
     78        uint64_t unused_fs;
     79        uint64_t unused_gs;
    6880} elf_regs_t;
    6981
     
    91103        elf_regs->rsp = istate->rsp;
    92104        elf_regs->ss = istate->ss;
     105
     106        /*
     107         * Reset the registers for which there is not enough info in istate_t.
     108         */
     109        elf_regs->unused_fs_base = 0;
     110        elf_regs->unused_gs_base = 0;
     111        elf_regs->unused_ds = 0;
     112        elf_regs->unused_es = 0;
     113        elf_regs->unused_fs = 0;
     114        elf_regs->unused_gs = 0;
    93115}
    94116
  • uspace/srv/net/tcp/sock.c

    r71450c8 r05f5fbf  
    779779        }
    780780
     781        /* Grab recv_buffer_lock because of CV wait in tcp_sock_recv_fibril() */
     782        fibril_mutex_lock(&socket->recv_buffer_lock);
     783        socket->sock_core = NULL;
     784        fibril_mutex_unlock(&socket->recv_buffer_lock);
     785
    781786        rc = socket_destroy(NULL, socket_id, &client->sockets, &gsock,
    782787            tcp_free_sock_data);
     
    839844        log_msg(LVL_DEBUG, "tcp_sock_recv_fibril()");
    840845
     846        fibril_mutex_lock(&sock->recv_buffer_lock);
     847
    841848        while (true) {
    842849                log_msg(LVL_DEBUG, "call tcp_uc_receive()");
    843                 fibril_mutex_lock(&sock->recv_buffer_lock);
    844                 while (sock->recv_buffer_used != 0)
     850                while (sock->recv_buffer_used != 0 && sock->sock_core != NULL)
    845851                        fibril_condvar_wait(&sock->recv_buffer_cv,
    846852                            &sock->recv_buffer_lock);
     
    852858                        sock->recv_error = trc;
    853859                        fibril_condvar_broadcast(&sock->recv_buffer_cv);
    854                         fibril_mutex_unlock(&sock->recv_buffer_lock);
    855                         tcp_sock_notify_data(sock->sock_core);
     860                        if (sock->sock_core != NULL)
     861                                tcp_sock_notify_data(sock->sock_core);
    856862                        break;
    857863                }
     
    861867                sock->recv_buffer_used = data_len;
    862868                fibril_condvar_broadcast(&sock->recv_buffer_cv);
    863                 fibril_mutex_unlock(&sock->recv_buffer_lock);
    864                 tcp_sock_notify_data(sock->sock_core);
    865         }
     869                if (sock->sock_core != NULL)
     870                        tcp_sock_notify_data(sock->sock_core);
     871        }
     872
     873        fibril_mutex_unlock(&sock->recv_buffer_lock);
    866874
    867875        tcp_uc_delete(sock->conn);
  • version

    r71450c8 r05f5fbf  
    3636
    3737VERSION = 0
    38 PATCHLEVEL = 4
    39 SUBLEVEL = 3
     38PATCHLEVEL = 5
     39SUBLEVEL = 0
    4040
    4141ifdef EXTRAVERSION
     
    4545endif
    4646
    47 NAME = Sashimi
     47NAME = Fajtl
    4848COPYRIGHT = Copyright (c) 2001-2012 HelenOS project
Note: See TracChangeset for help on using the changeset viewer.