Skip to content

Commit f625172

Browse files
jeffhostetlergitster
jeffhostetler
authored and
gitster
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 <jeffhost@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent dff7471 commit f625172

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
@@ -1225,8 +1225,8 @@ static int fsmonitor_run_daemon_1(struct fsmonitor_daemon_state *state)
12251225

12261226
if (err)
12271227
return err;
1228-
if (state->error_code)
1229-
return state->error_code;
1228+
if (state->listen_error_code)
1229+
return state->listen_error_code;
12301230
return 0;
12311231
}
12321232

@@ -1241,7 +1241,7 @@ static int fsmonitor_run_daemon(void)
12411241
hashmap_init(&state.cookies, cookies_cmp, NULL, 0);
12421242
pthread_mutex_init(&state.main_lock, NULL);
12431243
pthread_cond_init(&state.cookies_cond, NULL);
1244-
state.error_code = 0;
1244+
state.listen_error_code = 0;
12451245
state.current_token_data = fsmonitor_new_token_data();
12461246

12471247
/* 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
@@ -27,7 +27,7 @@
2727
#include "fsm-listen.h"
2828
#include "fsmonitor--daemon.h"
2929

30-
struct fsmonitor_daemon_backend_data
30+
struct fsm_listen_data
3131
{
3232
CFStringRef cfsr_worktree_path;
3333
CFStringRef cfsr_gitdir_path;
@@ -158,7 +158,7 @@ static void fsevent_callback(ConstFSEventStreamRef streamRef,
158158
const FSEventStreamEventId event_ids[])
159159
{
160160
struct fsmonitor_daemon_state *state = ctx;
161-
struct fsmonitor_daemon_backend_data *data = state->backend_data;
161+
struct fsm_listen_data *data = state->listen_data;
162162
char **paths = (char **)event_paths;
163163
struct fsmonitor_batch *batch = NULL;
164164
struct string_list cookie_list = STRING_LIST_INIT_DUP;
@@ -350,11 +350,11 @@ int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
350350
NULL,
351351
NULL
352352
};
353-
struct fsmonitor_daemon_backend_data *data;
353+
struct fsm_listen_data *data;
354354
const void *dir_array[2];
355355

356356
CALLOC_ARRAY(data, 1);
357-
state->backend_data = data;
357+
state->listen_data = data;
358358

359359
data->cfsr_worktree_path = CFStringCreateWithCString(
360360
NULL, state->path_worktree_watch.buf, kCFStringEncodingUTF8);
@@ -386,18 +386,18 @@ int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
386386
failed:
387387
error(_("Unable to create FSEventStream."));
388388

389-
FREE_AND_NULL(state->backend_data);
389+
FREE_AND_NULL(state->listen_data);
390390
return -1;
391391
}
392392

393393
void fsm_listen__dtor(struct fsmonitor_daemon_state *state)
394394
{
395-
struct fsmonitor_daemon_backend_data *data;
395+
struct fsm_listen_data *data;
396396

397-
if (!state || !state->backend_data)
397+
if (!state || !state->listen_data)
398398
return;
399399

400-
data = state->backend_data;
400+
data = state->listen_data;
401401

402402
if (data->stream) {
403403
if (data->stream_started)
@@ -407,24 +407,24 @@ void fsm_listen__dtor(struct fsmonitor_daemon_state *state)
407407
FSEventStreamRelease(data->stream);
408408
}
409409

410-
FREE_AND_NULL(state->backend_data);
410+
FREE_AND_NULL(state->listen_data);
411411
}
412412

413413
void fsm_listen__stop_async(struct fsmonitor_daemon_state *state)
414414
{
415-
struct fsmonitor_daemon_backend_data *data;
415+
struct fsm_listen_data *data;
416416

417-
data = state->backend_data;
417+
data = state->listen_data;
418418
data->shutdown_style = SHUTDOWN_EVENT;
419419

420420
CFRunLoopStop(data->rl);
421421
}
422422

423423
void fsm_listen__loop(struct fsmonitor_daemon_state *state)
424424
{
425-
struct fsmonitor_daemon_backend_data *data;
425+
struct fsm_listen_data *data;
426426

427-
data = state->backend_data;
427+
data = state->listen_data;
428428

429429
data->rl = CFRunLoopGetCurrent();
430430

@@ -441,7 +441,7 @@ void fsm_listen__loop(struct fsmonitor_daemon_state *state)
441441

442442
switch (data->shutdown_style) {
443443
case FORCE_ERROR_STOP:
444-
state->error_code = -1;
444+
state->listen_error_code = -1;
445445
/* fall thru */
446446
case FORCE_SHUTDOWN:
447447
ipc_server_stop_async(state->ipc_server_data);
@@ -453,7 +453,7 @@ void fsm_listen__loop(struct fsmonitor_daemon_state *state)
453453
return;
454454

455455
force_error_stop_without_loop:
456-
state->error_code = -1;
456+
state->listen_error_code = -1;
457457
ipc_server_stop_async(state->ipc_server_data);
458458
return;
459459
}

‎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;
@@ -263,7 +263,7 @@ static enum get_relative_result get_relative_longname(
263263

264264
void fsm_listen__stop_async(struct fsmonitor_daemon_state *state)
265265
{
266-
SetEvent(state->backend_data->hListener[LISTENER_SHUTDOWN]);
266+
SetEvent(state->listen_data->hListener[LISTENER_SHUTDOWN]);
267267
}
268268

269269
static struct one_watch *create_watch(struct fsmonitor_daemon_state *state,
@@ -337,7 +337,7 @@ static void destroy_watch(struct one_watch *watch)
337337
free(watch);
338338
}
339339

340-
static int start_rdcw_watch(struct fsmonitor_daemon_backend_data *data,
340+
static int start_rdcw_watch(struct fsm_listen_data *data,
341341
struct one_watch *watch)
342342
{
343343
DWORD dwNotifyFilter =
@@ -516,7 +516,7 @@ static int process_1_worktree_event(
516516
*/
517517
static int process_worktree_events(struct fsmonitor_daemon_state *state)
518518
{
519-
struct fsmonitor_daemon_backend_data *data = state->backend_data;
519+
struct fsm_listen_data *data = state->listen_data;
520520
struct one_watch *watch = data->watch_worktree;
521521
struct strbuf path = STRBUF_INIT;
522522
struct string_list cookie_list = STRING_LIST_INIT_DUP;
@@ -646,7 +646,7 @@ static int process_worktree_events(struct fsmonitor_daemon_state *state)
646646
*/
647647
static int process_gitdir_events(struct fsmonitor_daemon_state *state)
648648
{
649-
struct fsmonitor_daemon_backend_data *data = state->backend_data;
649+
struct fsm_listen_data *data = state->listen_data;
650650
struct one_watch *watch = data->watch_gitdir;
651651
struct strbuf path = STRBUF_INIT;
652652
struct string_list cookie_list = STRING_LIST_INIT_DUP;
@@ -704,11 +704,11 @@ static int process_gitdir_events(struct fsmonitor_daemon_state *state)
704704

705705
void fsm_listen__loop(struct fsmonitor_daemon_state *state)
706706
{
707-
struct fsmonitor_daemon_backend_data *data = state->backend_data;
707+
struct fsm_listen_data *data = state->listen_data;
708708
DWORD dwWait;
709709
int result;
710710

711-
state->error_code = 0;
711+
state->listen_error_code = 0;
712712

713713
if (start_rdcw_watch(data, data->watch_worktree) == -1)
714714
goto force_error_stop;
@@ -773,7 +773,7 @@ void fsm_listen__loop(struct fsmonitor_daemon_state *state)
773773
}
774774

775775
force_error_stop:
776-
state->error_code = -1;
776+
state->listen_error_code = -1;
777777

778778
force_shutdown:
779779
/*
@@ -790,7 +790,7 @@ void fsm_listen__loop(struct fsmonitor_daemon_state *state)
790790

791791
int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
792792
{
793-
struct fsmonitor_daemon_backend_data *data;
793+
struct fsm_listen_data *data;
794794

795795
CALLOC_ARRAY(data, 1);
796796

@@ -823,7 +823,7 @@ int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
823823
data->nr_listener_handles++;
824824
}
825825

826-
state->backend_data = data;
826+
state->listen_data = data;
827827
return 0;
828828

829829
failed:
@@ -836,16 +836,16 @@ int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
836836

837837
void fsm_listen__dtor(struct fsmonitor_daemon_state *state)
838838
{
839-
struct fsmonitor_daemon_backend_data *data;
839+
struct fsm_listen_data *data;
840840

841-
if (!state || !state->backend_data)
841+
if (!state || !state->listen_data)
842842
return;
843843

844-
data = state->backend_data;
844+
data = state->listen_data;
845845

846846
CloseHandle(data->hEventShutdown);
847847
destroy_watch(data->watch_worktree);
848848
destroy_watch(data->watch_gitdir);
849849

850-
FREE_AND_NULL(state->backend_data);
850+
FREE_AND_NULL(state->listen_data);
851851
}

‎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)