Changes in / [05f5fbf:71450c8] in mainline

Files:

• contrib/arch/HelenOS.adl (modified) (1 diff)
• contrib/bazaar/bzreml/__init__.py (modified) (1 diff)
• contrib/bazaar/mbprotect/__init__.py (modified) (3 diffs)
• defaults/sparc64/ultra/Makefile.config (modified) (1 diff)
• release/Makefile (modified) (3 diffs)
• uspace/lib/c/arch/amd64/include/elf_linux.h (modified) (2 diffs)
• uspace/srv/net/tcp/sock.c (modified) (4 diffs)
• version (modified) (2 diffs)

contrib/arch/HelenOS.adl

@@ -1 @@
-system architecture HelenOS version 0.5.0 {
+system architecture HelenOS version 0.4.1 {
         /* SPARTAN kernel */
         inst kernel kernel;

contrib/bazaar/bzreml/__init__.py

@@ -102 +102 @@
         return ""
 
-def iter_reverse_revision_history(repository, revision_id):
-        """Iterate backwards through revision ids in the lefthand history"""
-        
-        graph = repository.get_graph()
-        stop_revisions = (None, _mod_revision.NULL_REVISION)
-        return graph.iter_lefthand_ancestry(revision_id, stop_revisions)
-
 def revision_sequence(branch, revision_old_id, revision_new_id):
         """Calculate a sequence of revisions"""
         
-        for revision_ac_id in iter_reverse_revision_history(branch.repository, revision_new_id):
+        for revision_ac_id in branch.repository.iter_reverse_revision_history(revision_new_id):
                 if (revision_ac_id == revision_old_id):
                         break

contrib/bazaar/mbprotect/__init__.py

@@ -45 +45 @@
 from bzrlib.errors import TipChangeRejected
 
-def iter_reverse_revision_history(repository, revision_id):
-        """Iterate backwards through revision ids in the lefthand history"""
-        
-        graph = repository.get_graph()
-        stop_revisions = (None, _mod_revision.NULL_REVISION)
-        return graph.iter_lefthand_ancestry(revision_id, stop_revisions)
-
 def pre_change_branch_tip(params):
         repo = params.branch.repository
@@ -61 +54 @@
         # First permitted case is appending changesets to main branch.Look for
         # old tip in new main branch.
-        for revision_id in iter_reverse_revision_history(repo, params.new_revid):
+        for revision_id in repo.iter_reverse_revision_history(params.new_revid):
                 if revision_id == params.old_revid:
                         return  # Found old tip
@@ -67 +60 @@
         # Another permitted case is backing out changesets. Look for new tip
         # in old branch.
-        for revision_id in iter_reverse_revision_history(repo, params.old_revid):
+        for revision_id in repo.iter_reverse_revision_history(params.old_revid):
                 if revision_id == params.new_revid:
                         return  # Found new tip

defaults/sparc64/ultra/Makefile.config

@@ -4 +4 @@
 # CPU type
 PROCESSOR = us
-
-# Barebone build with essential binaries only
-CONFIG_BAREBONE = y

release/Makefile

@@ -33 +33 @@
 
 PROFILES = amd64 arm32/GXemul arm32/integratorcp arm32/gta02 ia32 \
-    ia64/i460GX ia64/ski mips32/GXemul mips32/msim ppc32 \
+    ia64/i460GX ia64/ski mips32/GXemul mips32/msim sparc64/niagara \
     sparc64/ultra
 
@@ -71 +71 @@
 release: src_rel
         for profile in $(PROFILES); do \
-                $(MAKE) -C $(EXPORT_DIR) distclean ; \
+                $(MAKE) -C $(EXPORT_DIR) clean ; \
                 $(MAKE) -C $(EXPORT_DIR) PROFILE=$$profile ; \
                 $(MAKE) PROFILE=$$profile releasefile ; \
@@ -79 +79 @@
         rm -rf $(EXPORT_DIR)
         mkdir -p $(EXPORT_DIR)
-        $(BZR) export $(EXPORT_DIR) ../
+        $(BZR) export $(EXPORT_DIR)
 
 src_rel $(SRC_ARCHIVE): export

uspace/lib/c/arch/amd64/include/elf_linux.h

@@ -66 +66 @@
         uint64_t rsp;
         uint64_t ss;
-
-        /*
-         * The following registers need to be part of elf_regs_t.
-         * Unfortunately, we don't have any information about them in our
-         * istate_t.
-         */
-        uint64_t unused_fs_base;
-        uint64_t unused_gs_base;
-        uint64_t unused_ds;
-        uint64_t unused_es;
-        uint64_t unused_fs;
-        uint64_t unused_gs;
 } elf_regs_t;
 
@@ -103 +91 @@
         elf_regs->rsp = istate->rsp;
         elf_regs->ss = istate->ss;
-
-        /*
-         * Reset the registers for which there is not enough info in istate_t.
-         */
-        elf_regs->unused_fs_base = 0;
-        elf_regs->unused_gs_base = 0;
-        elf_regs->unused_ds = 0;
-        elf_regs->unused_es = 0;
-        elf_regs->unused_fs = 0;
-        elf_regs->unused_gs = 0;
 }
 

uspace/srv/net/tcp/sock.c

@@ -779 +779 @@
         }
 
-        /* Grab recv_buffer_lock because of CV wait in tcp_sock_recv_fibril() */
-        fibril_mutex_lock(&socket->recv_buffer_lock);
-        socket->sock_core = NULL;
-        fibril_mutex_unlock(&socket->recv_buffer_lock);
-
         rc = socket_destroy(NULL, socket_id, &client->sockets, &gsock,
             tcp_free_sock_data);
@@ -844 +839 @@
         log_msg(LVL_DEBUG, "tcp_sock_recv_fibril()");
 
-        fibril_mutex_lock(&sock->recv_buffer_lock);
-
         while (true) {
                 log_msg(LVL_DEBUG, "call tcp_uc_receive()");
-                while (sock->recv_buffer_used != 0 && sock->sock_core != NULL)
+                fibril_mutex_lock(&sock->recv_buffer_lock);
+                while (sock->recv_buffer_used != 0)
                         fibril_condvar_wait(&sock->recv_buffer_cv,
                             &sock->recv_buffer_lock);
@@ -858 +852 @@
                         sock->recv_error = trc;
                         fibril_condvar_broadcast(&sock->recv_buffer_cv);
-                        if (sock->sock_core != NULL)
-                                tcp_sock_notify_data(sock->sock_core);
+                        fibril_mutex_unlock(&sock->recv_buffer_lock);
+                        tcp_sock_notify_data(sock->sock_core);
                         break;
                 }
@@ -867 +861 @@
                 sock->recv_buffer_used = data_len;
                 fibril_condvar_broadcast(&sock->recv_buffer_cv);
-                if (sock->sock_core != NULL)
-                        tcp_sock_notify_data(sock->sock_core);
-        }
-
-        fibril_mutex_unlock(&sock->recv_buffer_lock);
+                fibril_mutex_unlock(&sock->recv_buffer_lock);
+                tcp_sock_notify_data(sock->sock_core);
+        }
 
         tcp_uc_delete(sock->conn);

version

@@ -36 +36 @@
 
 VERSION = 0
-PATCHLEVEL = 5
-SUBLEVEL = 0
+PATCHLEVEL = 4
+SUBLEVEL = 3
 
 ifdef EXTRAVERSION
@@ -45 +45 @@
 endif
 
-NAME = Fajtl
+NAME = Sashimi
 COPYRIGHT = Copyright (c) 2001-2012 HelenOS project