Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
68f31e94
Commit
68f31e94
authored
Jun 28, 2013
by
fleuria
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor mrb_realloc()
remove the redundant codes with mrb_malloc_simple()
parent
b44309b4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
10 deletions
+14
-10
include/mruby.h
include/mruby.h
+1
-0
src/gc.c
src/gc.c
+13
-10
No files found.
include/mruby.h
View file @
68f31e94
...
@@ -242,6 +242,7 @@ mrb_sym mrb_intern(mrb_state *mrb,const char *cstr)
...
@@ -242,6 +242,7 @@ mrb_sym mrb_intern(mrb_state *mrb,const char *cstr)
void
*
mrb_malloc
(
mrb_state
*
,
size_t
);
/* raise RuntimeError if no mem */
void
*
mrb_malloc
(
mrb_state
*
,
size_t
);
/* raise RuntimeError if no mem */
void
*
mrb_calloc
(
mrb_state
*
,
size_t
,
size_t
);
/* ditto */
void
*
mrb_calloc
(
mrb_state
*
,
size_t
,
size_t
);
/* ditto */
void
*
mrb_realloc
(
mrb_state
*
,
void
*
,
size_t
);
/* ditto */
void
*
mrb_realloc
(
mrb_state
*
,
void
*
,
size_t
);
/* ditto */
void
*
mrb_realloc_simple
(
mrb_state
*
,
void
*
,
size_t
);
/* return NULL if no memory available */
void
*
mrb_malloc_simple
(
mrb_state
*
,
size_t
);
/* return NULL if no memory available */
void
*
mrb_malloc_simple
(
mrb_state
*
,
size_t
);
/* return NULL if no memory available */
struct
RBasic
*
mrb_obj_alloc
(
mrb_state
*
,
enum
mrb_vtype
,
struct
RClass
*
);
struct
RBasic
*
mrb_obj_alloc
(
mrb_state
*
,
enum
mrb_vtype
,
struct
RClass
*
);
void
mrb_free
(
mrb_state
*
,
void
*
);
void
mrb_free
(
mrb_state
*
,
void
*
);
...
...
src/gc.c
View file @
68f31e94
...
@@ -148,18 +148,28 @@ gettimeofday_time(void)
...
@@ -148,18 +148,28 @@ gettimeofday_time(void)
#define GC_STEP_SIZE 1024
#define GC_STEP_SIZE 1024
void
*
void
*
mrb_realloc
(
mrb_state
*
mrb
,
void
*
p
,
size_t
len
)
mrb_realloc
_simple
(
mrb_state
*
mrb
,
void
*
p
,
size_t
len
)
{
{
void
*
p2
;
void
*
p2
;
p2
=
(
mrb
->
allocf
)(
mrb
,
p
,
len
,
mrb
->
ud
);
p2
=
(
mrb
->
allocf
)(
mrb
,
p
,
len
,
mrb
->
ud
);
if
(
!
p2
&&
len
>
0
&&
mrb
->
heaps
)
{
if
(
!
p2
&&
len
>
0
&&
mrb
->
heaps
)
{
mrb_garbage_collect
(
mrb
);
mrb_garbage_collect
(
mrb
);
p2
=
(
mrb
->
allocf
)(
mrb
,
p
,
len
,
mrb
->
ud
);
p2
=
(
mrb
->
allocf
)(
mrb
,
p
,
len
,
mrb
->
ud
);
}
}
return
p2
;
}
void
*
mrb_realloc
(
mrb_state
*
mrb
,
void
*
p
,
size_t
len
)
{
void
*
p2
;
p2
=
mrb_realloc_simple
(
mrb
,
p
,
len
);
if
(
!
p2
&&
len
)
{
if
(
!
p2
&&
len
)
{
if
(
mrb
->
out_of_memory
)
{
if
(
mrb
->
out_of_memory
)
{
/* mrb_panic(mrb); */
/* mrb_panic(mrb); */
...
@@ -185,14 +195,7 @@ mrb_malloc(mrb_state *mrb, size_t len)
...
@@ -185,14 +195,7 @@ mrb_malloc(mrb_state *mrb, size_t len)
void
*
void
*
mrb_malloc_simple
(
mrb_state
*
mrb
,
size_t
len
)
mrb_malloc_simple
(
mrb_state
*
mrb
,
size_t
len
)
{
{
void
*
p2
;
return
mrb_realloc_simple
(
mrb
,
0
,
len
);
p2
=
(
mrb
->
allocf
)(
mrb
,
0
,
len
,
mrb
->
ud
);
if
(
!
p2
&&
len
>
0
&&
mrb
->
heaps
)
{
mrb_garbage_collect
(
mrb
);
p2
=
(
mrb
->
allocf
)(
mrb
,
0
,
len
,
mrb
->
ud
);
}
return
p2
;
}
}
void
*
void
*
...
...
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