From a91c5be6a47349d87068680c80839aae76304285 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Thu, 24 Apr 2003 18:14:22 +0000 Subject: [PATCH] pgindent new Win32 files. --- src/backend/port/win32/sem.c | 117 ++++++++++++++++++++--------------- src/backend/port/win32/shm.c | 70 +++++++++++---------- 2 files changed, 106 insertions(+), 81 deletions(-) diff --git a/src/backend/port/win32/sem.c b/src/backend/port/win32/sem.c index 33a29651ef..90296bd7eb 100644 --- a/src/backend/port/win32/sem.c +++ b/src/backend/port/win32/sem.c @@ -13,11 +13,14 @@ #include -typedef struct { +typedef struct +{ int m_numSems; - off_t m_semaphoreHandles; // offset from beginning of header - off_t m_semaphoreCounts; // offset from beginning of header -} win32_sem_set_hdr; + off_t m_semaphoreHandles; + //offset from beginning of header + off_t m_semaphoreCounts; + //offset from beginning of header +} win32_sem_set_hdr; /* Control of a semaphore pool. The pool is an area in which we stored all ** the semIds of the pool. The first long is the number of semaphore @@ -27,22 +30,24 @@ typedef struct { int semctl(int semId, int semNum, int flag, union semun semun) { - win32_sem_set_hdr* the_set = (win32_sem_set_hdr*)MAKE_PTR(semId); + win32_sem_set_hdr *the_set = (win32_sem_set_hdr *) MAKE_PTR(semId); /* semNum might be 0 */ /* semun.array contains the sem initial values */ - int* sem_counts = (int*)((off_t)the_set + the_set->m_semaphoreCounts); + int *sem_counts = (int *) ((off_t) the_set + the_set->m_semaphoreCounts); /* Fix the count of all sem of the pool to semun.array */ if (flag == SETALL) { - int i; + int i; struct sembuf sops; + sops.sem_flg = IPC_NOWAIT; - for (i = 0; i < the_set->m_numSems; ++i) { + for (i = 0; i < the_set->m_numSems; ++i) + { if (semun.array[i] == sem_counts[i]) - continue; /* Nothing to do */ + continue; /* Nothing to do */ if (semun.array[i] < sem_counts[i]) sops.sem_op = -1; @@ -50,7 +55,7 @@ semctl(int semId, int semNum, int flag, union semun semun) sops.sem_op = 1; sops.sem_num = i; - + /* Quickly lock/unlock the semaphore (if we can) */ if (semop(semId, &sops, 1) < 0) return -1; @@ -61,8 +66,10 @@ semctl(int semId, int semNum, int flag, union semun semun) /* Fix the count of one semaphore to semun.val */ else if (flag == SETVAL) { - if (semun.val != sem_counts[semNum]) { + if (semun.val != sem_counts[semNum]) + { struct sembuf sops; + sops.sem_flg = IPC_NOWAIT; sops.sem_num = semNum; @@ -70,7 +77,7 @@ semctl(int semId, int semNum, int flag, union semun semun) sops.sem_op = -1; else sops.sem_op = 1; - + /* Quickly lock/unlock the semaphore (if we can) */ if (semop(semId, &sops, 1) < 0) return -1; @@ -82,8 +89,8 @@ semctl(int semId, int semNum, int flag, union semun semun) /* Delete the pool */ else if (flag == IPC_RMID) { - int i; - HANDLE* sem_handles = (HANDLE*)((off_t)the_set + the_set->m_semaphoreHandles); + int i; + HANDLE *sem_handles = (HANDLE *) ((off_t) the_set + the_set->m_semaphoreHandles); /* Loop over all semaphore to delete them */ for (i = 0; i < the_set->m_numSems; ++i) @@ -94,15 +101,11 @@ semctl(int semId, int semNum, int flag, union semun semun) /* Get the current semaphore count */ else if (flag == GETNCNT) - { return the_set->m_numSems; - } /* Get the current semaphore count of the first semaphore in the pool */ else if (flag == GETVAL) - { return sem_counts[semNum]; - } /* Other commands not yet supported */ else @@ -116,17 +119,17 @@ semctl(int semId, int semNum, int flag, union semun semun) int semget(int semKey, int semNum, int flags) { - char semname[32]; - char cur_num[20]; - DWORD last_error; - char* num_part; - bool ans = true; + char semname[32]; + char cur_num[20]; + DWORD last_error; + char *num_part; + bool ans = true; SECURITY_ATTRIBUTES sec_attrs; - HANDLE cur_handle; - bool found = false; - Size sem_set_size = sizeof(win32_sem_set_hdr) + semNum * (sizeof(HANDLE) + sizeof(int)); - HANDLE* sem_handles = NULL; - int* sem_counts = NULL; + HANDLE cur_handle; + bool found = false; + Size sem_set_size = sizeof(win32_sem_set_hdr) + semNum * (sizeof(HANDLE) + sizeof(int)); + HANDLE *sem_handles = NULL; + int *sem_counts = NULL; sec_attrs.nLength = sizeof(sec_attrs); sec_attrs.lpSecurityDescriptor = NULL; @@ -135,23 +138,27 @@ semget(int semKey, int semNum, int flags) sprintf(semname, "PG_SEMSET.%d.", semKey); num_part = semname + strlen(semname); - strcpy(num_part, _itoa(_getpid() * -1, cur_num, 10)); /* For shared memory, include the pid */ - win32_sem_set_hdr* new_set = (win32_sem_set_hdr*)ShmemInitStruct(semname, sem_set_size, &found); + strcpy(num_part, _itoa(_getpid() * -1, cur_num, 10)); /* For shared memory, + * include the pid */ + win32_sem_set_hdr *new_set = (win32_sem_set_hdr *) ShmemInitStruct(semname, sem_set_size, &found); - if (found) { + if (found) + { /* This should *never* happen */ errno = EEXIST; return -1; } new_set->m_numSems = semNum; - new_set->m_semaphoreHandles = sizeof(win32_sem_set_hdr); // array starts after header - new_set->m_semaphoreCounts = new_set->m_semaphoreHandles + (sizeof(HANDLE) * semNum); + new_set->m_semaphoreHandles = sizeof(win32_sem_set_hdr); + //array starts after header + new_set->m_semaphoreCounts = new_set->m_semaphoreHandles + (sizeof(HANDLE) * semNum); - sem_handles = (HANDLE*)((off_t)new_set + new_set->m_semaphoreHandles); - sem_counts = (int*)((off_t)new_set + new_set->m_semaphoreCounts); + sem_handles = (HANDLE *) ((off_t) new_set + new_set->m_semaphoreHandles); + sem_counts = (int *) ((off_t) new_set + new_set->m_semaphoreCounts); - for (int i=0; im_semaphoreHandles); - int* sem_counts = (int*)((off_t)the_set + the_set->m_semaphoreCounts); - HANDLE cur_handle; + win32_sem_set_hdr *the_set = (win32_sem_set_hdr *) MAKE_PTR(semId); + HANDLE *sem_handles = (HANDLE *) ((off_t) the_set + the_set->m_semaphoreHandles); + int *sem_counts = (int *) ((off_t) the_set + the_set->m_semaphoreCounts); + HANDLE cur_handle; - if (nsops != 1) { - /* Not supported (we return on 1st success, and don't cancel earlier ops) */ + if (nsops != 1) + { + /* + * Not supported (we return on 1st success, and don't cancel + * earlier ops) + */ errno = E2BIG; return -1; } @@ -208,23 +221,27 @@ semop(int semId, struct sembuf * sops, int nsops) if (sops[0].sem_op == -1) { - DWORD ret; + DWORD ret; + if (sops[0].sem_flg & IPC_NOWAIT) ret = WaitForSingleObject(cur_handle, 0); else ret = WaitForSingleObject(cur_handle, INFINITE); - if (ret == WAIT_OBJECT_0) { + if (ret == WAIT_OBJECT_0) + { /* We got it! */ sem_counts[sops[0].sem_num]--; return 0; - } else if (ret == WAIT_TIMEOUT) + } + else if (ret == WAIT_TIMEOUT) /* Couldn't get it */ errno = EAGAIN; else errno = EIDRM; } - else if (sops[0].sem_op > 0) { + else if (sops[0].sem_op > 0) + { /* Don't want the lock anymore */ sem_counts[sops[0].sem_num]++; ReleaseSemaphore(cur_handle, sops[0].sem_op, NULL); diff --git a/src/backend/port/win32/shm.c b/src/backend/port/win32/shm.c index 20aaf1f6a4..833f13c4cf 100644 --- a/src/backend/port/win32/shm.c +++ b/src/backend/port/win32/shm.c @@ -28,19 +28,20 @@ shmdt(const void *shmaddr) /* Attach to an existing area */ void * -shmat(int memId, void* shmaddr, int flag) +shmat(int memId, void *shmaddr, int flag) { - /* KEW_TODO -- shmat needs to count # attached to shared mem */ - void *lpmem = MapViewOfFileEx((HANDLE)memId, - FILE_MAP_WRITE | FILE_MAP_READ, - 0, 0, /* (DWORD)pshmdsc->segsize */ s_segsize, shmaddr); + /* TODO -- shmat needs to count # attached to shared mem */ + void *lpmem = MapViewOfFileEx((HANDLE) memId, + FILE_MAP_WRITE | FILE_MAP_READ, + 0, 0, /* (DWORD)pshmdsc->segsize */ s_segsize, shmaddr); - if (lpmem == NULL) { - lpmem = (void *)-1; + if (lpmem == NULL) + { + lpmem = (void *) -1; errno = GetLastError(); } - return lpmem; + return lpmem; } /* Control a shared mem area */ @@ -50,21 +51,24 @@ shmctl(int shmid, int flag, struct shmid_ds * dummy) if (flag == IPC_RMID) { /* Delete the area */ - CloseHandle((HANDLE)shmid); + CloseHandle((HANDLE) shmid); return 0; } if (flag == IPC_STAT) { /* Can only test for if exists */ - int hmap = shmget(shmid, 0, 0); - if (hmap < 0) { + int hmap = shmget(shmid, 0, 0); + + if (hmap < 0) + { /* Shared memory does not exist */ errno = EINVAL; return -1; } - else { + else + { /* Shared memory does exist and must be in use */ - shmctl(hmap, IPC_RMID, NULL); /* Release our hold on it */ + shmctl(hmap, IPC_RMID, NULL); /* Release our hold on it */ errno = 0; return 0; } @@ -78,33 +82,37 @@ shmctl(int shmid, int flag, struct shmid_ds * dummy) int shmget(int memKey, int size, int flag) { - HANDLE hmap; - char szShareMem[32]; - DWORD dwRet; + HANDLE hmap; + char szShareMem[32]; + DWORD dwRet; - s_segsize = size; - sprintf(szShareMem, "sharemem.%d", memKey); + s_segsize = size; + sprintf(szShareMem, "sharemem.%d", memKey); - if (flag & IPC_CREAT) { - hmap = CreateFileMapping((HANDLE)0xFFFFFFFF, /* Use the swap file */ - NULL, - PAGE_READWRITE, /* Memory is Read/Write */ - 0L, /* Size Upper 32 Bits */ - (DWORD)s_segsize, /* Size Lower 32 bits*/ - szShareMem); + if (flag & IPC_CREAT) + { + hmap = CreateFileMapping((HANDLE) 0xFFFFFFFF, /* Use the swap file */ + NULL, + PAGE_READWRITE, /* Memory is Read/Write */ + 0L, /* Size Upper 32 Bits */ + (DWORD) s_segsize, /* Size Lower 32 bits */ + szShareMem); } - else { + else + { hmap = OpenFileMapping(FILE_MAP_ALL_ACCESS, - FALSE, - szShareMem); - if (!hmap) { + FALSE, + szShareMem); + if (!hmap) + { errno = ENOENT; return -1; } } dwRet = GetLastError(); - if (dwRet == ERROR_ALREADY_EXISTS && hmap && (flag & (IPC_CREAT | IPC_EXCL))) { + if (dwRet == ERROR_ALREADY_EXISTS && hmap && (flag & (IPC_CREAT | IPC_EXCL))) + { /* Caller wanted to create the segment -- error if already exists */ CloseHandle(hmap); errno = EEXIST; @@ -116,5 +124,5 @@ shmget(int memKey, int size, int flag) return -1; } - return (int)hmap; + return (int) hmap; }