From 6afeb18117c451fd273b1a9534c0fba0af13ce0a Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Fri, 19 May 2017 01:52:59 +0300 Subject: [PATCH] Fix various typos in doc/README and .html files * doc/README.Mac: Fix a typo ("command-line"). * doc/README.amiga: Fix typos ("recommendation", "compiling", "favorably"). * doc/README.cords: Fix a typo ("and"). * doc/README.macros: Fix a typo ("canceled"). * doc/README.sgi: Fix a typo ("related"). * doc/README.solaris2: Fix a typo ("offset"). * doc/leak.html: Fix a typo ("e.g."). * doc/overview.html: Fix a typo ("December"). * doc/porting.html: Fix typos ("not supported yet", "signaled", "not defined yet"). * doc/scale.html: Fix typos ("free", "busy-waiting"). * doc/simple_example.html: Fix a typo ("have not yet"). * tests/test_cpp.cc (main): Fix a typo ("command line") in comment. --- doc/README.Mac | 2 +- doc/README.amiga | 6 +++--- doc/README.cords | 2 +- doc/README.macros | 2 +- doc/README.sgi | 2 +- doc/README.solaris2 | 2 +- doc/leak.html | 2 +- doc/overview.html | 2 +- doc/porting.html | 6 +++--- doc/scale.html | 4 ++-- doc/simple_example.html | 2 +- tests/test_cpp.cc | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/doc/README.Mac b/doc/README.Mac index 5ceeb588..fd972cf7 100644 --- a/doc/README.Mac +++ b/doc/README.Mac @@ -126,7 +126,7 @@ o 68K Linker Prefix Files to configure the GC sources ---------------------------------------- -The Codewarrior equivalent of commandline compilers -DNAME=X is to use +The Codewarrior equivalent of command-line compilers -DNAME=X is to use prefix-files. A TEXT file that is automatically #included before the first byte of every source file. I used these: diff --git a/doc/README.amiga b/doc/README.amiga index da1c95bb..fb9aacc9 100644 --- a/doc/README.amiga +++ b/doc/README.amiga @@ -62,7 +62,7 @@ WHATS NEW: program, and prints out the info when the atexit-handler is called. - My reccomendation is to set all this flags, except GC_AMIGA_PRINTSTATS and + My recommendation is to set all this flags, except GC_AMIGA_PRINTSTATS and GC_AMIGA_ONLYFAST. If your program demands high response-time, you should @@ -70,7 +70,7 @@ WHATS NEW: GC_AMIGA_RETRY does not seem to slow down much. Also, when compiling up programs, and GC_AMIGA_FASTALLOC was not defined when - compilling gc, you can define GC_AMIGA_MAKINGLIB to avoid having these allocation- + compiling gc, you can define GC_AMIGA_MAKINGLIB to avoid having these allocation- functions wrapped. (see gc.h) Note that GC_realloc must not be called before any of @@ -282,7 +282,7 @@ The library as it stands is compatible with the GigaMem commercial virtual memory software, and probably similar PD software. The performance of "gctest" on an Amiga 2630 (68030 @ 25Mhz) -compares favourably with an HP9000 with similar architecture (a 325 +compares favorably with an HP9000 with similar architecture (a 325 with a 68030 I think). ----------------------------------------------------------------------- diff --git a/doc/README.cords b/doc/README.cords index b574deda..db88b4c4 100644 --- a/doc/README.cords +++ b/doc/README.cords @@ -40,7 +40,7 @@ almost a screen. It does not understand tabs, which will show up as highlighted "I"s. Use the UNIX "expand" program first.) To build the editor, type "make cord/de" in the gc directory. -Note that CORD_printf iand friends use C functions with variable numbers +Note that CORD_printf and friends use C functions with variable numbers of arguments in non-standard-conforming ways. This code is known to break on some platforms, notably PowerPC. It should be possible to build the remainder of the library (everything but cordprnt.c) on diff --git a/doc/README.macros b/doc/README.macros index 3040f3e8..191537fe 100644 --- a/doc/README.macros +++ b/doc/README.macros @@ -577,7 +577,7 @@ GC_FULL_FREQ= Set alternate default number of partial collections NO_CANCEL_SAFE (Posix platforms with threads only) Don't bother trying to make the collector safe for thread cancellation; cancellation is not used. (Note that if cancellation is used anyway, threads may end up - getting cancelled in unexpected places.) Even without this option, + getting canceled in unexpected places.) Even without this option, PTHREAD_CANCEL_ASYNCHRONOUS is never safe with the collector. (We could argue about its safety without the collector.) diff --git a/doc/README.sgi b/doc/README.sgi index 98c79011..ac732ddb 100644 --- a/doc/README.sgi +++ b/doc/README.sgi @@ -27,7 +27,7 @@ include gc.h. Gc.h redefines some of the pthread primitives as macros which also provide the collector with information it requires. 4) pthread_cond_wait and pthread_cond_timed_wait should be prepared for -premature wakeups. (I believe the pthreads and realted standards require this +premature wakeups. (I believe the pthreads and related standards require this anyway. Irix pthreads often terminate a wait if a signal arrives. The garbage collector uses signals to stop threads.) diff --git a/doc/README.solaris2 b/doc/README.solaris2 index cd2d9f67..b150f9c2 100644 --- a/doc/README.solaris2 +++ b/doc/README.solaris2 @@ -58,7 +58,7 @@ have it invoke the garbage-collector's allocators only after main has started. (Note that the latter requires a moderately expensive test in operator delete.) -I encountered "symbol : offet .... is non-aligned" errors. These +I encountered "symbol : offset .... is non-aligned" errors. These appear to be traceable to the use of the GNU assembler with the Sun linker. The former appears to generate a relocation not understood by the latter. The fix appears to be to use a consistent tool chain. (As a non-Solaris-expert diff --git a/doc/leak.html b/doc/leak.html index d6e8a4c5..43bc66d5 100644 --- a/doc/leak.html +++ b/doc/leak.html @@ -68,7 +68,7 @@ at least the file name and line number at the allocation point to be saved as part of the object. Leak reports will then also include this information.

-Many collector features (e.g stubborn objects, finalization, +Many collector features (e.g. stubborn objects, finalization, and disappearing links) are less useful in this context, and are not fully supported. Their use will usually generate additional bogus leak reports, since the collector itself drops some associated objects. diff --git a/doc/overview.html b/doc/overview.html index 003ed7a6..b8c6f333 100644 --- a/doc/overview.html +++ b/doc/overview.html @@ -265,7 +265,7 @@ Proceedings of the ACM SIGPLAN '96 Conference on Programming Language Design and Implementation.

Boehm, H., and D. Chase, "A Proposal for Garbage-Collector-Safe C Compilation", -Journal of C Language Translation 4, 2 (Decemeber 1992), pp. 126-141. +Journal of C Language Translation 4, 2 (December 1992), pp. 126-141.

Other related information:

diff --git a/doc/porting.html b/doc/porting.html index 3d2890e7..2b019d7d 100644 --- a/doc/porting.html +++ b/doc/porting.html @@ -131,7 +131,7 @@ should be defined to the limits of the second main data segment.

Should be defined if the stack (or thread stacks) grow towards higher addresses. (This appears to be true only on PA-RISC. If your architecture -has more than one stack per thread, and is not already supported, you will +has more than one stack per thread, and is not supported yet, you will need to do more work. Grep for "IA64" in the source for an example.)
STACKBOTTOM
@@ -166,7 +166,7 @@ The cold end of the stack is determined by taking an address inside GC_init's frame, incrementing it repeatedly in small steps (decrement if STACK_GROWS_UP), and reading the value at each location. We remember the value when the first -Segmentation violation or Bus error is signalled, round that +Segmentation violation or Bus error is signaled, round that to the nearest plausible page boundary, and use that as the stack base.
DYNAMIC_LOADING @@ -208,7 +208,7 @@ tweaking of conditional compilation tests.

For GC7, if your platform supports getcontext(), then defining the macro UNIX_LIKE for your OS in gcconfig.h -(if it isn't defined there already) is likely to solve the problem. +(if it isn't defined there yet) is likely to solve the problem. otherwise, if you are using gcc, _builtin_unwind_init() will be used, and should work fine. If that is not applicable either, the implementation will try to use setjmp(). This will work if your diff --git a/doc/scale.html b/doc/scale.html index 8fe1e60e..15c8c597 100644 --- a/doc/scale.html +++ b/doc/scale.html @@ -133,7 +133,7 @@ Running with a thread-unsafe collector, the benchmark ran in 9 seconds. With the simple thread-safe collector, built with -DGC_THREADS, the execution time increased to 10.3 seconds, or 23.5 elapsed seconds with two clients. -(The times for the malloc/ifree version +(The times for the malloc/free version with glibc malloc are 10.51 (standard library, pthreads not linked), 20.90 (one thread, pthreads linked), @@ -155,7 +155,7 @@ avoided in time-critical code. directly for allocation locking would have been worse still, at least for older versions of linuxthreads. With THREAD_LOCAL_ALLOC, we first repeatedly try to acquire the -lock with pthread_mutex_try_lock(), busy_waiting between attempts. +lock with pthread_mutex_try_lock(), busy-waiting between attempts. After a fixed number of attempts, we use pthread_mutex_lock().)

These measurements do not use incremental collection, nor was prefetching diff --git a/doc/simple_example.html b/doc/simple_example.html index d1676602..b01d94a7 100644 --- a/doc/simple_example.html +++ b/doc/simple_example.html @@ -12,7 +12,7 @@ a single-threaded application. The green text contains information about other platforms or scenarios. It can be skipped, especially on first reading.

Building the collector

-If you haven't already so, unpack the collector and enter +If you have not so yet, unpack the collector and enter the newly created directory with 
 tar xvfz gc<version>.tar.gz
diff --git a/tests/test_cpp.cc b/tests/test_cpp.cc
index bb18ed54..55c7778b 100644
--- a/tests/test_cpp.cc
+++ b/tests/test_cpp.cc
@@ -242,7 +242,7 @@ void* Undisguise( GC_word i ) {
       }
 #elif defined(MACOS)
   int main() {
-    char* argv_[] = {"test_cpp", "10"}; // MacOS doesn't have a commandline
+    char* argv_[] = {"test_cpp", "10"}; // MacOS doesn't have a command line
     argv = argv_;
     argc = sizeof(argv_)/sizeof(argv_[0]);
 #else
-- 
2.40.0