struct Manager *manager;
int fd;
dev_t devnum;
+
size_t cur;
size_t max;
int pass;
+
double percent;
+
size_t buflen;
bool cancelled;
typedef struct Manager {
sd_event *event;
- Client *clients;
+
+ LIST_HEAD(Client, clients);
+
int clear;
int connection_fd;
+
FILE *console;
double percent;
int numdevices;
+
int plymouth_fd;
+ sd_event_source *plymouth_event_source;
bool plymouth_cancel_sent;
+
bool cancel_requested;
} Manager;
(double) cur / max;
}
-static int request_cancel_client(Client *current) {
+static int client_request_cancel(Client *c) {
FsckdMessage cancel_msg = {
.cancel = 1,
};
ssize_t n;
- n = send(current->fd, &cancel_msg, sizeof(FsckdMessage), 0);
+ assert(c);
+
+ if (c->cancelled)
+ return 0;
+
+ n = send(c->fd, &cancel_msg, sizeof(FsckdMessage), 0);
if (n < 0)
- return log_warning_errno(errno, "Cannot send cancel to fsck on (%u:%u): %m", major(current->devnum), minor(current->devnum));
+ return log_warning_errno(errno, "Cannot send cancel to fsck on (%u:%u): %m", major(c->devnum), minor(c->devnum));
if ((size_t) n < sizeof(FsckdMessage)) {
- log_warning("Short send when sending cancel to fsck on (%u:%u).", major(current->devnum), minor(current->devnum));
+ log_warning("Short send when sending cancel to fsck on (%u:%u).", major(c->devnum), minor(c->devnum));
return -EIO;
}
- current->cancelled = true;
- return 0;
+ c->cancelled = true;
+ return 1;
}
-static void remove_client(Client **first, Client *item) {
- LIST_REMOVE(clients, *first, item);
- safe_close(item->fd);
- free(item);
+static void client_free(Client *c) {
+ assert(c);
+
+ if (c->manager)
+ LIST_REMOVE(clients, c->manager->clients, c);
+
+ safe_close(c->fd);
+ free(c);
}
-static void on_plymouth_disconnect(Manager *m) {
+static void plymouth_disconnect(Manager *m) {
+ assert(m);
+
+ m->plymouth_event_source = sd_event_source_unref(m->plymouth_event_source);
m->plymouth_fd = safe_close(m->plymouth_fd);
m->plymouth_cancel_sent = false;
}
Manager *m = userdata;
Client *current;
char buffer[6];
- int r;
+ ssize_t l;
assert(m);
- r = read(m->plymouth_fd, buffer, sizeof(buffer));
- if (r <= 0)
- on_plymouth_disconnect(m);
- else {
- if (buffer[0] == '\15')
- log_error("Message update to plymouth wasn't delivered successfully");
-
- /* the only answer support type we requested is a key interruption */
- if (buffer[0] == '\2' && buffer[5] == '\3') {
- m->cancel_requested = true;
- /* cancel all connected clients */
- LIST_FOREACH(clients, current, m->clients)
- request_cancel_client(current);
- }
+ l = read(m->plymouth_fd, buffer, sizeof(buffer));
+ if (l < 0) {
+ log_warning_errno(errno, "Got error while reading from plymouth: %m");
+ plymouth_disconnect(m);
+ return -errno;
+ }
+ if (l == 0) {
+ plymouth_disconnect(m);
+ return 0;
+ }
+
+ if (buffer[0] == '\15')
+ log_error("Message update to plymouth wasn't delivered successfully");
+
+ /* the only answer support type we requested is a key interruption */
+ if (buffer[0] == '\2' && buffer[5] == '\3') {
+ m->cancel_requested = true;
+
+ /* cancel all connected clients */
+ LIST_FOREACH(clients, current, m->clients)
+ client_request_cancel(current);
}
return 0;
}
static int send_message_plymouth(Manager *m, const char *message) {
- int r;
const char *plymouth_cancel_message = NULL;
+ int r;
r = connect_plymouth(m);
if (r < 0)
return r;
if (!m->plymouth_cancel_sent) {
- /* indicate to plymouth that we listen to Ctrl+C */
+
+ /* Indicate to plymouth that we listen to Ctrl+C */
r = loop_write(m->plymouth_fd, PLYMOUTH_REQUEST_KEY, sizeof(PLYMOUTH_REQUEST_KEY), true);
if (r < 0)
- return log_warning_errno(errno, "Can't send to plymouth cancel key: %m");
+ return log_warning_errno(r, "Can't send to plymouth cancel key: %m");
+
m->plymouth_cancel_sent = true;
+
plymouth_cancel_message = strjoina("fsckd-cancel-msg:", _("Press Ctrl+C to cancel all filesystem checks in progress"));
+
r = send_message_plymouth_socket(m->plymouth_fd, plymouth_cancel_message, false);
if (r < 0)
log_warning_errno(r, "Can't send filesystem cancel message to plymouth: %m");
+
} else if (m->numdevices == 0) {
+
m->plymouth_cancel_sent = false;
+
r = send_message_plymouth_socket(m->plymouth_fd, "", false);
if (r < 0)
log_warning_errno(r, "Can't clear plymouth filesystem cancel message: %m");
r = send_message_plymouth_socket(m->plymouth_fd, message, true);
if (r < 0)
- return log_warning_errno(errno, "Couldn't send \"%s\" to plymouth: %m", message);
+ return log_warning_errno(r, "Couldn't send \"%s\" to plymouth: %m", message);
return 0;
}
goto fail;
}
- r = sd_event_add_io(m->event, NULL, m->plymouth_fd, EPOLLIN, plymouth_feedback_handler, m);
+ r = sd_event_add_io(m->event, &m->plymouth_event_source, m->plymouth_fd, EPOLLIN, plymouth_feedback_handler, m);
if (r < 0) {
log_warning_errno(r, "Can't listen to plymouth socket: %m");
goto fail;
return 0;
fail:
- on_plymouth_disconnect(m);
+ plymouth_disconnect(m);
return r;
}
m = client->manager;
/* check first if we need to cancel this client */
- if (m->cancel_requested) {
- if (!client->cancelled)
- request_cancel_client(client);
- }
+ if (m->cancel_requested)
+ client_request_cancel(client);
/* ensure we have enough data to read */
r = ioctl(fd, FIONREAD, &buflen);
/* we got twice the same size from a bad behaving client, kick it off the list */
else {
log_warning("Closing bad behaving fsck client connection at fd %d", client->fd);
- remove_client(&(m->clients), client);
+ client_free(client);
r = update_global_progress(m);
if (r < 0)
log_warning_errno(r, "Couldn't update global progress: %m");
r = recv(fd, &fsck_data, sizeof(FsckProgress), 0);
if (r == 0) {
log_debug("Fsck client connected to fd %d disconnected", client->fd);
- remove_client(&(m->clients), client);
+ client_free(client);
} else if (r > 0 && r != sizeof(FsckProgress))
log_warning("Unexpected data structure sent to fsckd socket from fd: %d. Ignoring", client->fd);
else if (r > 0 && r == sizeof(FsckProgress)) {
LIST_PREPEND(clients, m->clients, client);
r = sd_event_add_io(m->event, NULL, client->fd, EPOLLIN, progress_handler, client);
if (r < 0) {
- remove_client(&(m->clients), client);
+ client_free(client);
return r;
}
/* only request the client to cancel now in case the request is dropped by the client (chance to recancel) */
if (m->cancel_requested)
- request_cancel_client(client);
+ client_request_cancel(client);
return 0;
}
static void manager_free(Manager *m) {
- Client *current = NULL, *l = NULL;
if (!m)
return;
fflush(m->console);
}
+ plymouth_disconnect(m);
+
safe_close(m->connection_fd);
- safe_close(m->plymouth_fd);
+
if (m->console)
fclose(m->console);
- LIST_FOREACH_SAFE(clients, current, l, m->clients)
- remove_client(&(m->clients), current);
+ while (m->clients)
+ client_free(m->clients);
sd_event_unref(m->event);