Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Slurm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tud-zih-energy
Slurm
Commits
ac81c2d7
Commit
ac81c2d7
authored
20 years ago
by
phung4
Browse files
Options
Downloads
Patches
Plain Diff
removed memory leaks and segfaults, sys undo should work
parent
327c5068
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/partition_allocator/partition_allocator.c
+35
-29
35 additions, 29 deletions
src/partition_allocator/partition_allocator.c
with
35 additions
and
29 deletions
src/partition_allocator/partition_allocator.c
+
35
−
29
View file @
ac81c2d7
...
@@ -141,6 +141,8 @@ int _tokenize_port_conf_list(char* source, char* delimiter,
...
@@ -141,6 +141,8 @@ int _tokenize_port_conf_list(char* source, char* delimiter,
char
*
separator
,
List
port_conf_list
);
char
*
separator
,
List
port_conf_list
);
int
_tokenize_port_conf
(
char
*
source
,
char
*
delimiter
,
int
_tokenize_port_conf
(
char
*
source
,
char
*
delimiter
,
List
port_conf_list
);
List
port_conf_list
);
/** */
void
_reset_pa_system
();
/** */
/** */
void
_new_pa_node
(
pa_node_t
*
pa_node
,
int
*
coord
)
void
_new_pa_node
(
pa_node_t
*
pa_node
,
int
*
coord
)
...
@@ -254,11 +256,9 @@ void _print_pa_system(pa_system_t pa_system)
...
@@ -254,11 +256,9 @@ void _print_pa_system(pa_system_t pa_system)
void
_delete_pa_system
(
void
*
object
)
void
_delete_pa_system
(
void
*
object
)
{
{
int
x
,
y
,
z
;
int
x
,
y
,
z
;
pa_system_t
*
pa_system
=
(
pa_system_t
*
)
object
;
// pa_system_t* pa_system = (pa_system_t*) object;
pa_system_t
pa_system
=
(
pa_system_t
)
object
;
// 999
return
;
if
(
!
pa_system
){
if
(
!
pa_system
){
return
;
return
;
}
}
...
@@ -267,13 +267,17 @@ void _delete_pa_system(void* object)
...
@@ -267,13 +267,17 @@ void _delete_pa_system(void* object)
for
(
y
=
0
;
y
<
DIM_SIZE
[
Y
];
y
++
){
for
(
y
=
0
;
y
<
DIM_SIZE
[
Y
];
y
++
){
for
(
z
=
0
;
z
<
DIM_SIZE
[
Z
];
z
++
){
for
(
z
=
0
;
z
<
DIM_SIZE
[
Z
];
z
++
){
// 999: memory leak!!!
// 999: memory leak!!!
_delete_pa_node
(
&
((
*
pa_system
)[
x
][
y
][
z
]));
// _delete_pa_node(&((*pa_system)[x][y][z]));
_delete_pa_node
(
&
(
pa_system
[
x
][
y
][
z
]));
}
}
xfree
((
*
pa_system
)[
x
][
y
]);
// xfree((*pa_system)[x][y]);
xfree
(
pa_system
[
x
][
y
]);
}
}
xfree
((
*
pa_system
)[
x
]);
// xfree((*pa_system)[x]);
xfree
(
pa_system
[
x
]);
}
}
xfree
(
*
pa_system
);
// xfree(*pa_system);
xfree
(
pa_system
);
}
}
/* */
/* */
...
@@ -306,7 +310,7 @@ void _backup_pa_system()
...
@@ -306,7 +310,7 @@ void _backup_pa_system()
pa_system_t
new_system
;
pa_system_t
new_system
;
// new_system = (pa_system_t*) xmalloc(sizeof(pa_system_t));
// new_system = (pa_system_t*) xmalloc(sizeof(pa_system_t));
list_push
(
_pa_system_list
,
&
_pa_system
);
list_push
(
_pa_system_list
,
_pa_system
);
_copy_pa_system
(
_pa_system
,
&
new_system
);
_copy_pa_system
(
_pa_system
,
&
new_system
);
_pa_system
=
new_system
;
_pa_system
=
new_system
;
...
@@ -1115,6 +1119,19 @@ int _cmpf_int(int* A, int* B)
...
@@ -1115,6 +1119,19 @@ int _cmpf_int(int* A, int* B)
return
1
;
return
1
;
}
}
/** */
void
_reset_pa_system
()
{
pa_system_t
*
pa_system
=
NULL
;
while
((
pa_system
=
(
pa_system_t
*
)
list_pop
(
_pa_system_list
))){
;
}
/* after that's done, we should be left with the top
* of the stack which was the original pa_system */
_pa_system
=
*
pa_system
;
}
/**
/**
* create a partition request. Note that if the geometry is given,
* create a partition request. Note that if the geometry is given,
* then size is ignored.
* then size is ignored.
...
@@ -1231,7 +1248,7 @@ void pa_init()
...
@@ -1231,7 +1248,7 @@ void pa_init()
{
{
int
i
;
int
i
;
List
switch_config_list
;
List
switch_config_list
;
pa_system_t
*
pa_system
=
NULL
;
#ifdef DEBUG_PA
#ifdef DEBUG_PA
printf
(
"pa_init()
\n
"
);
printf
(
"pa_init()
\n
"
);
...
@@ -1239,16 +1256,10 @@ void pa_init()
...
@@ -1239,16 +1256,10 @@ void pa_init()
/* if we've initialized, just pop off all the old crusty
/* if we've initialized, just pop off all the old crusty
* pa_systems */
* pa_systems */
if
(
_initialized
){
if
(
_initialized
){
while
((
pa_system
=
(
pa_system_t
*
)
list_pop
(
_pa_system_list
))){
_reset_pa_system
();
;
}
/* after that's done, we should be left with the top
* of the stack which was the original pa_system */
_pa_system
=
*
pa_system
;
return
;
return
;
}
}
char
**
filenames
=
(
char
**
)
xmalloc
(
sizeof
(
char
*
)
*
PA_SYSTEM_DIMENSIONS
);
char
**
filenames
=
(
char
**
)
xmalloc
(
sizeof
(
char
*
)
*
PA_SYSTEM_DIMENSIONS
);
_conf_result_list
=
(
List
*
)
xmalloc
(
sizeof
(
List
)
*
PA_SYSTEM_DIMENSIONS
);
_conf_result_list
=
(
List
*
)
xmalloc
(
sizeof
(
List
)
*
PA_SYSTEM_DIMENSIONS
);
...
@@ -1256,7 +1267,7 @@ void pa_init()
...
@@ -1256,7 +1267,7 @@ void pa_init()
_conf_result_list
[
i
]
=
list_create
(
delete_conf_result
);
_conf_result_list
[
i
]
=
list_create
(
delete_conf_result
);
}
}
/* see if we
need to
load in the filenames from the env */
/* see if we
can
load in the filenames from the env */
filenames
[
X
]
=
getenv
(
"X_DIM_CONF"
);
filenames
[
X
]
=
getenv
(
"X_DIM_CONF"
);
filenames
[
Y
]
=
getenv
(
"Y_DIM_CONF"
);
filenames
[
Y
]
=
getenv
(
"Y_DIM_CONF"
);
filenames
[
Z
]
=
getenv
(
"Z_DIM_CONF"
);
filenames
[
Z
]
=
getenv
(
"Z_DIM_CONF"
);
...
@@ -1273,7 +1284,6 @@ void pa_init()
...
@@ -1273,7 +1284,6 @@ void pa_init()
}
}
list_destroy
(
switch_config_list
);
list_destroy
(
switch_config_list
);
}
}
// 999
// 999
// exit(0);
// exit(0);
...
@@ -1317,9 +1327,8 @@ void pa_init()
...
@@ -1317,9 +1327,8 @@ void pa_init()
*/
*/
void
pa_fini
()
void
pa_fini
()
{
{
ListIterator
itr
;
int
i
;
int
i
;
pa_system_t
*
pa_system
;
#ifdef DEBUG_PA
#ifdef DEBUG_PA
printf
(
"pa_fini()
\n
"
);
printf
(
"pa_fini()
\n
"
);
#endif
#endif
...
@@ -1328,12 +1337,9 @@ void pa_fini()
...
@@ -1328,12 +1337,9 @@ void pa_fini()
}
}
xfree
(
_conf_result_list
);
xfree
(
_conf_result_list
);
itr
=
list_iterator_create
(
_pa_system_list
);
list_destroy
(
_pa_system_list
);
while
((
pa_system
=
(
pa_system_t
*
)
list_next
(
itr
))){
_delete_pa_system
(
_pa_system
);
_delete_pa_system
(
pa_system
);
}
list_iterator_destroy
(
itr
);
printf
(
"pa system destroyed
\n
"
);
printf
(
"pa system destroyed
\n
"
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment