sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-29 13:49:30 +03:00
Code Activity

s3: Use serverids_exist in parse_share_modes

Browse Source 
This is the main reason for the preceding commits. We need to reduce the number
of round-trips to ctdb when checking the locking record entries for existence.
Using the plural version of process_exists gets the number of round-trips to
ctdb for process_exists down to 1.
This commit is contained in:
Volker Lendecke
2011-10-26 13:43:07 +02:00
committed by Volker Lendecke
parent 37d7d52358
commit 4a96b629a6
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source3/locking/locking.c
View File

@ -645,6 +645,8 @@ static bool parse_share_modes(const TDB_DATA dbuf, struct share_mode_lock *lck)
struct locking_data data;
int delete_tokens_size;
int i;
struct server_id *pids;
bool *pid_exists;
if (dbuf.dsize < sizeof(struct locking_data)) {
smb_panic("parse_share_modes: buffer too short");
@ -719,6 +721,24 @@ static bool parse_share_modes(const TDB_DATA dbuf, struct share_mode_lock *lck)
* Ensure that each entry has a real process attached.
*/
pids = talloc_array(talloc_tos(), struct server_id,
lck->num_share_modes);
if (pids == NULL) {
smb_panic("parse_share_modes: talloc_array failed");
}
pid_exists = talloc_array(talloc_tos(), bool, lck->num_share_modes);
if (pid_exists == NULL) {
smb_panic("parse_share_modes: talloc_array failed");
}
for (i=0; i<lck->num_share_modes; i++) {
pids[i] = lck->share_modes[i].pid;
}
if (!serverids_exist(pids, lck->num_share_modes, pid_exists)) {
smb_panic("parse_share_modes: serverids_exist failed");
}
for (i = 0; i < lck->num_share_modes; i++) {
struct share_mode_entry *entry_p = &lck->share_modes[i];
char *str = NULL;
@ -727,7 +747,7 @@ static bool parse_share_modes(const TDB_DATA dbuf, struct share_mode_lock *lck)
}
DEBUG(10,("parse_share_modes: %s\n",
str ? str : ""));
if (!serverid_exists(&entry_p->pid)) {
if (!pid_exists[i]) {
DEBUG(10,("parse_share_modes: deleted %s\n",
str ? str : ""));
entry_p->op_type = UNUSED_SHARE_MODE_ENTRY;
@ -735,6 +755,8 @@ static bool parse_share_modes(const TDB_DATA dbuf, struct share_mode_lock *lck)
}
TALLOC_FREE(str);
}
TALLOC_FREE(pid_exists);
TALLOC_FREE(pids);
return True;
}