Author: idra Date: 2006-05-23 23:52:05 +0000 (Tue, 23 May 2006) New Revision: 15846
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15846 Log: An async version of ldbsearch Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c 2006-05-23 22:35:08 UTC (rev 15845) +++ branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c 2006-05-23 23:52:05 UTC (rev 15846) @@ -58,90 +58,219 @@ return ldb_dn_compare(ldb, (*el1)->dn, (*el2)->dn); } +struct async_context { + struct ldb_control **req_ctrls; + + int sort; + int num_stored; + struct ldb_message **store; + char **refs_store; + + int entries; + int refs; + + int pending; + int status; +}; + +static int store_message(struct ldb_message *msg, struct async_context *actx) { + + actx->store = talloc_realloc(actx, actx->store, struct ldb_message *, actx->num_stored + 2); + if (!actx->store) { + fprintf(stderr, "talloc_realloc failed while storing messages\n"); + return -1; + } + + actx->store[actx->num_stored] = talloc_steal(actx->store, msg); + if (!actx->store[actx->num_stored]) { + fprintf(stderr, "talloc_steal failed while storing messages\n"); + return -1; + } + + actx->num_stored++; + actx->store[actx->num_stored] = NULL; + + return 0; +} + +static int store_referral(char *referral, struct async_context *actx) { + + actx->refs_store = talloc_realloc(actx, actx->refs_store, char *, actx->refs + 2); + if (!actx->refs_store) { + fprintf(stderr, "talloc_realloc failed while storing referrals\n"); + return -1; + } + + actx->refs_store[actx->refs] = talloc_steal(actx->refs_store, referral); + if (!actx->refs_store[actx->refs]) { + fprintf(stderr, "talloc_steal failed while storing referrals\n"); + return -1; + } + + actx->refs++; + actx->refs_store[actx->refs] = NULL; + + return 0; +} + +static int display_message(struct ldb_context *ldb, struct ldb_message *msg, struct async_context *actx) { + struct ldb_ldif ldif; + + actx->entries++; + printf("# record %d\n", actx->entries); + + ldif.changetype = LDB_CHANGETYPE_NONE; + ldif.msg = msg; + + if (actx->sort) { + /* + * Ensure attributes are always returned in the same + * order. For testing, this makes comparison of old + * vs. new much easier. + */ + ldb_msg_sort_elements(ldif.msg); + } + + ldb_ldif_write_file(ldb, stdout, &ldif); + + return 0; +} + +static int display_referral(char *referral, struct async_context *actx) { + + actx->refs++; + printf("# Referral\nref: %s\n\n", referral); + + return 0; +} + +static int search_callback(struct ldb_context *ldb, void *context, struct ldb_async_result *ares) +{ + struct async_context *actx = talloc_get_type(context, struct async_context); + int ret; + + switch (ares->type) { + + case LDB_REPLY_ENTRY: + if (actx->sort) { + ret = store_message(ares->message, actx); + } else { + ret = display_message(ldb, ares->message, actx); + } + break; + + case LDB_REPLY_REFERRAL: + if (actx->sort) { + ret = store_referral(ares->referral, actx); + } else { + ret = display_referral(ares->referral, actx); + } + break; + + case LDB_REPLY_DONE: + if (ares->controls) { + if (handle_controls_reply(ares->controls, actx->req_ctrls) == 1) + actx->pending = 1; + } + ret = 0; + break; + + default: + fprintf(stderr, "unknown Reply Type\n"); + return LDB_ERR_OTHER; + } + + if (talloc_free(ares) == -1) { + fprintf(stderr, "talloc_free failed\n"); + actx->pending = 0; + return LDB_ERR_OPERATIONS_ERROR; + } + + if (ret) { + return LDB_ERR_OPERATIONS_ERROR; + } + + return LDB_SUCCESS; +} + static int do_search(struct ldb_context *ldb, const struct ldb_dn *basedn, struct ldb_cmdline *options, const char *expression, const char * const *attrs) { - int ret, i, n; - int loop = 0; - int total = 0; - int refs = 0; struct ldb_request *req; - struct ldb_result *result = NULL; + struct async_context *actx; + int ret; req = talloc(ldb, struct ldb_request); - req->operation = LDB_REQ_SEARCH; + if (!req) return -1; + + actx = talloc(req, struct async_context); + if (!actx) return -1; + + actx->sort = options->sorted; + actx->num_stored = 0; + actx->store = NULL; + actx->req_ctrls = parse_controls(ldb, options->controls); + if (options->controls != NULL && actx->req_ctrls== NULL) return -1; + actx->entries = 0; + actx->refs = 0; + + req->operation = LDB_ASYNC_SEARCH; req->op.search.base = basedn; req->op.search.scope = options->scope; req->op.search.tree = ldb_parse_tree(ldb, expression); if (req->op.search.tree == NULL) return -1; req->op.search.attrs = attrs; - req->op.search.res = NULL; - req->controls = parse_controls(ldb, options->controls); - if (options->controls != NULL && req->controls == NULL) return -1; + req->controls = actx->req_ctrls; req->creds = NULL; + req->async.context = actx; + req->async.callback = &search_callback; + req->async.timeout = 3600; /* TODO: make this settable by command line */ - do { - loop = 0; +again: + actx->pending = 0; - ret = ldb_request(ldb, req); - if (ret != LDB_SUCCESS) { - printf("search failed - %s\n", ldb_errstring(ldb)); - return -1; - } + ret = ldb_request(ldb, req); + if (ret != LDB_SUCCESS) { + printf("search failed - %s\n", ldb_errstring(ldb)); + return -1; + } - result = req->op.search.res; + ret = ldb_async_wait(req->async.handle, LDB_WAIT_ALL); + if (ret != LDB_SUCCESS) { + printf("search error - %s\n", ldb_errstring(ldb)); + return -1; + } - if (options->sorted) { - ldb_qsort(result->msgs, result->count, sizeof(struct ldb_message *), - ldb, (ldb_qsort_cmp_fn_t)do_compare_msg); - } + if (actx->pending) + goto again; - for (i = 0; i < result->count; i++, total++) { - struct ldb_ldif ldif; - printf("# record %d\n", total + 1); + if (actx->sort && actx->num_stored != 0) { + int i; - ldif.changetype = LDB_CHANGETYPE_NONE; - ldif.msg = result->msgs[i]; + ldb_qsort(actx->store, ret, sizeof(struct ldb_message *), + ldb, (ldb_qsort_cmp_fn_t)do_compare_msg); - if (options->sorted) { - /* - * Ensure attributes are always returned in the same - * order. For testing, this makes comparison of old - * vs. new much easier. - */ - ldb_msg_sort_elements(ldif.msg); - } - - ldb_ldif_write_file(ldb, stdout, &ldif); + if (ret != 0) { + fprintf(stderr, "An error occurred while sorting messages\n"); + exit(1); } - if (result->refs) { - for(n = 0;result->refs[n]; n++, refs++) { - printf("# referral %d\nref: %s\n\n", refs + 1, result->refs[n]); - } + for (i = 0; i < actx->num_stored; i++) { + display_message(ldb, actx->store[i], actx); } - - if (result->controls) { - if (handle_controls_reply(result->controls, req->controls) == 1) - loop = 1; - } - if (result) { - ret = talloc_free(result); - if (ret == -1) { - fprintf(stderr, "talloc_free failed\n"); - exit(1); - } + for (i = 0; i < actx->refs; i++) { + display_referral(actx->refs_store[i], actx); } + } - req->op.search.res = NULL; - - } while(loop); + printf("# returned %d records\n# %d entries\n# %d referrals\n", + actx->entries + actx->refs, actx->entries, actx->refs); - printf("# returned %d records\n# %d entries\n# %d referrals\n", total + refs, total, refs); + talloc_free(req); return 0; } @@ -155,8 +284,6 @@ int ret = -1; const char *expression = "(|(objectClass=*)(distinguishedName=*))"; - ldb_global_init(); - ldb = ldb_init(NULL); options = ldb_cmdline_process(ldb, argc, argv, usage);
