stable on windows build

Vladimir Ershov · Vladimir Ershov · commit 2caa611aedda · 2017-02-05T23:28:35.000+03:00
diff --git a/src/pgpro_scheduler.c b/src/pgpro_scheduler.c
@@ -1,5 +1,4 @@
 #include "postgres.h"
-#include "port.h"
 
 #include "miscadmin.h"
 #include "postmaster/bgworker.h"
@@ -43,12 +42,12 @@ volatile sig_atomic_t got_sighup = false;
 volatile sig_atomic_t got_sigterm = false;
 
 /* Custom GUC variables */
-static char *scheduler_databases = NULL;
-static char *scheduler_nodename = NULL;
-static char *scheduler_transaction_state = NULL;
-static int  scheduler_max_workers = 2;
-static bool scheduler_service_enabled = false;
-static char *scheduler_schema = NULL;
+char *scheduler_databases = NULL;
+char *scheduler_nodename = NULL;
+char *scheduler_transaction_state = NULL;
+int  scheduler_max_workers = 2;
+bool scheduler_service_enabled = false;
+char *scheduler_schema = NULL;
 /* Custom GUC done */
 
 extern void
@@ -281,10 +280,11 @@ void parent_scheduler_main(Datum arg)
 	schd_manager_share_t *shared;
 	bool refresh = false;
 
+	CurrentResourceOwner = ResourceOwnerCreate(NULL, "pgpro_scheduler");
+
 	init_worker_mem_ctx("Parent scheduler context");
 	elog(LOG, "Start PostgresPro scheduler."); 
 
-	/*CurrentResourceOwner = ResourceOwnerCreate(NULL, "pgpro_scheduler");*/
 	SetConfigOption("application_name", "pgp-s supervisor", PGC_USERSET, PGC_S_SESSION);
 	pgstat_report_activity(STATE_RUNNING, "Initialize");
 	pqsignal(SIGHUP, worker_spi_sighup);
@@ -388,13 +388,13 @@ pg_scheduler_startup(void)
 		BGWORKER_BACKEND_DATABASE_CONNECTION;
 	worker.bgw_start_time = BgWorkerStart_ConsistentState;
 	worker.bgw_restart_time = BGW_NEVER_RESTART;
-	worker.bgw_main = parent_scheduler_main;
+	worker.bgw_main = NULL;
 	worker.bgw_notify_pid = 0;
-	worker.bgw_main_arg = 0;
-	strcpy(worker.bgw_name, "pgpro scheduler");
-
-	/* elog(LOG, "Register WORKER"); */
-
+	worker.bgw_main_arg = Int32GetDatum(0);
+	worker.bgw_extra[0] = 0;
+	memcpy(worker.bgw_function_name, "parent_scheduler_main", 22);
+	memcpy(worker.bgw_library_name, "pgpro_scheduler", 16);
+	memcpy(worker.bgw_name, "pgpro scheduler", 16);
 
 	RegisterBackgroundWorker(&worker); 
 }
diff --git a/src/pgpro_scheduler.h b/src/pgpro_scheduler.h
@@ -29,9 +29,8 @@ void pg_scheduler_startup(void);
 char_array_t *readBasesToCheck(void);
 extern Datum cron_string_to_json_text(PG_FUNCTION_ARGS);
 void _PG_init(void);
-void parent_scheduler_main(Datum) pg_attribute_noreturn();
+extern PGDLLEXPORT void parent_scheduler_main(Datum) pg_attribute_noreturn();
 int checkSchedulerNamespace(void);
-void manager_worker_main(Datum arg);
 pid_t registerManagerWorker(schd_manager_t *man);
 
 void reload_db_role_config(char *dbname);
diff --git a/src/scheduler_executor.h b/src/scheduler_executor.h
@@ -38,7 +38,7 @@ typedef struct {
 	char **errors;
 } executor_error_t;
 
-void executor_worker_main(Datum arg);
+extern PGDLLEXPORT void executor_worker_main(Datum arg);
 job_t *initializeExecutorJob(schd_executor_share_t *data);
 void set_shared_message(schd_executor_share_t *shared, executor_error_t *ee);
 TimestampTz get_next_excution_time(char *sql, executor_error_t *ee);
diff --git a/src/scheduler_job.h b/src/scheduler_job.h
@@ -32,7 +32,6 @@ typedef struct {
 job_t *init_scheduler_job(job_t *j);
 job_t *get_expired_jobs(char *nodename, int *n, int *is_error);
 job_t *get_jobs_to_do(char *nodename, int *n, int *is_error);
-/*job_t *set_job_error(job_t *j, const char *fmt, ...) __attribute__ ((format (gnu_printf, 2, 3)));;*/
 job_t *set_job_error(job_t *j, const char *fmt, ...) pg_attribute_printf(2, 3);
 int move_job_to_log(job_t *j, bool status);
 void destroy_job(job_t *j, int selfdestroy);
diff --git a/src/scheduler_manager.h b/src/scheduler_manager.h
@@ -64,7 +64,7 @@ typedef struct {
 } scheduler_manager_ctx_t;
 
 int checkSchedulerNamespace(void);
-void manager_worker_main(Datum arg);
+extern PGDLLEXPORT void manager_worker_main(Datum arg);
 int get_scheduler_maxworkers(void);
 char *get_scheduler_nodename(void);
 scheduler_manager_ctx_t *initialize_scheduler_manager_context(char *dbname, dsm_segment *seg);
