Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
bake
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
7
Issues
7
List
Boards
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sds
bake
Commits
081a52d7
Commit
081a52d7
authored
Dec 08, 2017
by
Shane Snyder
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor & cleanup bake server api
parent
555b7d7a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
93 additions
and
62 deletions
+93
-62
include/bake-bulk-server.h
include/bake-bulk-server.h
+18
-25
src/bake-bulk-server-daemon.c
src/bake-bulk-server-daemon.c
+9
-6
src/bake-bulk-server.c
src/bake-bulk-server.c
+66
-31
No files found.
include/bake-bulk-server.h
View file @
081a52d7
...
...
@@ -15,38 +15,31 @@
extern
"C"
{
#endif
struct
bake_bulk_root
{
bake_target_id_t
target_id
;
};
struct
bake_pool_info
{
PMEMobjpool
*
bb_pmem_pool
;
struct
bake_bulk_root
*
bb_pmem_root
;
};
/**
* Register a bake server instance for a given Margo instance.
* Creates a bake-bulk pool to use for backend PMEM storage.
* NOTE: this function must be called on a pool before the pool
* can be passed to 'bake_server_init'
*
* @param[in] mid Margo instance identifier
* @param[in] bb_pmem_pool libpmem pool to use for the bake storage service
* @param[in] bb_pmem_root libpmem root for the bake pool
* @param[in] pool_name path to pmem backend file
* @param[in] pool_size size of the created pool
* @param[in] pool_mode mode of the created pool
* @returns 0 on success, -1 otherwise
*/
void
bake_server_register
(
margo_instance_id
mid
,
struct
bake_pool_info
*
pool_info
);
int
bake_server_makepool
(
const
char
*
pool_name
,
size_t
pool_size
,
mode_t
pool_mode
);
/**
* Convienence function to set up a PMEM backend.
*
* @param[in] poolname path to pmem backend file
* Register a bake server instance for a given Margo instance.
*
* returns a pointer to an initialized `struct bake_pool_info` on sucess,
* NULL if anything goes wrong
* @param[in] mid Margo instance identifier
* @param[in] pool_name path to pmem backend file
* @returns 0 on success, -1 otherwise
*/
struct
bake_pool_info
*
bake_server_makepool
(
const
char
*
poolname
);
int
bake_server_init
(
margo_instance_id
mid
,
const
char
*
pool_name
);
#ifdef __cplusplus
}
...
...
src/bake-bulk-server-daemon.c
View file @
081a52d7
...
...
@@ -7,7 +7,6 @@
#include <stdio.h>
#include <assert.h>
#include <unistd.h>
#include <uuid/uuid.h>
#include <margo.h>
#include <libpmemobj.h>
#include <bake-bulk-server.h>
...
...
@@ -64,13 +63,11 @@ static void parse_args(int argc, char **argv, struct options *opts)
int
main
(
int
argc
,
char
**
argv
)
{
struct
options
opts
;
struct
bake_pool_info
*
pool_info
;
margo_instance_id
mid
;
int
ret
;
parse_args
(
argc
,
argv
,
&
opts
);
pool_info
=
bake_server_makepool
(
opts
.
pmem_pool
);
/* start margo */
/* use the main xstream for driving progress and executing rpc handlers */
mid
=
margo_init
(
opts
.
listen_addr
,
MARGO_SERVER_MODE
,
0
,
-
1
);
...
...
@@ -120,7 +117,13 @@ int main(int argc, char **argv)
}
/* register the bake bulk server */
bake_server_register
(
mid
,
pool_info
);
ret
=
bake_server_init
(
mid
,
opts
.
pmem_pool
);
if
(
ret
!=
0
)
{
fprintf
(
stderr
,
"Error: bake_server_init()
\n
"
);
margo_finalize
(
mid
);
return
(
-
1
);
}
/* NOTE: at this point this server ULT has two options. It can wait on
* whatever mechanism it wants to (however long the daemon should run and
...
...
@@ -138,7 +141,7 @@ int main(int argc, char **argv)
*/
margo_wait_for_finalize
(
mid
);
pmemobj_close
(
pool_info
->
bb_pmem_pool
);
/* XXX pmemobj_close(pool_info->bb_pmem_pool); */
return
(
0
);
}
...
...
src/bake-bulk-server.c
View file @
081a52d7
...
...
@@ -5,10 +5,16 @@
*/
#include <assert.h>
#include <bake-bulk-server.h>
#include <libpmemobj.h>
#include <bake-bulk-server.h>
#include "bake-bulk-rpc.h"
/* definition of bake root data structure (just a target_id for now) */
typedef
struct
bake_bulk_root
{
bake_target_id_t
target_id
;
}
bake_bulk_root_t
;
/* definition of internal region_id_t identifier for libpmemobj back end */
typedef
struct
{
PMEMoid
oid
;
...
...
@@ -19,45 +25,76 @@ typedef struct {
* to multiple targets
*/
static
PMEMobjpool
*
g_pmem_pool
=
NULL
;
static
struct
bake_bulk_roo
t
*
g_pmem_root
=
NULL
;
static
bake_bulk_root_
t
*
g_pmem_root
=
NULL
;
struct
bake_pool_info
*
bake_server_makepool
(
const
char
*
poolname
)
int
bake_server_makepool
(
const
char
*
pool_name
,
size_t
pool_size
,
mode_t
pool_mode
)
{
PMEMobjpool
*
pool
;
PMEMoid
root_oid
;
bake_bulk_root_t
*
root
;
char
target_string
[
64
];
struct
bake_pool_info
*
pool_info
;
pool_info
=
malloc
(
sizeof
(
*
pool_info
));
/* open pmem pool */
pool_info
->
bb_pmem_pool
=
pmemobj_open
(
poolname
,
NULL
);
if
(
!
pool_info
->
bb_pmem_pool
)
pool
=
pmemobj_create
(
pool_name
,
NULL
,
pool_size
,
pool_mode
);
if
(
!
pool
)
{
fprintf
(
stderr
,
"pmemobj_
open
: %s
\n
"
,
pmemobj_errormsg
());
return
(
NULL
);
fprintf
(
stderr
,
"pmemobj_
create
: %s
\n
"
,
pmemobj_errormsg
());
return
(
-
1
);
}
/* find root */
root_oid
=
pmemobj_root
(
pool_info
->
bb_pmem_pool
,
sizeof
(
*
(
pool_info
->
bb_pmem_root
))
);
pool_info
->
bb_pmem_root
=
pmemobj_direct
(
root_oid
);
if
(
uuid_is_null
(
pool_info
->
bb_pmem_root
->
target_id
.
id
))
root_oid
=
pmemobj_root
(
pool
,
sizeof
(
bake_bulk_root_t
));
root
=
pmemobj_direct
(
root_oid
);
/* store the target id for this bake pool at the root */
uuid_generate
(
root
->
target_id
.
id
);
pmemobj_persist
(
pool
,
root
,
sizeof
(
bake_bulk_root_t
));
uuid_unparse
(
root
->
target_id
.
id
,
target_string
);
fprintf
(
stderr
,
"created BAKE target ID: %s
\n
"
,
target_string
);
pmemobj_close
(
pool
);
return
(
0
);
}
int
bake_server_init
(
margo_instance_id
mid
,
const
char
*
pool_name
)
{
PMEMobjpool
*
pool
;
PMEMoid
root_oid
;
bake_bulk_root_t
*
root
;
char
target_string
[
64
];
/* make sure to initialize the server only once */
if
(
g_pmem_pool
||
g_pmem_root
)
{
uuid_generate
(
pool_info
->
bb_pmem_root
->
target_id
.
id
);
pmemobj_persist
(
pool_info
->
bb_pmem_pool
,
pool_info
->
bb_pmem_root
,
sizeof
(
*
(
pool_info
->
bb_pmem_root
))
);
fprintf
(
stderr
,
"Error: bake-bulk server already initialized
\n
"
);
return
(
-
1
);
}
uuid_unparse
(
pool_info
->
bb_pmem_root
->
target_id
.
id
,
target_string
);
fprintf
(
stderr
,
"BAKE target ID: %s
\n
"
,
target_string
);
return
pool_info
;
}
/* open the given pmem pool */
pool
=
pmemobj_open
(
pool_name
,
NULL
);
if
(
!
pool
)
{
fprintf
(
stderr
,
"pmemobj_open: %s
\n
"
,
pmemobj_errormsg
());
return
(
-
1
);
}
/* check to make sure the root is properly set */
root_oid
=
pmemobj_root
(
pool
,
sizeof
(
bake_bulk_root_t
));
root
=
pmemobj_direct
(
root_oid
);
if
(
uuid_is_null
(
root
->
target_id
.
id
))
{
fprintf
(
stderr
,
"Error: bake-bulk pool is not properly initialized
\n
"
);
pmemobj_close
(
pool
);
return
(
-
1
);
}
uuid_unparse
(
root
->
target_id
.
id
,
target_string
);
fprintf
(
stderr
,
"opened BAKE target ID: %s
\n
"
,
target_string
);
void
bake_server_register
(
margo_instance_id
mid
,
struct
bake_pool_info
*
pool_info
)
{
/* register RPCs */
MARGO_REGISTER
(
mid
,
"bake_bulk_shutdown_rpc"
,
void
,
void
,
bake_bulk_shutdown_ult
);
...
...
@@ -90,10 +127,10 @@ void bake_server_register(margo_instance_id mid,
bake_bulk_noop_ult
);
/* set global pmem variables needed by the bake server */
g_pmem_pool
=
pool
_info
->
bb_pmem_pool
;
g_pmem_root
=
pool_info
->
bb_pmem_
root
;
g_pmem_pool
=
pool
;
g_pmem_root
=
root
;
return
;
return
(
0
)
;
}
/* service a remote RPC that instructs the server daemon to shut down */
...
...
@@ -102,8 +139,6 @@ static void bake_bulk_shutdown_ult(hg_handle_t handle)
hg_return_t
hret
;
margo_instance_id
mid
;
// printf("Got RPC request to shutdown.\n");
mid
=
margo_hg_handle_get_instance
(
handle
);
hret
=
margo_respond
(
handle
,
NULL
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment