From b9c1ef9948cd6a89af3e1f250dc69d368f70200f Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 3 Oct 2013 22:08:21 +0200 Subject: [PATCH] Typo: contexte -> context. --- src/simix/README_attempt_without_stack | 4 ++-- src/simix/smx_context.c | 5 ++--- src/simix/smx_context_raw.c | 2 +- src/simix/smx_context_sysv.c | 2 +- src/xbt/ex.c | 2 +- src/xbt/xbt_sg_stubs.c | 4 ++-- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/simix/README_attempt_without_stack b/src/simix/README_attempt_without_stack index 4ad29b0812..a7b145fad7 100644 --- a/src/simix/README_attempt_without_stack +++ b/src/simix/README_attempt_without_stack @@ -12,7 +12,7 @@ Shiny side: glance at interface It uses a new simix context factory: state_machine. Each user process is a state machine. There is no system mystery such as pthread or -ucontextes to save its stack. As a result, there is no stack. Each +ucontexts to save its stack. As a result, there is no stack. Each user process only have a user-provided structure describing its state, and only compute its next state based on that. Your main() can be as simple as: @@ -35,7 +35,7 @@ simple as: the structure describing a process. This way of organizing the code saves a *huge amount* of memory -(regular contextes have 128kb stacks per user process, threads are +(regular contexts have 128kb stacks per user process, threads are even more expensive) and greatly speeds things up (there is absolutely no nothing to ask to the system, and everything can be done in user space). diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c index 88c5a4fac9..e638bb7e76 100644 --- a/src/simix/smx_context.c +++ b/src/simix/smx_context.c @@ -70,10 +70,10 @@ void SIMIX_context_mod_init(void) #ifdef HAVE_RAWCTX XBT_ERROR(" raw: high performance context factory implemented specifically for SimGrid"); #else - XBT_ERROR(" (raw contextes are disabled at compilation time on this machine -- check configure logs for details)"); + XBT_ERROR(" (raw contexts are disabled at compilation time on this machine -- check configure logs for details)"); #endif #ifdef CONTEXT_UCONTEXT - XBT_ERROR(" ucontext: classical system V contextes (implemented with makecontext, swapcontext and friends)"); + XBT_ERROR(" ucontext: classical system V contexts (implemented with makecontext, swapcontext and friends)"); #else XBT_ERROR(" (ucontext is disabled at compilation time on this machine -- check configure logs for details)"); #endif @@ -220,4 +220,3 @@ XBT_INLINE void SIMIX_context_set_current(smx_context_t context) smx_current_context_serial = context; } } - diff --git a/src/simix/smx_context_raw.c b/src/simix/smx_context_raw.c index 2fdb6d9d2c..7daec041c7 100644 --- a/src/simix/smx_context_raw.c +++ b/src/simix/smx_context_raw.c @@ -1,4 +1,4 @@ -/* context_raw - fast context switching inspired from System V ucontextes */ +/* context_raw - fast context switching inspired from System V ucontexts */ /* Copyright (c) 2009-2013. The SimGrid Team. * All rights reserved. */ diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c index d92dffd148..3af7b3cef9 100644 --- a/src/simix/smx_context_sysv.c +++ b/src/simix/smx_context_sysv.c @@ -1,4 +1,4 @@ -/* context_sysv - context switching with ucontextes from System V */ +/* context_sysv - context switching with ucontexts from System V */ /* Copyright (c) 2009-2013. The SimGrid Team. * All rights reserved. */ diff --git a/src/xbt/ex.c b/src/xbt/ex.c index 3656ea51af..9433046883 100644 --- a/src/xbt/ex.c +++ b/src/xbt/ex.c @@ -75,7 +75,7 @@ xbt_running_ctx_t *__xbt_ex_ctx_default(void) real life and in simulation when using threads to implement the simulation processes (ie, with pthreads and on windows). - It also gets overriden in xbt/context.c when using ucontextes (as well as + It also gets overriden in xbt/context.c when using ucontexts (as well as in Java for now, but after the java overhaul, it will get cleaned out) */ static xbt_running_ctx_t ctx = XBT_RUNNING_CTX_INITIALIZER; diff --git a/src/xbt/xbt_sg_stubs.c b/src/xbt/xbt_sg_stubs.c index cfac69c26f..bd85f59684 100644 --- a/src/xbt/xbt_sg_stubs.c +++ b/src/xbt/xbt_sg_stubs.c @@ -2,14 +2,14 @@ /* This is always part of SG, never of RL. Content: */ /* - a bunch of stub functions of the thread related function that we need */ -/* to add to the lib to please the linker when using ucontextes. */ +/* to add to the lib to please the linker when using ucontexts. */ /* - a bunch of stub functions of the java related function when we don't */ /* compile java bindings. */ /* In RL, java is useless, and threads are always part of the picture, */ /* ucontext never */ -/* Copyright (c) 2007-2010. The SimGrid Team. +/* Copyright (c) 2007-2010, 2013. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it -- 2.20.1