projects
/
bluesky.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve tracking of memory usage in BlueSky.
[bluesky.git]
/
nfs3
/
nfs3.c
diff --git
a/nfs3/nfs3.c
b/nfs3/nfs3.c
index
f7e7b4e
..
2a5b789
100644
(file)
--- a/
nfs3/nfs3.c
+++ b/
nfs3/nfs3.c
@@
-208,6
+208,8
@@
void nfsproc3_setattr_3_svc(setattr3args *argp, RPCRequest *req)
inode);
result.status = NFS3_OK;
inode);
result.status = NFS3_OK;
+ bluesky_inode_do_sync(inode);
+
g_mutex_unlock(inode->lock);
async_rpc_send_reply(req, &result);
}
g_mutex_unlock(inode->lock);
async_rpc_send_reply(req, &result);
}
@@
-428,6
+430,7
@@
void nfsproc3_write_3_svc(write3args *argp, RPCRequest *req)
result.write3res_u.resok.count = argp->count;
result.write3res_u.resok.committed = FILE_SYNC;
result.write3res_u.resok.count = argp->count;
result.write3res_u.resok.committed = FILE_SYNC;
+ bluesky_inode_do_sync(inode);
g_mutex_unlock(inode->lock);
async_rpc_send_reply(req, &result);
g_mutex_unlock(inode->lock);
async_rpc_send_reply(req, &result);
@@
-470,18
+473,19
@@
void nfsproc3_create_3_svc(create3args *argp, RPCRequest *req)
return;
}
return;
}
+ g_mutex_lock(fs->lock);
BlueSkyInode *file;
file = bluesky_new_inode(bluesky_fs_alloc_inode(fs), fs, BLUESKY_REGULAR);
file->nlink = 1;
file->mode = 0755;
int64_t time = bluesky_get_current_time();
BlueSkyInode *file;
file = bluesky_new_inode(bluesky_fs_alloc_inode(fs), fs, BLUESKY_REGULAR);
file->nlink = 1;
file->mode = 0755;
int64_t time = bluesky_get_current_time();
- printf("time: %"PRIi64"\n", time);
file->mtime = time;
file->ctime = time;
file->atime = time;
file->ntime = time;
g_mutex_lock(file->lock);
bluesky_insert_inode(fs, file);
file->mtime = time;
file->ctime = time;
file->atime = time;
file->ntime = time;
g_mutex_lock(file->lock);
bluesky_insert_inode(fs, file);
+ g_mutex_unlock(fs->lock);
bluesky_directory_insert(dir, argp->where.name, file->inum);
bluesky_inode_update_ctime(dir, TRUE);
bluesky_directory_insert(dir, argp->where.name, file->inum);
bluesky_inode_update_ctime(dir, TRUE);
@@
-498,6
+502,8
@@
void nfsproc3_create_3_svc(create3args *argp, RPCRequest *req)
result.diropres3_u.resok.obj.post_op_fh3_u.handle.data.data_len = 8;
result.diropres3_u.resok.obj.post_op_fh3_u.handle.data.data_val = (char *)&fh_bytes;
result.diropres3_u.resok.obj.post_op_fh3_u.handle.data.data_len = 8;
result.diropres3_u.resok.obj.post_op_fh3_u.handle.data.data_val = (char *)&fh_bytes;
+ bluesky_inode_do_sync(file);
+ bluesky_inode_do_sync(dir);
g_mutex_unlock(file->lock);
g_mutex_unlock(dir->lock);
g_mutex_unlock(file->lock);
g_mutex_unlock(dir->lock);
@@
-541,6
+547,7
@@
void nfsproc3_mkdir_3_svc(mkdir3args *argp, RPCRequest *req)
return;
}
return;
}
+ g_mutex_lock(fs->lock);
BlueSkyInode *file;
file = bluesky_new_inode(bluesky_fs_alloc_inode(fs), fs, BLUESKY_DIRECTORY);
file->nlink = 1;
BlueSkyInode *file;
file = bluesky_new_inode(bluesky_fs_alloc_inode(fs), fs, BLUESKY_DIRECTORY);
file->nlink = 1;
@@
-552,6
+559,7
@@
void nfsproc3_mkdir_3_svc(mkdir3args *argp, RPCRequest *req)
file->ntime = time;
g_mutex_lock(file->lock);
bluesky_insert_inode(fs, file);
file->ntime = time;
g_mutex_lock(file->lock);
bluesky_insert_inode(fs, file);
+ g_mutex_unlock(fs->lock);
bluesky_directory_insert(dir, argp->where.name, file->inum);
set_attributes(file, &argp->attributes);
bluesky_directory_insert(dir, argp->where.name, file->inum);
set_attributes(file, &argp->attributes);
@@
-569,6
+577,8
@@
void nfsproc3_mkdir_3_svc(mkdir3args *argp, RPCRequest *req)
result.diropres3_u.resok.obj.post_op_fh3_u.handle.data.data_len = 8;
result.diropres3_u.resok.obj.post_op_fh3_u.handle.data.data_val = (char *)&fh_bytes;
result.diropres3_u.resok.obj.post_op_fh3_u.handle.data.data_len = 8;
result.diropres3_u.resok.obj.post_op_fh3_u.handle.data.data_val = (char *)&fh_bytes;
+ bluesky_inode_do_sync(file);
+ bluesky_inode_do_sync(dir);
g_mutex_unlock(file->lock);
g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
g_mutex_unlock(file->lock);
g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
@@
-610,6
+620,7
@@
void nfsproc3_symlink_3_svc(symlink3args *argp, RPCRequest *req)
return;
}
return;
}
+ g_mutex_lock(fs->lock);
BlueSkyInode *file;
file = bluesky_new_inode(bluesky_fs_alloc_inode(fs), fs, BLUESKY_SYMLINK);
file->nlink = 1;
BlueSkyInode *file;
file = bluesky_new_inode(bluesky_fs_alloc_inode(fs), fs, BLUESKY_SYMLINK);
file->nlink = 1;
@@
-622,6
+633,7
@@
void nfsproc3_symlink_3_svc(symlink3args *argp, RPCRequest *req)
file->symlink_contents = g_strdup(argp->symlink.symlink_data);
g_mutex_lock(file->lock);
bluesky_insert_inode(fs, file);
file->symlink_contents = g_strdup(argp->symlink.symlink_data);
g_mutex_lock(file->lock);
bluesky_insert_inode(fs, file);
+ g_mutex_unlock(fs->lock);
bluesky_directory_insert(dir, argp->where.name, file->inum);
bluesky_inode_update_ctime(dir, TRUE);
bluesky_directory_insert(dir, argp->where.name, file->inum);
bluesky_inode_update_ctime(dir, TRUE);
@@
-638,6
+650,8
@@
void nfsproc3_symlink_3_svc(symlink3args *argp, RPCRequest *req)
result.diropres3_u.resok.obj.post_op_fh3_u.handle.data.data_len = 8;
result.diropres3_u.resok.obj.post_op_fh3_u.handle.data.data_val = (char *)&fh_bytes;
result.diropres3_u.resok.obj.post_op_fh3_u.handle.data.data_len = 8;
result.diropres3_u.resok.obj.post_op_fh3_u.handle.data.data_val = (char *)&fh_bytes;
+ bluesky_inode_do_sync(file);
+ bluesky_inode_do_sync(dir);
g_mutex_unlock(file->lock);
g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
g_mutex_unlock(file->lock);
g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
@@
-688,6
+702,7
@@
void nfsproc3_remove_3_svc(diropargs3 *argp, RPCRequest *req)
encode_fattr3(&result.wccstat3_u.wcc.after.post_op_attr_u.attributes,
dir);
encode_fattr3(&result.wccstat3_u.wcc.after.post_op_attr_u.attributes,
dir);
+ bluesky_inode_do_sync(dir);
g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
}
g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
}
@@
-755,6
+770,8
@@
void nfsproc3_rmdir_3_svc(diropargs3 *argp, RPCRequest *req)
encode_fattr3(&result.wccstat3_u.wcc.after.post_op_attr_u.attributes,
dir);
encode_fattr3(&result.wccstat3_u.wcc.after.post_op_attr_u.attributes,
dir);
+ bluesky_inode_do_sync(dir);
+ bluesky_inode_do_sync(inode);
g_mutex_unlock(inode->lock);
g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
g_mutex_unlock(inode->lock);
g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
@@
-804,6
+821,9
@@
void nfsproc3_rename_3_svc(rename3args *argp, RPCRequest *req)
else
result.status = NFS3ERR_PERM;
else
result.status = NFS3ERR_PERM;
+ bluesky_inode_do_sync(dir2);
+ bluesky_inode_do_sync(dir1);
+
g_mutex_unlock(dir1->lock);
if (dir1->inum != dir2->inum)
g_mutex_unlock(dir2->lock);
g_mutex_unlock(dir1->lock);
if (dir1->inum != dir2->inum)
g_mutex_unlock(dir2->lock);
@@
-878,6
+898,8
@@
void nfsproc3_link_3_svc(link3args *argp, RPCRequest *req)
encode_fattr3(&result.link3res_u.res.file_attributes.post_op_attr_u.attributes, inode);
result.link3res_u.res.linkdir_wcc = wcc;
encode_fattr3(&result.link3res_u.res.file_attributes.post_op_attr_u.attributes, inode);
result.link3res_u.res.linkdir_wcc = wcc;
+ bluesky_inode_do_sync(inode);
+ bluesky_inode_do_sync(dir);
g_mutex_unlock(inode->lock);
g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
g_mutex_unlock(inode->lock);
g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
@@
-1134,7
+1156,7
@@
void nfsproc3_commit_3_svc(commit3args *argp, RPCRequest *req)
g_mutex_lock(inode->lock);
encode_pre_wcc(&result.commit3res_u.resok.file_wcc, inode);
g_mutex_lock(inode->lock);
encode_pre_wcc(&result.commit3res_u.resok.file_wcc, inode);
-
//
bluesky_inode_do_sync(inode);
+ bluesky_inode_do_sync(inode);
result.commit3res_u.resok.file_wcc.after.present = TRUE;
encode_fattr3(&result.commit3res_u.resok.file_wcc.after.post_op_attr_u.attributes, inode);
result.commit3res_u.resok.file_wcc.after.present = TRUE;
encode_fattr3(&result.commit3res_u.resok.file_wcc.after.post_op_attr_u.attributes, inode);