core: remove the redundancy of 'n_fds' and 'n_storage_fds' in ExecParameters struct

'n_fds' field in the ExecParameters structure was counting the total number of
file descriptors to be passed to a unit.

This counter also includes the number of passed socket fds which is counted by
'n_socket_fds' already.

This patch removes that redundancy by replacing 'n_fds' with
'n_storage_fds'. The new field only counts the fds passed via the storage store
mechanism.  That way each fd is counted at one place only.

Subsequently the patch makes sure to fix code that used 'n_fds' and also wanted
to iterate through all of them by explicitly adding 'n_socket_fds' + 'n_storage_fds'.

Suggested by Lennart.

This commit is contained in:

Franck Bui

2017-06-08 16:21:35 +02:00

parent 9b1419111a

commit 4c47affcf1

3 changed files with 49 additions and 35 deletions

									
										src/core/execute.h
									
		+1
		-1
	
												View File
												
				@@ -246,7 +246,7 @@ struct ExecParameters {

				        int *fds;

				        char **fd_names;

				        unsigned n_fds;

				        unsigned n_storage_fds;

				        unsigned n_socket_fds;

				        ExecFlags flags;