Skip to content

Commit 7900166

Browse files
authored
Merge pull request #10595 from luzpaz/typos/oshmem
Fix typos in the oshmem/ subdirectory
2 parents 640dd4e + 8b04b67 commit 7900166

22 files changed

+43
-43
lines changed

oshmem/include/pshmem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ OSHMEM_DECLSPEC int pshmem_my_pe(void);
4545
OSHMEM_DECLSPEC void pshmem_query_thread(int *provided);
4646

4747
/*
48-
* Accessability routines
48+
* Accessibility routines
4949
*/
5050
OSHMEM_DECLSPEC int pshmem_pe_accessible(int pe);
5151
OSHMEM_DECLSPEC int pshmem_addr_accessible(const void *addr, int pe);

oshmem/include/shmem-compat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* oshmem/include/shmem-compat.h. This file contains OpenSHMEM lagacy API */
1+
/* oshmem/include/shmem-compat.h. This file contains OpenSHMEM legacy API */
22
/*
33
* Copyright (c) 2014-2017 Mellanox Technologies, Inc.
44
* All rights reserved.

oshmem/include/shmem.h.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ OSHMEM_DECLSPEC void shmem_info_get_version(int *major, int *minor);
185185
OSHMEM_DECLSPEC void shmem_info_get_name(char *name);
186186

187187
/*
188-
* Accessability routines
188+
* Accessibility routines
189189
*/
190190
OSHMEM_DECLSPEC int shmem_pe_accessible(int pe);
191191
OSHMEM_DECLSPEC int shmem_addr_accessible(const void *addr, int pe);
@@ -2510,7 +2510,7 @@ OSHMEM_DECLSPEC void shmem_longlong_inc(long long *target, int pe);
25102510

25112511

25122512
/*
2513-
* Nonblocking Atomic Memroy Operations
2513+
* Nonblocking Atomic Memory Operations
25142514
*/
25152515

25162516
/* Atomic Nonblocking Fetch */

oshmem/mca/atomic/atomic.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ struct mca_atomic_base_component_1_0_0_t {
180180
};
181181
typedef struct mca_atomic_base_component_1_0_0_t mca_atomic_base_component_1_0_0_t;
182182

183-
/** Per guidence in mca.h, use the unversioned struct name if you just
183+
/** Per guidance in mca.h, use the unversioned struct name if you just
184184
want to always keep up with the most recent version of the
185-
interace. */
185+
interface. */
186186
typedef struct mca_atomic_base_component_1_0_0_t mca_atomic_base_component_t;
187187

188188
/**
@@ -299,9 +299,9 @@ struct mca_atomic_base_module_1_0_0_t {
299299
};
300300
typedef struct mca_atomic_base_module_1_0_0_t mca_atomic_base_module_1_0_0_t;
301301

302-
/** Per guidence in mca.h, use the unversioned struct name if you just
302+
/** Per guidance in mca.h, use the unversioned struct name if you just
303303
want to always keep up with the most recent version of the
304-
interace. */
304+
interface. */
305305
typedef struct mca_atomic_base_module_1_0_0_t mca_atomic_base_module_t;
306306
OSHMEM_DECLSPEC OBJ_CLASS_DECLARATION(mca_atomic_base_module_t);
307307

oshmem/mca/memheap/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
Copyright (c) 2013 Mellanox Technologies, Inc.
44
All rights reserved
55

6-
MEMHEAP Infrustructure is responsible for managing the symmetric heap.
6+
MEMHEAP Infrastructure is responsible for managing the symmetric heap.
77
The framework currently has following components: buddy and
88
ptmalloc. buddy which uses a buddy allocator in order to manage the
99
Memory allocations on the symmetric heap. Ptmalloc is an adaptation of
1010
ptmalloc3.
1111

1212
Additional components may be added easily to the framework by defining
1313
the component's and the module's base and extended structures, and
14-
their funtionalities.
14+
their functionalities.
1515

1616
The buddy allocator has the following data structures:
1717

@@ -54,7 +54,7 @@ The supported activities are:
5454

5555
1. buddy_init (Initialization)
5656
1. buddy_alloc (Allocates a variable on the symmetric heap)
57-
1. buddy_free (frees a variable previously allocated on the symetric heap)
57+
1. buddy_free (frees a variable previously allocated on the symmetric heap)
5858
1. buddy_finalize (Finalization).
5959

6060
Data members of buddy module:

oshmem/mca/memheap/base/memheap_base_mkey.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ static void do_recv(int source_pe, pmix_data_buffer_t* buffer)
280280

281281
/**
282282
* simple/fast version of MPI_Test that
283-
* - only works with persistant request
283+
* - only works with persistent request
284284
* - does not do any progress
285285
* - can be safely called from within opal_progress()
286286
*/
@@ -618,7 +618,7 @@ void mca_memheap_modex_recv_all(void)
618618

619619
rcv_buffer = malloc (buffer_size);
620620
if (NULL == rcv_buffer) {
621-
MEMHEAP_ERROR("failed to allocate recieve buffer");
621+
MEMHEAP_ERROR("failed to allocate receive buffer");
622622
rc = OSHMEM_ERR_OUT_OF_RESOURCE;
623623
goto exit_fatal;
624624
}

oshmem/mca/memheap/buddy/memheap_buddy_component.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ mca_memheap_buddy_component_query(mca_base_module_t **module, int *priority)
5757
}
5858

5959
/*
60-
* This function is automaticaly called from mca_base_components_close.
60+
* This function is automatically called from mca_base_components_close.
6161
* It releases the component's allocated memory.
6262
*/
6363
int mca_memheap_buddy_component_close()

oshmem/mca/memheap/memheap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ typedef struct mca_memheap_base_component_2_0_0_t mca_memheap_base_component_t;
8888
* memheap module descriptor
8989
*/
9090
struct mca_memheap_base_module_t {
91-
mca_memheap_base_component_t *memheap_component; /** Memory Heap Management Componenet */
91+
mca_memheap_base_component_t *memheap_component; /** Memory Heap Management Component */
9292
mca_memheap_base_module_finalize_fn_t memheap_finalize;
9393
mca_memheap_base_module_alloc_fn_t memheap_alloc;
9494
mca_memheap_base_module_memalign_fn_t memheap_memalign;

oshmem/mca/memheap/ptmalloc/malloc.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1443,7 +1443,7 @@ static FORCEINLINE void* win32direct_mmap(size_t size) {
14431443
return (ptr != 0)? ptr: MFAIL;
14441444
}
14451445

1446-
/* This function supports releasing coalesed segments */
1446+
/* This function supports releasing coalesced segments */
14471447
static FORCEINLINE int win32munmap(void* ptr, size_t size) {
14481448
MEMORY_BASIC_INFORMATION minfo;
14491449
char* cptr = (char*)ptr;
@@ -1480,7 +1480,7 @@ static FORCEINLINE int win32munmap(void* ptr, size_t size) {
14801480
#define CALL_MORECORE(S) MFAIL
14811481
#endif /* HAVE_MORECORE */
14821482

1483-
/* mstate bit set if continguous morecore disabled or failed */
1483+
/* mstate bit set if contiguous morecore disabled or failed */
14841484
#define USE_NONCONTIGUOUS_BIT (4U)
14851485

14861486
/* segment bit set in create_mspace_with_base */
@@ -2094,7 +2094,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
20942094
work in the same way as fd/bk pointers of small chunks.
20952095
20962096
Each tree contains a power of 2 sized range of chunk sizes (the
2097-
smallest is 0x100 <= x < 0x180), which is is divided in half at each
2097+
smallest is 0x100 <= x < 0x180), which is divided in half at each
20982098
tree level, with the chunks in the smaller half of the range (0x100
20992099
<= x < 0x140 for the top nose) in the left subtree and the larger
21002100
half (0x140 <= x < 0x180) in the right subtree. This is, of course,
@@ -2284,7 +2284,7 @@ typedef struct malloc_segment* msegmentptr;
22842284
22852285
Trim support
22862286
Fields holding the amount of unused topmost memory that should trigger
2287-
timming, and a counter to force periodic scanning to release unused
2287+
timing, and a counter to force periodic scanning to release unused
22882288
non-topmost segments.
22892289
22902290
Locking
@@ -2692,7 +2692,7 @@ static size_t traverse_and_check(mstate m);
26922692
http://www.usenix.org/events/lisa03/tech/robertson.html The footer
26932693
of an inuse chunk holds the xor of its mstate and a random seed,
26942694
that is checked upon calls to free() and realloc(). This is
2695-
(probablistically) unguessable from outside the program, but can be
2695+
(probabilistically) unguessable from outside the program, but can be
26962696
computed by any code successfully malloc'ing any chunk, so does not
26972697
itself provide protection against code that has already broken
26982698
security through some other means. Unlike Robertson et al, we
@@ -4539,7 +4539,7 @@ void* dlmalloc(size_t bytes) {
45394539

45404540
void dlfree(void* mem) {
45414541
/*
4542-
Consolidate freed chunks with preceeding or succeeding bordering
4542+
Consolidate freed chunks with preceding or succeeding bordering
45434543
free chunks, if they exist, and then place in a bin. Intermixed
45444544
with special cases for top, dv, mmapped chunks, and usage errors.
45454545
*/
@@ -5430,10 +5430,10 @@ int mspace_mallopt(int param_number, int value) {
54305430
Wolfram Gloger (Gloger@lrz.uni-muenchen.de).
54315431
* Use last_remainder in more cases.
54325432
* Pack bins using idea from colin@nyx10.cs.du.edu
5433-
* Use ordered bins instead of best-fit threshhold
5433+
* Use ordered bins instead of best-fit threshold
54345434
* Eliminate block-local decls to simplify tracing and debugging.
54355435
* Support another case of realloc via move into top
5436-
* Fix error occuring when initial sbrk_base not word-aligned.
5436+
* Fix error occurring when initial sbrk_base not word-aligned.
54375437
* Rely on page size for units instead of SBRK_UNIT to
54385438
avoid surprises about sbrk alignment conventions.
54395439
* Add mallinfo, mallopt. Thanks to Raymond Nijssen

oshmem/mca/memheap/ptmalloc/memheap_ptmalloc_component.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ mca_memheap_ptmalloc_component_query(mca_base_module_t **module, int *priority)
5858
}
5959

6060
/*
61-
* This function is automaticaly called from mca_base_components_close.
61+
* This function is automatically called from mca_base_components_close.
6262
* It releases the component's allocated memory.
6363
*/
6464
int mca_memheap_ptmalloc_component_close()

0 commit comments

Comments
 (0)