Skip to content

Commit 11f9e05

Browse files
jeffhostetlerdscho
jeffhostetler
authored and
dscho
committed
fsmonitor--daemon: rename listener thread related variables
Rename platform-specific listener thread related variables and data types as we prepare to add another backend thread type. [] `struct fsmonitor_daemon_backend_data` becomes `struct fsm_listen_data` [] `state->backend_data` becomes `state->listen_data` [] `state->error_code` becomes `state->listen_error_code` Signed-off-by: Jeff Hostetler <[email protected]>
1 parent ef8e6b1 commit 11f9e05

File tree

5 files changed

+36
-36
lines changed

5 files changed

+36
-36
lines changed

‎builtin/fsmonitor--daemon.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,8 +1213,8 @@ static int fsmonitor_run_daemon_1(struct fsmonitor_daemon_state *state)
12131213

12141214
if (err)
12151215
return err;
1216-
if (state->error_code)
1217-
return state->error_code;
1216+
if (state->listen_error_code)
1217+
return state->listen_error_code;
12181218
return 0;
12191219
}
12201220

@@ -1229,7 +1229,7 @@ static int fsmonitor_run_daemon(void)
12291229
hashmap_init(&state.cookies, cookies_cmp, NULL, 0);
12301230
pthread_mutex_init(&state.main_lock, NULL);
12311231
pthread_cond_init(&state.cookies_cond, NULL);
1232-
state.error_code = 0;
1232+
state.listen_error_code = 0;
12331233
state.current_token_data = fsmonitor_new_token_data();
12341234

12351235
/* Prepare to (recursively) watch the <worktree-root> directory. */

‎compat/fsmonitor/fsm-listen-darwin.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ void FSEventStreamRelease(FSEventStreamRef stream);
9999
#include "fsm-listen.h"
100100
#include "fsmonitor--daemon.h"
101101

102-
struct fsmonitor_daemon_backend_data
102+
struct fsm_listen_data
103103
{
104104
CFStringRef cfsr_worktree_path;
105105
CFStringRef cfsr_gitdir_path;
@@ -230,7 +230,7 @@ static void fsevent_callback(ConstFSEventStreamRef streamRef,
230230
const FSEventStreamEventId event_ids[])
231231
{
232232
struct fsmonitor_daemon_state *state = ctx;
233-
struct fsmonitor_daemon_backend_data *data = state->backend_data;
233+
struct fsm_listen_data *data = state->listen_data;
234234
char **paths = (char **)event_paths;
235235
struct fsmonitor_batch *batch = NULL;
236236
struct string_list cookie_list = STRING_LIST_INIT_DUP;
@@ -419,11 +419,11 @@ int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
419419
NULL,
420420
NULL
421421
};
422-
struct fsmonitor_daemon_backend_data *data;
422+
struct fsm_listen_data *data;
423423
const void *dir_array[2];
424424

425425
CALLOC_ARRAY(data, 1);
426-
state->backend_data = data;
426+
state->listen_data = data;
427427

428428
data->cfsr_worktree_path = CFStringCreateWithCString(
429429
NULL, state->path_worktree_watch.buf, kCFStringEncodingUTF8);
@@ -455,18 +455,18 @@ int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
455455
failed:
456456
error("Unable to create FSEventStream.");
457457

458-
FREE_AND_NULL(state->backend_data);
458+
FREE_AND_NULL(state->listen_data);
459459
return -1;
460460
}
461461

462462
void fsm_listen__dtor(struct fsmonitor_daemon_state *state)
463463
{
464-
struct fsmonitor_daemon_backend_data *data;
464+
struct fsm_listen_data *data;
465465

466-
if (!state || !state->backend_data)
466+
if (!state || !state->listen_data)
467467
return;
468468

469-
data = state->backend_data;
469+
data = state->listen_data;
470470

471471
if (data->stream) {
472472
if (data->stream_started)
@@ -476,24 +476,24 @@ void fsm_listen__dtor(struct fsmonitor_daemon_state *state)
476476
FSEventStreamRelease(data->stream);
477477
}
478478

479-
FREE_AND_NULL(state->backend_data);
479+
FREE_AND_NULL(state->listen_data);
480480
}
481481

482482
void fsm_listen__stop_async(struct fsmonitor_daemon_state *state)
483483
{
484-
struct fsmonitor_daemon_backend_data *data;
484+
struct fsm_listen_data *data;
485485

486-
data = state->backend_data;
486+
data = state->listen_data;
487487
data->shutdown_style = SHUTDOWN_EVENT;
488488

489489
CFRunLoopStop(data->rl);
490490
}
491491

492492
void fsm_listen__loop(struct fsmonitor_daemon_state *state)
493493
{
494-
struct fsmonitor_daemon_backend_data *data;
494+
struct fsm_listen_data *data;
495495

496-
data = state->backend_data;
496+
data = state->listen_data;
497497

498498
data->rl = CFRunLoopGetCurrent();
499499

@@ -510,7 +510,7 @@ void fsm_listen__loop(struct fsmonitor_daemon_state *state)
510510

511511
switch (data->shutdown_style) {
512512
case FORCE_ERROR_STOP:
513-
state->error_code = -1;
513+
state->listen_error_code = -1;
514514
/* fall thru */
515515
case FORCE_SHUTDOWN:
516516
ipc_server_stop_async(state->ipc_server_data);
@@ -522,7 +522,7 @@ void fsm_listen__loop(struct fsmonitor_daemon_state *state)
522522
return;
523523

524524
force_error_stop_without_loop:
525-
state->error_code = -1;
525+
state->listen_error_code = -1;
526526
ipc_server_stop_async(state->ipc_server_data);
527527
return;
528528
}

‎compat/fsmonitor/fsm-listen-win32.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ struct one_watch
5454
wchar_t dotgit_shortname[16]; /* for 8.3 name */
5555
};
5656

57-
struct fsmonitor_daemon_backend_data
57+
struct fsm_listen_data
5858
{
5959
struct one_watch *watch_worktree;
6060
struct one_watch *watch_gitdir;
@@ -259,7 +259,7 @@ static enum get_relative_result get_relative_longname(
259259

260260
void fsm_listen__stop_async(struct fsmonitor_daemon_state *state)
261261
{
262-
SetEvent(state->backend_data->hListener[LISTENER_SHUTDOWN]);
262+
SetEvent(state->listen_data->hListener[LISTENER_SHUTDOWN]);
263263
}
264264

265265
static struct one_watch *create_watch(struct fsmonitor_daemon_state *state,
@@ -333,7 +333,7 @@ static void destroy_watch(struct one_watch *watch)
333333
free(watch);
334334
}
335335

336-
static int start_rdcw_watch(struct fsmonitor_daemon_backend_data *data,
336+
static int start_rdcw_watch(struct fsm_listen_data *data,
337337
struct one_watch *watch)
338338
{
339339
DWORD dwNotifyFilter =
@@ -512,7 +512,7 @@ static int process_1_worktree_event(
512512
*/
513513
static int process_worktree_events(struct fsmonitor_daemon_state *state)
514514
{
515-
struct fsmonitor_daemon_backend_data *data = state->backend_data;
515+
struct fsm_listen_data *data = state->listen_data;
516516
struct one_watch *watch = data->watch_worktree;
517517
struct strbuf path = STRBUF_INIT;
518518
struct string_list cookie_list = STRING_LIST_INIT_DUP;
@@ -642,7 +642,7 @@ static int process_worktree_events(struct fsmonitor_daemon_state *state)
642642
*/
643643
static int process_gitdir_events(struct fsmonitor_daemon_state *state)
644644
{
645-
struct fsmonitor_daemon_backend_data *data = state->backend_data;
645+
struct fsm_listen_data *data = state->listen_data;
646646
struct one_watch *watch = data->watch_gitdir;
647647
struct strbuf path = STRBUF_INIT;
648648
struct string_list cookie_list = STRING_LIST_INIT_DUP;
@@ -700,11 +700,11 @@ static int process_gitdir_events(struct fsmonitor_daemon_state *state)
700700

701701
void fsm_listen__loop(struct fsmonitor_daemon_state *state)
702702
{
703-
struct fsmonitor_daemon_backend_data *data = state->backend_data;
703+
struct fsm_listen_data *data = state->listen_data;
704704
DWORD dwWait;
705705
int result;
706706

707-
state->error_code = 0;
707+
state->listen_error_code = 0;
708708

709709
if (start_rdcw_watch(data, data->watch_worktree) == -1)
710710
goto force_error_stop;
@@ -769,7 +769,7 @@ void fsm_listen__loop(struct fsmonitor_daemon_state *state)
769769
}
770770

771771
force_error_stop:
772-
state->error_code = -1;
772+
state->listen_error_code = -1;
773773

774774
force_shutdown:
775775
/*
@@ -786,7 +786,7 @@ void fsm_listen__loop(struct fsmonitor_daemon_state *state)
786786

787787
int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
788788
{
789-
struct fsmonitor_daemon_backend_data *data;
789+
struct fsm_listen_data *data;
790790

791791
CALLOC_ARRAY(data, 1);
792792

@@ -819,7 +819,7 @@ int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
819819
data->nr_listener_handles++;
820820
}
821821

822-
state->backend_data = data;
822+
state->listen_data = data;
823823
return 0;
824824

825825
failed:
@@ -832,16 +832,16 @@ int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
832832

833833
void fsm_listen__dtor(struct fsmonitor_daemon_state *state)
834834
{
835-
struct fsmonitor_daemon_backend_data *data;
835+
struct fsm_listen_data *data;
836836

837-
if (!state || !state->backend_data)
837+
if (!state || !state->listen_data)
838838
return;
839839

840-
data = state->backend_data;
840+
data = state->listen_data;
841841

842842
CloseHandle(data->hEventShutdown);
843843
destroy_watch(data->watch_worktree);
844844
destroy_watch(data->watch_gitdir);
845845

846-
FREE_AND_NULL(state->backend_data);
846+
FREE_AND_NULL(state->listen_data);
847847
}

‎compat/fsmonitor/fsm-listen.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void fsm_listen__dtor(struct fsmonitor_daemon_state *state);
3333
* do so if the listener thread receives a normal shutdown signal from
3434
* the IPC layer.)
3535
*
36-
* It should set `state->error_code` to -1 if the daemon should exit
36+
* It should set `state->listen_error_code` to -1 if the daemon should exit
3737
* with an error.
3838
*/
3939
void fsm_listen__loop(struct fsmonitor_daemon_state *state);

‎fsmonitor--daemon.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void fsmonitor_batch__free_list(struct fsmonitor_batch *batch);
3333
*/
3434
void fsmonitor_batch__add_path(struct fsmonitor_batch *batch, const char *path);
3535

36-
struct fsmonitor_daemon_backend_data; /* opaque platform-specific data */
36+
struct fsm_listen_data; /* opaque platform-specific data for listener thread */
3737

3838
struct fsmonitor_daemon_state {
3939
pthread_t listener_thread;
@@ -50,8 +50,8 @@ struct fsmonitor_daemon_state {
5050
int cookie_seq;
5151
struct hashmap cookies;
5252

53-
int error_code;
54-
struct fsmonitor_daemon_backend_data *backend_data;
53+
int listen_error_code;
54+
struct fsm_listen_data *listen_data;
5555

5656
struct ipc_server_data *ipc_server_data;
5757
struct strbuf path_ipc;

0 commit comments

Comments
 (0)