summaryrefslogtreecommitdiff
path: root/source3/printing
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-11-07 02:15:35 +0000
committerJeremy Allison <jra@samba.org>2002-11-07 02:15:35 +0000
commit93042487882d8b2407541ad21d2e9bc2b59142e5 (patch)
tree9c71fc306cbf8088c23c04c3d0bf46182b32637d /source3/printing
parent3955716f90c317684093b43065c73167382137d4 (diff)
downloadsamba-93042487882d8b2407541ad21d2e9bc2b59142e5.tar.gz
samba-93042487882d8b2407541ad21d2e9bc2b59142e5.tar.bz2
samba-93042487882d8b2407541ad21d2e9bc2b59142e5.zip
Merge of scalable printing code fix... Needs testing.
Jeremy. (This used to be commit d030df76439c72825d68410211e62090438cef54)
Diffstat (limited to 'source3/printing')
-rw-r--r--source3/printing/notify.c89
-rw-r--r--source3/printing/printing.c248
2 files changed, 307 insertions, 30 deletions
diff --git a/source3/printing/notify.c b/source3/printing/notify.c
index 003718ed72..a4111831d9 100644
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -26,6 +26,7 @@ static TALLOC_CTX *send_ctx;
static struct notify_queue {
struct notify_queue *next, *prev;
+ char *printername;
void *buf;
size_t buflen;
} *notify_queue_head = NULL;
@@ -40,33 +41,25 @@ BOOL print_notify_messages_pending(void)
}
/*******************************************************************
- Actually send the batched messages.
+ Send the batched messages - on a per-printer basis.
*******************************************************************/
-void print_notify_send_messages(void)
+static void print_notify_send_messages_to_printer(const char *printer)
{
- TDB_CONTEXT *tdb;
char *buf;
- struct notify_queue *pq;
+ struct notify_queue *pq, *pq_next;
size_t msg_count = 0, offset = 0;
+ size_t num_pids = 0;
+ size_t i;
+ pid_t *pid_list = NULL;
- if (!print_notify_messages_pending())
- return;
-
- if (!send_ctx)
- return;
-
- tdb = conn_tdb_ctx();
-
- if (!tdb) {
- DEBUG(3, ("Failed to open connections database in send_spoolss_notify2_msg\n"));
- return;
- }
-
/* Count the space needed to send the messages. */
- for (pq = notify_queue_head; pq; pq = pq->next, msg_count++)
- offset += (pq->buflen + 4);
-
+ for (pq = notify_queue_head; pq; pq = pq->next) {
+ if (strequal(printer, pq->printername)) {
+ offset += (pq->buflen + 4);
+ msg_count++;
+ }
+ }
offset += 4; /* For count. */
buf = talloc(send_ctx, offset);
@@ -79,19 +72,50 @@ void print_notify_send_messages(void)
offset = 0;
SIVAL(buf,offset,msg_count);
offset += 4;
- for (pq = notify_queue_head; pq; pq = pq->next) {
- SIVAL(buf,offset,pq->buflen);
- offset += 4;
- memcpy(buf + offset, pq->buf, pq->buflen);
- offset += pq->buflen;
+ for (pq = notify_queue_head; pq; pq = pq_next) {
+ pq_next = pq->next;
+
+ if (strequal(printer, pq->printername)) {
+ SIVAL(buf,offset,pq->buflen);
+ offset += 4;
+ memcpy(buf + offset, pq->buf, pq->buflen);
+ offset += pq->buflen;
+
+ /* Remove from list. */
+ DLIST_REMOVE(notify_queue_head, pq);
+ }
}
- DEBUG(5, ("print_notify_send_messages: sending %d print notify message%s\n",
- msg_count, msg_count != 1 ? "s" : ""));
+ DEBUG(5, ("print_notify_send_messages_to_printer: sending %d print notify message%s to printer %s\n",
+ msg_count, msg_count != 1 ? "s" : "", printer));
+
+ /*
+ * Get the list of PID's to send to.
+ */
+
+ if (!print_notify_pid_list(printer, send_ctx, &num_pids, &pid_list))
+ return;
+
+ for (i = 0; i < num_pids; i++)
+ message_send_pid(pid_list[i], MSG_PRINTER_NOTIFY2, buf, offset, True);
+}
+
+/*******************************************************************
+ Actually send the batched messages.
+*******************************************************************/
+
+void print_notify_send_messages(void)
+{
+ if (!print_notify_messages_pending())
+ return;
+
+ if (!send_ctx)
+ return;
+
+ while (print_notify_messages_pending())
+ print_notify_send_messages_to_printer(notify_queue_head->printername);
- message_send_all(tdb, MSG_PRINTER_NOTIFY2, buf, offset, False, NULL);
talloc_destroy_pool(send_ctx);
- notify_queue_head = NULL;
}
/*******************************************************************
@@ -150,10 +174,15 @@ again:
if (!pnqueue)
goto fail;
+ pnqueue->printername = talloc_strdup(send_ctx, msg->printer);
+ if (!pnqueue->printername)
+ goto fail;
+
pnqueue->buf = buf;
pnqueue->buflen = buflen;
- DEBUG(5, ("send_spoolss_notify2_msg: appending message 0x%02x/0x%02x to notify_queue_head\n", msg->type, msg->field));
+ DEBUG(5, ("send_spoolss_notify2_msg: appending message 0x%02x/0x%02x for printer %s \
+to notify_queue_head\n", msg->type, msg->field, msg->printer));
/* Note we add to the end of the list to ensure
* the messages are sent in the order they were received. JRA.
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 2121fb20a3..6d4cc213a7 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -1041,6 +1041,254 @@ static void print_queue_update(int snum)
}
/****************************************************************************
+ Fetch and clean the pid_t record list for all pids interested in notify
+ messages. data needs freeing on exit.
+****************************************************************************/
+
+#define NOTIFY_PID_LIST_KEY "NOTIFY_PID_LIST"
+
+static TDB_DATA get_printer_notify_pid_list(struct tdb_print_db *pdb)
+{
+ TDB_DATA data;
+ size_t i;
+
+ ZERO_STRUCT(data);
+
+ data = tdb_fetch_by_string( pdb->tdb, NOTIFY_PID_LIST_KEY );
+
+ if (!data.dptr) {
+ ZERO_STRUCT(data);
+ return data;
+ }
+
+ if (data.dsize % 8) {
+ DEBUG(0,("get_pid_list: Size of record for printer %s not a multiple of 8 !\n",
+ pdb->printer_name ));
+ tdb_delete_by_string(pdb->tdb, NOTIFY_PID_LIST_KEY );
+ ZERO_STRUCT(data);
+ return data;
+ }
+
+ /*
+ * Weed out all dead entries.
+ */
+
+ for( i = 0; i < data.dsize; ) {
+ pid_t pid = (pid_t)IVAL(data.dptr, i);
+
+ if (pid == sys_getpid())
+ continue;
+
+ /* Entry is dead if process doesn't exist or refcount is zero. */
+
+ if ((IVAL(data.dptr, i + 4) == 0) || !process_exists(pid)) {
+
+ /* Refcount == zero is a logic error and should never happen. */
+ if (IVAL(data.dptr, i + 4) == 0) {
+ DEBUG(0,("get_pid_list: Refcount == 0 for pid = %u printer %s !\n",
+ (unsigned int)pid, pdb->printer_name ));
+ }
+
+ if (data.dsize - i > 8)
+ memmove( &data.dptr[i], &data.dptr[i+8], data.dsize - i - 8);
+ data.dsize -= 8;
+ continue;
+ }
+
+ i += 8;
+ }
+
+ return data;
+}
+
+/****************************************************************************
+ Return a malloced list of pid_t's that are interested in getting update
+ messages on this print queue. Used in printing/notify to send the messages.
+****************************************************************************/
+
+BOOL print_notify_pid_list(const char *printername, TALLOC_CTX *mem_ctx, size_t *p_num_pids, pid_t **pp_pid_list)
+{
+ struct tdb_print_db *pdb;
+ TDB_DATA data;
+ BOOL ret = True;
+ size_t i, num_pids;
+ pid_t *pid_list;
+
+ *p_num_pids = 0;
+ *pp_pid_list = NULL;
+
+ pdb = get_print_db_byname(printername);
+ if (!pdb)
+ return False;
+
+ if (tdb_lock_bystring(pdb->tdb, NOTIFY_PID_LIST_KEY, 10) == -1) {
+ DEBUG(0,("print_notify_pid_list: Failed to lock printer %s database\n", printername));
+ release_print_db(pdb);
+ return False;
+ }
+
+ data = get_printer_notify_pid_list( pdb );
+
+ if (!data.dptr) {
+ ret = True;
+ goto done;
+ }
+
+ num_pids = data.dsize / 8;
+
+ if ((pid_list = (pid_t *)talloc(mem_ctx, sizeof(pid_t) * num_pids)) == NULL) {
+ ret = False;
+ goto done;
+ }
+
+ for( i = 0; i < data.dsize; i += 8) {
+ pid_t pid = (pid_t)IVAL(data.dptr, i);
+ pid_list[i] = pid;
+ }
+
+ *pp_pid_list = pid_list;
+ *p_num_pids = num_pids;
+
+ ret = True;
+
+ done:
+
+ tdb_unlock_bystring(pdb->tdb, NOTIFY_PID_LIST_KEY);
+ release_print_db(pdb);
+ SAFE_FREE(data.dptr);
+ return ret;
+}
+
+/****************************************************************************
+ Create/Update an entry in the print tdb that will allow us to send notify
+ updates only to interested smbd's.
+****************************************************************************/
+
+BOOL print_notify_register_pid(int snum)
+{
+ TDB_DATA data;
+ struct tdb_print_db *pdb;
+ const char *printername = lp_const_servicename(snum);
+ uint32 mypid = (uint32)sys_getpid();
+ BOOL ret = False;
+ size_t i;
+
+ pdb = get_print_db_byname(printername);
+ if (!pdb)
+ return False;
+
+ if (tdb_lock_bystring(pdb->tdb, NOTIFY_PID_LIST_KEY, 10) == -1) {
+ DEBUG(0,("print_notify_register_pid: Failed to lock printer %s\n", printername));
+ release_print_db(pdb);
+ return False;
+ }
+
+ data = get_printer_notify_pid_list( pdb );
+
+ /* Add ourselves and increase the refcount. */
+
+ for (i = 0; i < data.dsize; i += 8) {
+ if (IVAL(data.dptr,i) == mypid) {
+ uint32 new_refcount = IVAL(data.dptr, i+4) + 1;
+ SIVAL(data.dptr, i+4, new_refcount);
+ break;
+ }
+ }
+
+ if (i == data.dsize) {
+ /* We weren't in the list. Realloc. */
+ data.dptr = Realloc(data.dptr, data.dsize + 8);
+ if (!data.dptr) {
+ DEBUG(0,("print_notify_register_pid: Relloc fail for printer %s\n", printername));
+ goto done;
+ }
+ data.dsize += 8;
+ SIVAL(data.dptr,data.dsize - 8,mypid);
+ SIVAL(data.dptr,data.dsize - 4,1); /* Refcount. */
+ }
+
+ /* Store back the record. */
+ if (tdb_store_by_string(pdb->tdb, NOTIFY_PID_LIST_KEY, data, TDB_REPLACE) == -1) {
+ DEBUG(0,("print_notify_register_pid: Failed to update pid list for printer %s\n", printername));
+ goto done;
+ }
+
+ ret = True;
+
+ done:
+
+ tdb_unlock_bystring(pdb->tdb, NOTIFY_PID_LIST_KEY);
+ release_print_db(pdb);
+ SAFE_FREE(data.dptr);
+ return ret;
+}
+
+/****************************************************************************
+ Update an entry in the print tdb that will allow us to send notify
+ updates only to interested smbd's.
+****************************************************************************/
+
+BOOL print_notify_deregister_pid(int snum)
+{
+ TDB_DATA data;
+ struct tdb_print_db *pdb;
+ const char *printername = lp_const_servicename(snum);
+ uint32 mypid = (uint32)sys_getpid();
+ size_t i;
+ BOOL ret = False;
+
+ pdb = get_print_db_byname(printername);
+ if (!pdb)
+ return False;
+
+ if (tdb_lock_bystring(pdb->tdb, NOTIFY_PID_LIST_KEY, 10) == -1) {
+ DEBUG(0,("print_notify_register_pid: Failed to lock printer %s database\n", printername));
+ release_print_db(pdb);
+ return False;
+ }
+
+ data = get_printer_notify_pid_list( pdb );
+
+ /* Reduce refcount. Remove ourselves if zero. */
+
+ for (i = 0; i < data.dsize; ) {
+ if (IVAL(data.dptr,i) == mypid) {
+ uint32 refcount = IVAL(data.dptr, i+4);
+
+ refcount--;
+
+ if (refcount == 0) {
+ if (data.dsize - i > 8)
+ memmove( &data.dptr[i], &data.dptr[i+8], data.dsize - i - 8);
+ data.dsize -= 8;
+ continue;
+ }
+ SIVAL(data.dptr, i+4, refcount);
+ }
+
+ i += 8;
+ }
+
+ if (data.dsize == 0)
+ SAFE_FREE(data.dptr);
+
+ /* Store back the record. */
+ if (tdb_store_by_string(pdb->tdb, NOTIFY_PID_LIST_KEY, data, TDB_REPLACE) == -1) {
+ DEBUG(0,("print_notify_register_pid: Failed to update pid list for printer %s\n", printername));
+ goto done;
+ }
+
+ ret = True;
+
+ done:
+
+ tdb_unlock_bystring(pdb->tdb, NOTIFY_PID_LIST_KEY);
+ release_print_db(pdb);
+ SAFE_FREE(data.dptr);
+ return ret;
+}
+
+/****************************************************************************
Check if a jobid is valid. It is valid if it exists in the database.
****************************************************************************/