epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
Jeff Hill
1997-05-01 20:43:12 +00:00
parent 5bf13da02c
commit c99ee0317c
4 changed files with 22 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/libCom/dbmf.c
View File

@@ -41,11 +41,6 @@ typedef struct itemHeader{
chunkNode *pchunkNode;
}itemHeader;
<<<<<<< dbmf.c
/* returns handle to user */
epicsShareFunc void* epicsShareAPI
dbmfInit(size_t size, size_t alignment, int init_num_free_list_items)
=======
typedef struct dbmfPrivate {
ELLLIST chunkList;
SEM_ID sem;
@@ -62,8 +57,7 @@ dbmfPrivate dbmfPvt;
static dbmfPrivate *pdbmfPvt = NULL;
int dbmfDebug=0;
int dbmfInit(size_t size, int chunkItems)
>>>>>>> 1.3
int epicsShareAPI dbmfInit(size_t size, int chunkItems)
{
if(pdbmfPvt) {
printf("dbmfInit: Already initialized\n");
@@ -83,14 +77,9 @@ int dbmfInit(size_t size, int chunkItems)
pdbmfPvt->freeList = NULL;
return(0);
}
<<<<<<< dbmf.c
epicsShareFunc void* epicsShareAPI
dbmfMalloc(void* handle,size_t x)
=======
void* dbmfMalloc(size_t size)
>>>>>>> 1.3
void* epicsShareAPI dbmfMalloc(size_t size)
{
void **pnextFree;
void **pfreeList;
@@ -142,14 +131,9 @@ void* dbmfMalloc(size_t size)
semGive(pdbmfPvt->sem);
return((void *)(pmem + sizeof(itemHeader)));
}
<<<<<<< dbmf.c
epicsShareFunc void epicsShareAPI
dbmfFree(void* handle,void* x)
=======
void dbmfFree(void* mem)
>>>>>>> 1.3
void epicsShareAPI dbmfFree(void* mem)
{
char *pmem = (char *)mem;
chunkNode *pchunkNode;
@@ -178,7 +162,7 @@ void dbmfFree(void* mem)
semGive(pdbmfPvt->sem);
}
int dbmfShow(int level)
int epicsShareAPI dbmfShow(int level)
{
if(pdbmfPvt==NULL) {
printf("Never initialized\n");
@@ -213,7 +197,7 @@ int dbmfShow(int level)
return(0);
}
void dbmfFreeChunks(void)
void epicsShareAPI dbmfFreeChunks(void)
{
chunkNode *pchunkNode;
chunkNode *pnext;;

17
src/libCom/dbmf.h
View File

@@ -7,18 +7,14 @@
#ifndef DBMF_H
#define DBMF_H
int dbmfInit(size_t size, int chunkItems);
void *dbmfMalloc(size_t bytes);
void dbmfFree(void* bytes);
void dbmfFreeChunks(void);
int dbmfShow(int level);
#include "shareLib.h"
<<<<<<< dbmf.h
epicsShareFunc void* epicsShareAPI dbmfInit(size_t size, size_t alignment, int init_num_free_list_items);
epicsShareFunc void* epicsShareAPI dbmfMalloc(void* handle,size_t bytes);
epicsShareFunc void epicsShareAPI dbmfFree(void* handle,void* bytes);
=======
epicsShareFunc int epicsShareAPI dbmfInit(size_t size, int chunkItems);
epicsShareFunc void * epicsShareAPI dbmfMalloc(size_t bytes);
epicsShareFunc void epicsShareAPI dbmfFree(void* bytes);
epicsShareFunc void epicsShareAPI dbmfFreeChunks(void);
epicsShareFunc int epicsShareAPI dbmfShow(int level);
/* Rules:
* 1) Size is always made a multiple of 8.
* 2) if dbmfInit is not called before one of the other routines then it
@@ -27,6 +23,5 @@ epicsShareFunc void epicsShareAPI dbmfFree(void* handle,void* bytes);
* shortly thereafter be freed.
* 4) dbmfFreeChunks can only free chunks that contain only free items
*/
>>>>>>> 1.3
#endif

26
src/libCom/dbmf/dbmf.c
View File

@@ -41,11 +41,6 @@ typedef struct itemHeader{
chunkNode *pchunkNode;
}itemHeader;
<<<<<<< dbmf.c
/* returns handle to user */
epicsShareFunc void* epicsShareAPI
dbmfInit(size_t size, size_t alignment, int init_num_free_list_items)
=======
typedef struct dbmfPrivate {
ELLLIST chunkList;
SEM_ID sem;
@@ -62,8 +57,7 @@ dbmfPrivate dbmfPvt;
static dbmfPrivate *pdbmfPvt = NULL;
int dbmfDebug=0;
int dbmfInit(size_t size, int chunkItems)
>>>>>>> 1.3
int epicsShareAPI dbmfInit(size_t size, int chunkItems)
{
if(pdbmfPvt) {
printf("dbmfInit: Already initialized\n");
@@ -83,14 +77,9 @@ int dbmfInit(size_t size, int chunkItems)
pdbmfPvt->freeList = NULL;
return(0);
}
<<<<<<< dbmf.c
epicsShareFunc void* epicsShareAPI
dbmfMalloc(void* handle,size_t x)
=======
void* dbmfMalloc(size_t size)
>>>>>>> 1.3
void* epicsShareAPI dbmfMalloc(size_t size)
{
void **pnextFree;
void **pfreeList;
@@ -142,14 +131,9 @@ void* dbmfMalloc(size_t size)
semGive(pdbmfPvt->sem);
return((void *)(pmem + sizeof(itemHeader)));
}
<<<<<<< dbmf.c
epicsShareFunc void epicsShareAPI
dbmfFree(void* handle,void* x)
=======
void dbmfFree(void* mem)
>>>>>>> 1.3
void epicsShareAPI dbmfFree(void* mem)
{
char *pmem = (char *)mem;
chunkNode *pchunkNode;
@@ -178,7 +162,7 @@ void dbmfFree(void* mem)
semGive(pdbmfPvt->sem);
}
int dbmfShow(int level)
int epicsShareAPI dbmfShow(int level)
{
if(pdbmfPvt==NULL) {
printf("Never initialized\n");
@@ -213,7 +197,7 @@ int dbmfShow(int level)
return(0);
}
void dbmfFreeChunks(void)
void epicsShareAPI dbmfFreeChunks(void)
{
chunkNode *pchunkNode;
chunkNode *pnext;;

17
src/libCom/dbmf/dbmf.h
View File

@@ -7,18 +7,14 @@
#ifndef DBMF_H
#define DBMF_H
int dbmfInit(size_t size, int chunkItems);
void *dbmfMalloc(size_t bytes);
void dbmfFree(void* bytes);
void dbmfFreeChunks(void);
int dbmfShow(int level);
#include "shareLib.h"
<<<<<<< dbmf.h
epicsShareFunc void* epicsShareAPI dbmfInit(size_t size, size_t alignment, int init_num_free_list_items);
epicsShareFunc void* epicsShareAPI dbmfMalloc(void* handle,size_t bytes);
epicsShareFunc void epicsShareAPI dbmfFree(void* handle,void* bytes);
=======
epicsShareFunc int epicsShareAPI dbmfInit(size_t size, int chunkItems);
epicsShareFunc void * epicsShareAPI dbmfMalloc(size_t bytes);
epicsShareFunc void epicsShareAPI dbmfFree(void* bytes);
epicsShareFunc void epicsShareAPI dbmfFreeChunks(void);
epicsShareFunc int epicsShareAPI dbmfShow(int level);
/* Rules:
* 1) Size is always made a multiple of 8.
* 2) if dbmfInit is not called before one of the other routines then it
@@ -27,6 +23,5 @@ epicsShareFunc void epicsShareAPI dbmfFree(void* handle,void* bytes);
* shortly thereafter be freed.
* 4) dbmfFreeChunks can only free chunks that contain only free items
*/
>>>>>>> 1.3
#endif