Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
some memory leak remaining
  • Loading branch information
Aapo Kyrola committed Aug 14, 2013
commit 83f83e9f8910ef2350d6912d51f80c510e900119
7 changes: 5 additions & 2 deletions src/preprocessing/dynamicdata/sharder.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ namespace graphchi {
return (dst < x2.dst);
}

// TODO: use buffered I/O
void reade(int f) {
read(f, &src, sizeof(vid_t));
read(f, &dst, sizeof(vid_t));
Expand Down Expand Up @@ -191,13 +192,14 @@ namespace graphchi {
size_t bufidx;
std::vector<edge_with_value<VectorElementType, HeaderDataType> > buffer;
int f;
size_t edgesread;
size_t numedges;
size_t bufsize_edges;

shovel_merge_source(size_t bufsize_bytes, std::string shovelfile) : bufsize_bytes(bufsize_bytes),
shovelfile(shovelfile), idx(0), bufidx(0) {
f = open(shovelfile.c_str(), O_RDONLY);

edgesread = 0;
if (f < 0) {
logstream(LOG_ERROR) << "Could not open shovel file: " << shovelfile << std::endl;
printf("Error: %d, %s\n", errno, strerror(errno));
Expand All @@ -221,11 +223,12 @@ namespace graphchi {
void load_next() {
size_t nread = 0;
buffer.clear();
while(nread < bufsize_bytes) {
while(nread < bufsize_bytes && edgesread < numedges) {
edge_with_value<VectorElementType, HeaderDataType> edge;
edge.reade(f);
buffer.push_back(edge);
nread += sizeof(vid_t) * 2 + sizeof(uint16_t) + sizeof(HeaderDataType) + edge.value.size() * sizeof(VectorElementType);
edgesread++;
}
bufidx = 0;
}
Expand Down
4 changes: 2 additions & 2 deletions src/tests/test_dynamicedata_loader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ int generatedata(std::string filename) {
std::cout << "Generating data..." << std::endl;

shouldbe = 0;
int totalVertices = 200000; // 2 million
int totalVertices = 1000;
for(int i=0; i < totalVertices; i++) {
int nedges = random() % 50;
int nedges = random() % 10;
for(int j=0; j < nedges; j++) {
int dst = (totalVertices / nedges) * j + i % nedges;
if (dst != i) {
Expand Down