search for: current_opt

...:00:25PM -0500, Eric Blake wrote: > diff --git a/lib/internal.h b/lib/internal.h > index 5f495fb..03baacd 100644 > --- a/lib/internal.h > +++ b/lib/internal.h > @@ -101,6 +101,7 @@ struct nbd_handle { > > /* Option negotiation mode. */ > bool opt_mode; > + uint8_t current_opt; Be nice to add a comment here about what current_opt can contain, which would also explain why it has this somewhat unexpected type. Something like: + uint8_t current_opt; /* 0 or NBD_OPT_* */ (Can it only contain NBD_OPT_ABORT or are other options added in later patches?) Rich. -- Richa...

...r it is the first entry (proceed with gflags/cflags, TLS, and structured reply) or a later entry (all nbd_opt_* will cause an IssueCommand event to kick the state machine out of NEGOTIATING, at which point we want to jump to the sub-state appropriate for that option). This is done by setting h->current_opt prior to entering NEWSTYLE. We also need a couple of new states to implement NBD_OPT_ABORT; this was not deemed worth a separate sub-group and new states-newstyle-opt-abort.c file, so I just inlined it in NEWSTYLE instead. One nice benefit of these new states: when NBD_OPT_GO fails and we are not...

Hi, poudriere 2.2 here, running on 9.1-amd64 Of the 730-ish ports, whenever I run a build, it always rebuilds the above two ports. Even if nothing changed. Is there are specific reason for this? I don't really mind nginx, because it builds so quickly - but GraphicsMagick takes a bit too long.

Well, I'm not quite done (I still want to get nbdinfo to work on a single nbd connection for all cases when reading the heads of the file is not required), but I'm happy with patches 1-11, and 12-13 show where I'm headed for getting NBD_OPT_INFO to work. Posting now to see if some of the earlier patches are ready to commit while I continue working on the latter half. Eric Blake (13):

...ack list; + } fn; + nbd_completion_callback completion; +}; + struct nbd_handle { /* Unique name assigned to this handle for debug messages * (to avoid having to print actual pointers). @@ -102,10 +111,7 @@ struct nbd_handle { /* Option negotiation mode. */ bool opt_mode; uint8_t current_opt; - - /* Results of nbd_opt_list. */ - size_t nr_exports; - struct export *exports; + struct command_cb opt_cb; /* Full info mode. */ bool full_info; @@ -186,7 +192,7 @@ struct nbd_handle { union { struct { struct nbd_fixed_new_option_reply_server server; -...

...ked_opt_list (struct nbd_handle *h, nbd_list_callback list) /* Issue NBD_OPT_GO (or NBD_OPT_EXPORT_NAME) without waiting. */ int -nbd_unlocked_aio_opt_go (struct nbd_handle *h) +nbd_unlocked_aio_opt_go (struct nbd_handle *h, + nbd_completion_callback complete) { h->current_opt = NBD_OPT_GO; + h->opt_cb.completion = complete; if (nbd_internal_run (h, cmd_issue) == -1) debug (h, "option queued, ignoring state machine failure"); -- 2.28.0

....c Fri Feb 23 16:52:22 2001 +++ vorbis-tools-1.0beta4-modified/ogg123/ogg123.c Sat Mar 10 03:15:28 2001 @@ -168,7 +168,7 @@ /* Add last device to device list or use the default device */ if (temp_driver_id < 0) { - temp_driver_id = get_default_device(); + temp_driver_id = get_configs(current_options); if(temp_driver_id < 0) { temp_driver_id = ao_get_driver_id(NULL); } diff -u vorbis-tools-1.0beta4/ogg123/ogg123.h vorbis-tools-1.0beta4-modified/ogg123/ogg123.h --- vorbis-tools-1.0beta4/ogg123/ogg123.h Wed Feb 21 18:49:12 2001 +++ vorbis-tools-1.0beta4-m...

...reak; + case 'k': + ogg123_opts->seekpos = atof(optarg); + break; - case 'l': - ogg123_opts->delay = atoi(optarg); - break; + case 'l': + ogg123_opts->delay = atoi(optarg); + break; - case 'o': - if (optarg && !add_ao_option(current_options, optarg)) { - status_error(_("=== Incorrect option format: %s.\n"), optarg); - exit(1); - } - break; + case 'o': + if (optarg && !add_ao_option(current_options, optarg)) { + status_error(_("=== Incorrect option format: %s.\n"), optarg); +...