Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd2aecae

Browse files
committed
Modify dynamic shared memory code to use Size rather than uint64.
This is more consistent with what we do elsewhere.
1 parentc737a2e commitd2aecae

File tree

4 files changed

+35
-40
lines changed

4 files changed

+35
-40
lines changed

‎src/backend/storage/ipc/dsm.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ struct dsm_segment
6767
uint32control_slot;/* Slot in control segment. */
6868
void*impl_private;/* Implementation-specific private data. */
6969
void*mapped_address;/* Mapping address, or NULL if unmapped. */
70-
uint64mapped_size;/* Size of our mapping. */
70+
Sizemapped_size;/* Size of our mapping. */
7171
};
7272

7373
/* Shared-memory state for a dynamic shared memory segment. */
@@ -94,7 +94,7 @@ static void dsm_postmaster_shutdown(int code, Datum arg);
9494
staticvoiddsm_backend_shutdown(intcode,Datumarg);
9595
staticdsm_segment*dsm_create_descriptor(void);
9696
staticbooldsm_control_segment_sane(dsm_control_header*control,
97-
uint64mapped_size);
97+
Sizemapped_size);
9898
staticuint64dsm_control_bytes_needed(uint32nitems);
9999

100100
/* Has this backend initialized the dynamic shared memory system yet? */
@@ -128,7 +128,7 @@ static dlist_head dsm_segment_list = DLIST_STATIC_INIT(dsm_segment_list);
128128
*/
129129
staticdsm_handledsm_control_handle;
130130
staticdsm_control_header*dsm_control;
131-
staticuint64dsm_control_mapped_size=0;
131+
staticSizedsm_control_mapped_size=0;
132132
staticvoid*dsm_control_impl_private=NULL;
133133

134134
/*
@@ -142,7 +142,7 @@ dsm_postmaster_startup(void)
142142
{
143143
void*dsm_control_address=NULL;
144144
uint32maxitems;
145-
uint64segsize;
145+
Sizesegsize;
146146

147147
Assert(!IsUnderPostmaster);
148148

@@ -214,8 +214,8 @@ dsm_cleanup_using_control_segment(void)
214214
void*junk_mapped_address=NULL;
215215
void*impl_private=NULL;
216216
void*junk_impl_private=NULL;
217-
uint64mapped_size=0;
218-
uint64junk_mapped_size=0;
217+
Sizemapped_size=0;
218+
Sizejunk_mapped_size=0;
219219
uint32nitems;
220220
uint32i;
221221
dsm_handleold_control_handle;
@@ -453,7 +453,7 @@ dsm_postmaster_shutdown(int code, Datum arg)
453453
void*dsm_control_address;
454454
void*junk_mapped_address=NULL;
455455
void*junk_impl_private=NULL;
456-
uint64junk_mapped_size=0;
456+
Sizejunk_mapped_size=0;
457457

458458
/*
459459
* If some other backend exited uncleanly, it might have corrupted the
@@ -562,7 +562,7 @@ dsm_backend_startup(void)
562562
* Create a new dynamic shared memory segment.
563563
*/
564564
dsm_segment*
565-
dsm_create(uint64size)
565+
dsm_create(Sizesize)
566566
{
567567
dsm_segment*seg=dsm_create_descriptor();
568568
uint32i;
@@ -733,7 +733,7 @@ dsm_backend_shutdown(int code, Datum arg)
733733
* address. For the caller's convenience, we return the mapped address.
734734
*/
735735
void*
736-
dsm_resize(dsm_segment*seg,uint64size)
736+
dsm_resize(dsm_segment*seg,Sizesize)
737737
{
738738
Assert(seg->control_slot!=INVALID_CONTROL_SLOT);
739739
dsm_impl_op(DSM_OP_RESIZE,seg->handle,size,&seg->impl_private,
@@ -887,7 +887,7 @@ dsm_segment_address(dsm_segment *seg)
887887
/*
888888
* Get the size of a mapping.
889889
*/
890-
uint64
890+
Size
891891
dsm_segment_map_length(dsm_segment*seg)
892892
{
893893
Assert(seg->mapped_address!=NULL);
@@ -947,7 +947,7 @@ dsm_create_descriptor(void)
947947
* our segments at all.
948948
*/
949949
staticbool
950-
dsm_control_segment_sane(dsm_control_header*control,uint64mapped_size)
950+
dsm_control_segment_sane(dsm_control_header*control,Sizemapped_size)
951951
{
952952
if (mapped_size< offsetof(dsm_control_header,item))
953953
return false;/* Mapped size too short to read header. */

‎src/backend/storage/ipc/dsm_impl.c

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -69,24 +69,24 @@
6969
#include"utils/memutils.h"
7070

7171
#ifdefUSE_DSM_POSIX
72-
staticbooldsm_impl_posix(dsm_opop,dsm_handlehandle,uint64request_size,
72+
staticbooldsm_impl_posix(dsm_opop,dsm_handlehandle,Sizerequest_size,
7373
void**impl_private,void**mapped_address,
74-
uint64*mapped_size,intelevel);
74+
Size*mapped_size,intelevel);
7575
#endif
7676
#ifdefUSE_DSM_SYSV
77-
staticbooldsm_impl_sysv(dsm_opop,dsm_handlehandle,uint64request_size,
77+
staticbooldsm_impl_sysv(dsm_opop,dsm_handlehandle,Sizerequest_size,
7878
void**impl_private,void**mapped_address,
79-
uint64*mapped_size,intelevel);
79+
Size*mapped_size,intelevel);
8080
#endif
8181
#ifdefUSE_DSM_WINDOWS
82-
staticbooldsm_impl_windows(dsm_opop,dsm_handlehandle,uint64request_size,
82+
staticbooldsm_impl_windows(dsm_opop,dsm_handlehandle,Sizerequest_size,
8383
void**impl_private,void**mapped_address,
84-
uint64*mapped_size,intelevel);
84+
Size*mapped_size,intelevel);
8585
#endif
8686
#ifdefUSE_DSM_MMAP
87-
staticbooldsm_impl_mmap(dsm_opop,dsm_handlehandle,uint64request_size,
87+
staticbooldsm_impl_mmap(dsm_opop,dsm_handlehandle,Sizerequest_size,
8888
void**impl_private,void**mapped_address,
89-
uint64*mapped_size,intelevel);
89+
Size*mapped_size,intelevel);
9090
#endif
9191
staticinterrcode_for_dynamic_shared_memory(void);
9292

@@ -156,19 +156,14 @@ int dynamic_shared_memory_type;
156156
*-----
157157
*/
158158
bool
159-
dsm_impl_op(dsm_opop,dsm_handlehandle,uint64request_size,
160-
void**impl_private,void**mapped_address,uint64*mapped_size,
159+
dsm_impl_op(dsm_opop,dsm_handlehandle,Sizerequest_size,
160+
void**impl_private,void**mapped_address,Size*mapped_size,
161161
intelevel)
162162
{
163163
Assert(op==DSM_OP_CREATE||op==DSM_OP_RESIZE||request_size==0);
164164
Assert((op!=DSM_OP_CREATE&&op!=DSM_OP_ATTACH)||
165165
(*mapped_address==NULL&&*mapped_size==0));
166166

167-
if (request_size> (size_t)-1)
168-
ereport(ERROR,
169-
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
170-
errmsg("requested shared memory size overflows size_t")));
171-
172167
switch (dynamic_shared_memory_type)
173168
{
174169
#ifdefUSE_DSM_POSIX
@@ -241,8 +236,8 @@ dsm_impl_can_resize(void)
241236
* a different shared memory implementation.
242237
*/
243238
staticbool
244-
dsm_impl_posix(dsm_opop,dsm_handlehandle,uint64request_size,
245-
void**impl_private,void**mapped_address,uint64*mapped_size,
239+
dsm_impl_posix(dsm_opop,dsm_handlehandle,Sizerequest_size,
240+
void**impl_private,void**mapped_address,Size*mapped_size,
246241
intelevel)
247242
{
248243
charname[64];
@@ -407,8 +402,8 @@ dsm_impl_posix(dsm_op op, dsm_handle handle, uint64 request_size,
407402
* those are not supported everywhere.
408403
*/
409404
staticbool
410-
dsm_impl_sysv(dsm_opop,dsm_handlehandle,uint64request_size,
411-
void**impl_private,void**mapped_address,uint64*mapped_size,
405+
dsm_impl_sysv(dsm_opop,dsm_handlehandle,Sizerequest_size,
406+
void**impl_private,void**mapped_address,Size*mapped_size,
412407
intelevel)
413408
{
414409
key_tkey;
@@ -612,9 +607,9 @@ dsm_impl_sysv(dsm_op op, dsm_handle handle, uint64 request_size,
612607
* when the process containing the reference exits.
613608
*/
614609
staticbool
615-
dsm_impl_windows(dsm_opop,dsm_handlehandle,uint64request_size,
610+
dsm_impl_windows(dsm_opop,dsm_handlehandle,Sizerequest_size,
616611
void**impl_private,void**mapped_address,
617-
uint64*mapped_size,intelevel)
612+
Size*mapped_size,intelevel)
618613
{
619614
char*address;
620615
HANDLEhmap;
@@ -780,8 +775,8 @@ dsm_impl_windows(dsm_op op, dsm_handle handle, uint64 request_size,
780775
* directory to a ramdisk to avoid this problem, if available.
781776
*/
782777
staticbool
783-
dsm_impl_mmap(dsm_opop,dsm_handlehandle,uint64request_size,
784-
void**impl_private,void**mapped_address,uint64*mapped_size,
778+
dsm_impl_mmap(dsm_opop,dsm_handlehandle,Sizerequest_size,
779+
void**impl_private,void**mapped_address,Size*mapped_size,
785780
intelevel)
786781
{
787782
charname[64];
@@ -892,7 +887,7 @@ dsm_impl_mmap(dsm_op op, dsm_handle handle, uint64 request_size,
892887
*/
893888
while (success&&remaining>0)
894889
{
895-
uint64goal=remaining;
890+
Sizegoal=remaining;
896891

897892
if (goal>ZBUFFER_SIZE)
898893
goal=ZBUFFER_SIZE;

‎src/include/storage/dsm.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ typedef struct dsm_segment dsm_segment;
2121
externvoiddsm_postmaster_startup(void);
2222

2323
/* Functions that create, update, or remove mappings. */
24-
externdsm_segment*dsm_create(uint64size);
24+
externdsm_segment*dsm_create(Sizesize);
2525
externdsm_segment*dsm_attach(dsm_handleh);
26-
externvoid*dsm_resize(dsm_segment*seg,uint64size);
26+
externvoid*dsm_resize(dsm_segment*seg,Sizesize);
2727
externvoid*dsm_remap(dsm_segment*seg);
2828
externvoiddsm_detach(dsm_segment*seg);
2929

@@ -33,7 +33,7 @@ extern dsm_segment *dsm_find_mapping(dsm_handle h);
3333

3434
/* Informational functions. */
3535
externvoid*dsm_segment_address(dsm_segment*seg);
36-
externuint64dsm_segment_map_length(dsm_segment*seg);
36+
externSizedsm_segment_map_length(dsm_segment*seg);
3737
externdsm_handledsm_segment_handle(dsm_segment*seg);
3838

3939
#endif/* DSM_H */

‎src/include/storage/dsm_impl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ typedef enum
6565
}dsm_op;
6666

6767
/* Create, attach to, detach from, resize, or destroy a segment. */
68-
externbooldsm_impl_op(dsm_opop,dsm_handlehandle,uint64request_size,
69-
void**impl_private,void**mapped_address,uint64*mapped_size,
68+
externbooldsm_impl_op(dsm_opop,dsm_handlehandle,Sizerequest_size,
69+
void**impl_private,void**mapped_address,Size*mapped_size,
7070
intelevel);
7171

7272
/* Some implementations cannot resize segments. Can this one? */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp