mirror of
https://github.com/samba-team/samba.git
synced 2025-01-13 13:18:06 +03:00
1e83435eac
The printcap update procedure involves the background printer process obtaining the printcap information from the printing backend, writing this to printer_list.tdb, and then notifying all smbd processes of the new list. The processes then all attempt to simultaneously traverse printer_list.tdb, in order to update their local share lists. With a large number of printers, and a large number of per-client smbd processes, this traversal results in significant lock contention, mostly due to the fact that the traversal is unnecessarily done with an exclusive (write) lock on the printer_list.tdb database. This commit changes the share update code path to perform a read-only traversal. Bug: https://bugzilla.samba.org/show_bug.cgi?id=10652 Reported-by: Alex K <korobkin+samba@gmail.com> Reported-by: Franz Pförtsch <franz.pfoertsch@brose.com> Signed-off-by: David Disseldorp <ddiss@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org>
76 lines
2.2 KiB
C
76 lines
2.2 KiB
C
/*
|
|
Unix SMB/CIFS implementation.
|
|
load printer lists
|
|
Copyright (C) Andrew Tridgell 1992-2000
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "includes.h"
|
|
#include "printing/pcap.h"
|
|
#include "printing/load.h"
|
|
#include "lib/param/loadparm.h"
|
|
|
|
/***************************************************************************
|
|
auto-load some homes and printer services
|
|
***************************************************************************/
|
|
static void add_auto_printers(void)
|
|
{
|
|
const char *p;
|
|
int pnum = lp_servicenumber(PRINTERS_NAME);
|
|
char *str;
|
|
char *saveptr;
|
|
char *auto_serv = NULL;
|
|
|
|
if (pnum < 0)
|
|
if (process_registry_service(PRINTERS_NAME))
|
|
pnum = lp_servicenumber(PRINTERS_NAME);
|
|
|
|
if (pnum < 0)
|
|
return;
|
|
|
|
auto_serv = lp_auto_services(talloc_tos());
|
|
str = SMB_STRDUP(auto_serv);
|
|
TALLOC_FREE(auto_serv);
|
|
if (str == NULL) {
|
|
return;
|
|
}
|
|
|
|
for (p = strtok_r(str, LIST_SEP, &saveptr); p;
|
|
p = strtok_r(NULL, LIST_SEP, &saveptr)) {
|
|
if (lp_servicenumber(p) >= 0)
|
|
continue;
|
|
|
|
if (pcap_printername_ok(p))
|
|
lp_add_printer(p, pnum);
|
|
}
|
|
|
|
SAFE_FREE(str);
|
|
}
|
|
|
|
/***************************************************************************
|
|
load automatic printer services from pre-populated pcap cache
|
|
***************************************************************************/
|
|
void load_printers(struct tevent_context *ev,
|
|
struct messaging_context *msg_ctx)
|
|
{
|
|
SMB_ASSERT(pcap_cache_loaded());
|
|
|
|
add_auto_printers();
|
|
|
|
/* load all printcap printers */
|
|
if (lp_load_printers() && lp_servicenumber(PRINTERS_NAME) >= 0)
|
|
pcap_printer_read_fn(lp_add_one_printer, NULL);
|
|
}
|