[PATCH v2 3/3] server: Remove no longer used snapshot requests.
Zebediah Figura
z.figura12 at gmail.com
Thu Jul 2 17:05:02 CDT 2020
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
server/Makefile.in | 1 -
server/process.c | 30 ------
server/process.h | 10 --
server/protocol.def | 41 --------
server/snapshot.c | 223 --------------------------------------------
server/thread.c | 24 -----
server/thread.h | 8 --
7 files changed, 337 deletions(-)
delete mode 100644 server/snapshot.c
diff --git a/server/Makefile.in b/server/Makefile.in
index 3f3761faab6..e90c5d1336c 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -33,7 +33,6 @@ C_SRCS = \
semaphore.c \
serial.c \
signal.c \
- snapshot.c \
sock.c \
symlink.c \
thread.c \
diff --git a/server/process.c b/server/process.c
index 6b9557ceb60..96389eed4fe 100644
--- a/server/process.c
+++ b/server/process.c
@@ -1086,36 +1086,6 @@ int set_process_debug_flag( struct process *process, int flag )
return write_process_memory( process, process->peb + 2, 1, &data );
}
-/* take a snapshot of currently running processes */
-struct process_snapshot *process_snap( int *count )
-{
- struct process_snapshot *snapshot, *ptr;
- struct process *process;
-
- if (!running_processes) return NULL;
- if (!(snapshot = mem_alloc( sizeof(*snapshot) * running_processes )))
- return NULL;
- ptr = snapshot;
- LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry )
- {
- if (!process->running_threads) continue;
- ptr->process = process;
- ptr->threads = process->running_threads;
- ptr->count = process->obj.refcount;
- ptr->priority = process->priority;
- ptr->handles = get_handle_table_count(process);
- grab_object( process );
- ptr++;
- }
-
- if (!(*count = ptr - snapshot))
- {
- free( snapshot );
- snapshot = NULL;
- }
- return snapshot;
-}
-
/* create a new process */
DECL_HANDLER(new_process)
{
diff --git a/server/process.h b/server/process.h
index 5b83e111a6f..fb29f21cb12 100644
--- a/server/process.h
+++ b/server/process.h
@@ -100,15 +100,6 @@ struct process
struct list kernel_object; /* list of kernel object pointers */
};
-struct process_snapshot
-{
- struct process *process; /* process ptr */
- int count; /* process refcount */
- int threads; /* number of threads */
- int priority; /* priority class */
- int handles; /* number of handles */
-};
-
#define CPU_FLAG(cpu) (1 << (cpu))
#define CPU_64BIT_MASK (CPU_FLAG(CPU_x86_64) | CPU_FLAG(CPU_ARM64))
@@ -137,7 +128,6 @@ extern void kill_process( struct process *process, int violent_death );
extern void kill_console_processes( struct thread *renderer, int exit_code );
extern void kill_debugged_processes( struct thread *debugger, int exit_code );
extern void detach_debugged_processes( struct thread *debugger );
-extern struct process_snapshot *process_snap( int *count );
extern void enum_processes( int (*cb)(struct process*, void*), void *user);
/* console functions */
diff --git a/server/protocol.def b/server/protocol.def
index 2737cd6fddd..7f0202c2b00 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -1878,47 +1878,6 @@ enum char_info_mode
@END
-#define SNAP_PROCESS 0x00000001
-#define SNAP_THREAD 0x00000002
-/* Create a snapshot */
- at REQ(create_snapshot)
- unsigned int attributes; /* object attributes */
- unsigned int flags; /* snapshot flags (SNAP_*) */
- at REPLY
- obj_handle_t handle; /* handle to the snapshot */
- at END
-
-
-/* Get the next process from a snapshot */
- at REQ(next_process)
- obj_handle_t handle; /* handle to the snapshot */
- int reset; /* reset snapshot position? */
- at REPLY
- int count; /* process usage count */
- process_id_t pid; /* process id */
- process_id_t ppid; /* parent process id */
- int threads; /* number of threads */
- int priority; /* process priority */
- int handles; /* number of handles */
- int unix_pid; /* Unix pid */
- VARARG(filename,unicode_str); /* file name of main exe */
- at END
-
-
-/* Get the next thread from a snapshot */
- at REQ(next_thread)
- obj_handle_t handle; /* handle to the snapshot */
- int reset; /* reset snapshot position? */
- at REPLY
- int count; /* thread usage count */
- process_id_t pid; /* process id */
- thread_id_t tid; /* thread id */
- int base_pri; /* base priority */
- int delta_pri; /* delta priority */
- int unix_tid; /* thread native pid */
- at END
-
-
struct thread_info
{
thread_id_t tid;
diff --git a/server/snapshot.c b/server/snapshot.c
deleted file mode 100644
index bdceaef5302..00000000000
--- a/server/snapshot.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Server-side snapshots
- *
- * Copyright (C) 1999 Alexandre Julliard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- *
- * FIXME: heap snapshots not implemented
- */
-
-#include "config.h"
-#include "wine/port.h"
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include "windef.h"
-#include "winternl.h"
-
-#include "handle.h"
-#include "process.h"
-#include "thread.h"
-#include "request.h"
-
-
-struct snapshot
-{
- struct object obj; /* object header */
- struct process_snapshot *processes; /* processes snapshot */
- int process_count; /* count of processes */
- int process_pos; /* current position in proc snapshot */
- struct thread_snapshot *threads; /* threads snapshot */
- int thread_count; /* count of threads */
- int thread_pos; /* current position in thread snapshot */
-};
-
-static void snapshot_dump( struct object *obj, int verbose );
-static void snapshot_destroy( struct object *obj );
-
-static const struct object_ops snapshot_ops =
-{
- sizeof(struct snapshot), /* size */
- snapshot_dump, /* dump */
- no_get_type, /* get_type */
- no_add_queue, /* add_queue */
- NULL, /* remove_queue */
- NULL, /* signaled */
- NULL, /* satisfied */
- no_signal, /* signal */
- no_get_fd, /* get_fd */
- no_map_access, /* map_access */
- default_get_sd, /* get_sd */
- default_set_sd, /* set_sd */
- no_lookup_name, /* lookup_name */
- no_link_name, /* link_name */
- NULL, /* unlink_name */
- no_open_file, /* open_file */
- no_kernel_obj_list, /* get_kernel_obj_list */
- no_close_handle, /* close_handle */
- snapshot_destroy /* destroy */
-};
-
-
-/* create a new snapshot */
-static struct snapshot *create_snapshot( unsigned int flags )
-{
- struct snapshot *snapshot;
-
- if (!(snapshot = alloc_object( &snapshot_ops ))) return NULL;
-
- snapshot->process_pos = 0;
- snapshot->process_count = 0;
- if (flags & SNAP_PROCESS)
- snapshot->processes = process_snap( &snapshot->process_count );
-
- snapshot->thread_pos = 0;
- snapshot->thread_count = 0;
- if (flags & SNAP_THREAD)
- snapshot->threads = thread_snap( &snapshot->thread_count );
-
- return snapshot;
-}
-
-/* get the next process in the snapshot */
-static int snapshot_next_process( struct snapshot *snapshot, struct next_process_reply *reply )
-{
- struct process_snapshot *ptr;
- struct process_dll *exe_module;
-
- if (!snapshot->process_count)
- {
- set_error( STATUS_INVALID_PARAMETER ); /* FIXME */
- return 0;
- }
- if (snapshot->process_pos >= snapshot->process_count)
- {
- set_error( STATUS_NO_MORE_FILES );
- return 0;
- }
- ptr = &snapshot->processes[snapshot->process_pos++];
- reply->count = ptr->count;
- reply->pid = get_process_id( ptr->process );
- reply->ppid = ptr->process->parent_id;
- reply->threads = ptr->threads;
- reply->priority = ptr->priority;
- reply->handles = ptr->handles;
- reply->unix_pid = ptr->process->unix_pid;
- if ((exe_module = get_process_exe_module( ptr->process )) && exe_module->filename)
- {
- data_size_t len = min( exe_module->namelen, get_reply_max_size() );
- set_reply_data( exe_module->filename, len );
- }
- return 1;
-}
-
-/* get the next thread in the snapshot */
-static int snapshot_next_thread( struct snapshot *snapshot, struct next_thread_reply *reply )
-{
- struct thread_snapshot *ptr;
-
- if (!snapshot->thread_count)
- {
- set_error( STATUS_INVALID_PARAMETER ); /* FIXME */
- return 0;
- }
- if (snapshot->thread_pos >= snapshot->thread_count)
- {
- set_error( STATUS_NO_MORE_FILES );
- return 0;
- }
- ptr = &snapshot->threads[snapshot->thread_pos++];
- reply->count = ptr->count;
- reply->pid = get_process_id( ptr->thread->process );
- reply->tid = get_thread_id( ptr->thread );
- reply->base_pri = ptr->priority;
- reply->delta_pri = 0; /* FIXME */
- reply->unix_tid = ptr->thread->unix_tid;
- return 1;
-}
-
-static void snapshot_dump( struct object *obj, int verbose )
-{
- struct snapshot *snapshot = (struct snapshot *)obj;
- assert( obj->ops == &snapshot_ops );
- fprintf( stderr, "Snapshot: %d procs %d threads\n",
- snapshot->process_count, snapshot->thread_count );
-}
-
-static void snapshot_destroy( struct object *obj )
-{
- int i;
- struct snapshot *snapshot = (struct snapshot *)obj;
- assert( obj->ops == &snapshot_ops );
- if (snapshot->process_count)
- {
- for (i = 0; i < snapshot->process_count; i++)
- release_object( snapshot->processes[i].process );
- free( snapshot->processes );
- }
- if (snapshot->thread_count)
- {
- for (i = 0; i < snapshot->thread_count; i++)
- release_object( snapshot->threads[i].thread );
- free( snapshot->threads );
- }
-}
-
-/* create a snapshot */
-DECL_HANDLER(create_snapshot)
-{
- struct snapshot *snapshot;
-
- reply->handle = 0;
- if ((snapshot = create_snapshot( req->flags )))
- {
- reply->handle = alloc_handle( current->process, snapshot, 0, req->attributes );
- release_object( snapshot );
- }
-}
-
-/* get the next process from a snapshot */
-DECL_HANDLER(next_process)
-{
- struct snapshot *snapshot;
-
- if ((snapshot = (struct snapshot *)get_handle_obj( current->process, req->handle,
- 0, &snapshot_ops )))
- {
- if (req->reset) snapshot->process_pos = 0;
- snapshot_next_process( snapshot, reply );
- release_object( snapshot );
- }
-}
-
-/* get the next thread from a snapshot */
-DECL_HANDLER(next_thread)
-{
- struct snapshot *snapshot;
-
- if ((snapshot = (struct snapshot *)get_handle_obj( current->process, req->handle,
- 0, &snapshot_ops )))
- {
- if (req->reset) snapshot->thread_pos = 0;
- snapshot_next_thread( snapshot, reply );
- release_object( snapshot );
- }
-}
diff --git a/server/thread.c b/server/thread.c
index d55af204bda..9b14174578e 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -1299,30 +1299,6 @@ static unsigned int get_context_system_regs( enum cpu_type cpu )
return 0;
}
-/* take a snapshot of currently running threads */
-struct thread_snapshot *thread_snap( int *count )
-{
- struct thread_snapshot *snapshot, *ptr;
- struct thread *thread;
- int total = 0;
-
- LIST_FOR_EACH_ENTRY( thread, &thread_list, struct thread, entry )
- if (thread->state != TERMINATED) total++;
- if (!total || !(snapshot = mem_alloc( sizeof(*snapshot) * total ))) return NULL;
- ptr = snapshot;
- LIST_FOR_EACH_ENTRY( thread, &thread_list, struct thread, entry )
- {
- if (thread->state == TERMINATED) continue;
- ptr->thread = thread;
- ptr->count = thread->obj.refcount;
- ptr->priority = thread->priority;
- grab_object( thread );
- ptr++;
- }
- *count = total;
- return snapshot;
-}
-
/* gets the current impersonation token */
struct token *thread_get_impersonation_token( struct thread *thread )
{
diff --git a/server/thread.h b/server/thread.h
index 183f6baa0f2..650bc44628d 100644
--- a/server/thread.h
+++ b/server/thread.h
@@ -93,13 +93,6 @@ struct thread
WCHAR *desc; /* thread description string */
};
-struct thread_snapshot
-{
- struct thread *thread; /* thread ptr */
- int count; /* thread refcount */
- int priority; /* priority class */
-};
-
extern struct thread *current;
/* thread functions */
@@ -125,7 +118,6 @@ extern int thread_queue_apc( struct process *process, struct thread *thread, str
extern void thread_cancel_apc( struct thread *thread, struct object *owner, enum apc_type type );
extern int thread_add_inflight_fd( struct thread *thread, int client, int server );
extern int thread_get_inflight_fd( struct thread *thread, int client );
-extern struct thread_snapshot *thread_snap( int *count );
extern struct token *thread_get_impersonation_token( struct thread *thread );
extern int set_thread_affinity( struct thread *thread, affinity_t affinity );
extern int is_cpu_supported( enum cpu_type cpu );
--
2.27.0
More information about the wine-devel
mailing list