[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.242 by root, Mon Apr 16 12:37:08 2007 UTC vs.
Revision 1.252 by root, Wed Apr 18 15:28:18 2007 UTC

…		…
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Symbol;	6	use Symbol;
7	use List::Util;	7	use List::Util;
		8	use Socket;
8	use Storable;	9	use Storable;
9	use Event;	10	use Event;
10	use Opcode;	11	use Opcode;
11	use Safe;	12	use Safe;
12	use Safe::Hole;	13	use Safe::Hole;
13		14
14	use Coro 3.52 ();	15	use Coro 3.61 ();
15	use Coro::State;	16	use Coro::State;
		17	use Coro::Handle;
16	use Coro::Event;	18	use Coro::Event;
17	use Coro::Timer;	19	use Coro::Timer;
18	use Coro::Signal;	20	use Coro::Signal;
19	use Coro::Semaphore;	21	use Coro::Semaphore;
20	use Coro::AIO;	22	use Coro::AIO;
…		…
54		56
55	our $RELOAD; # number of reloads so far	57	our $RELOAD; # number of reloads so far
56	our @EVENT;	58	our @EVENT;
57	our $LIBDIR = datadir . "/ext";	59	our $LIBDIR = datadir . "/ext";
58		60
59	our $TICK = MAX_TIME * 1e-6;	61	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
60	our $TICK_WATCHER;	62	our $TICK_WATCHER;
61	our $AIO_POLL_WATCHER;	63	our $AIO_POLL_WATCHER;
62	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	64	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
63	our $NEXT_TICK;	65	our $NEXT_TICK;
64	our $NOW;	66	our $NOW;
…		…
146	=cut	148	=cut
147		149
148	BEGIN {	150	BEGIN {
149	*CORE::GLOBAL::warn = sub {	151	*CORE::GLOBAL::warn = sub {
150	my $msg = join "", @_;	152	my $msg = join "", @_;
151	utf8::encode $msg;
152		153
153	$msg .= "\n"	154	$msg .= "\n"
154	unless $msg =~ /\n$/;	155	unless $msg =~ /\n$/;
155		156
		157	$msg =~ s/([\x00-\x09\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
		158
		159	utf8::encode $msg;
156	LOG llevError, $msg;	160	LOG llevError, $msg;
157	};	161	};
158	}	162	}
159		163
160	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	164	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
2262	#############################################################################	2266	#############################################################################
2263		2267
2264	=head2 EXTENSION DATABASE SUPPORT	2268	=head2 EXTENSION DATABASE SUPPORT
2265		2269
2266	Crossfire maintains a very simple database for extension use. It can	2270	Crossfire maintains a very simple database for extension use. It can
2267	currently store anything that can be serialised using Storable, which	2271	currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2268	excludes objects.	2272	convert to/from binary).
2269		2273
2270	The parameter C<$family> should best start with the name of the extension	2274	The parameter C<$family> should best start with the name of the extension
2271	using it, it should be unique.	2275	using it, it should be unique.
2272		2276
2273	=over 4	2277	=over 4
…		…
2296	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;	2300	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
2297	cf::cleanup "db_open(db): $!" if $!;	2301	cf::cleanup "db_open(db): $!" if $!;
2298	};	2302	};
2299	cf::cleanup "db_open(db): $@" if $@;	2303	cf::cleanup "db_open(db): $@" if $@;
2300	};	2304	};
2301
2302	my $path = cf::localdir . "/database.pst";
2303	if (stat $path) {
2304	cf::sync_job {
2305	my $pst = Storable::retrieve $path;
2306
2307	cf::db_put (board => data => $pst->{board});
2308	cf::db_put (guildrules => data => $pst->{guildrules});
2309	cf::db_put (rent => balance => $pst->{rent}{balance});
2310	BDB::db_env_txn_checkpoint $DB_ENV;
2311
2312	unlink $path;
2313	};
2314	}
2315	}	2305	}
2316	}	2306	}
2317		2307
2318	sub db_get($$) {	2308	sub db_get($$) {
2319	my $key = "$_[0]/$_[1]";	2309	my $key = "$_[0]/$_[1]";
2320		2310
2321	cf::sync_job {	2311	cf::sync_job {
2322	BDB::db_get $DB, undef, $key, my $data;	2312	BDB::db_get $DB, undef, $key, my $data;
2323		2313
2324	$! ? ()	2314	$! ? ()
2325	: Compress::LZF::sthaw $data	2315	: $data
2326	}	2316	}
2327	}	2317	}
2328		2318
2329	sub db_put($$$) {	2319	sub db_put($$$) {
2330	BDB::dbreq_pri 4;	2320	BDB::dbreq_pri 4;
2331	BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };	2321	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2332	}	2322	}
		2323
		2324	=item cf::cache $id => [$paths...], $processversion => $process
		2325
		2326	Generic caching function that returns the value of the resource $id,
		2327	caching and regenerating as required.
		2328
		2329	This function can block.
		2330
		2331	=cut
		2332
		2333	sub cache {
		2334	my ($id, $src, $processversion, $process) = @_;
		2335
		2336	my $meta =
		2337	join "\x00",
		2338	$processversion,
		2339	map {
		2340	aio_stat $_
		2341	and Carp::croak "$_: $!";
		2342
		2343	($_, (stat _)[7,9])
		2344	} @$src;
		2345
		2346	my $dbmeta = db_get cache => "$id/meta";
		2347	if ($dbmeta ne $meta) {
		2348	# changed, we may need to process
		2349
		2350	my @data;
		2351	my $md5;
		2352
		2353	for (0 .. $#$src) {
		2354	0 <= aio_load $src->[$_], $data[$_]
		2355	or Carp::croak "$src->[$_]: $!";
		2356	}
		2357
		2358	# if processing is expensive, check
		2359	# checksum first
		2360	if (1) {
		2361	$md5 =
		2362	join "\x00",
		2363	$processversion,
		2364	map {
		2365	Coro::cede;
		2366	($src->[$_], Digest::MD5::md5_hex $data[$_])
		2367	} 0.. $#$src;
		2368
		2369
		2370	my $dbmd5 = db_get cache => "$id/md5";
		2371	if ($dbmd5 eq $md5) {
		2372	db_put cache => "$id/meta", $meta;
		2373
		2374	return db_get cache => "$id/data";
		2375	}
		2376	}
		2377
		2378	my $data = $process->(\@data);
		2379
		2380	db_put cache => "$id/data", $data;
		2381	db_put cache => "$id/md5" , $md5;
		2382	db_put cache => "$id/meta", $meta;
		2383
		2384	return $data;
		2385	}
		2386
		2387	db_get cache => "$id/data"
		2388	}
		2389
		2390	=item fork_call { }, $args
		2391
		2392	Executes the given code block with the given arguments in a seperate
		2393	process, returning the results. Everything must be serialisable with
		2394	Coro::Storable. May, of course, block. Note that the executed sub may
		2395	never block itself or use any form of Event handling.
		2396
		2397	=cut
		2398
		2399	sub fork_call(&@) {
		2400	my ($cb, @args) = @_;
		2401
		2402	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
		2403	# or die "socketpair: $!";
		2404	pipe my $fh1, my $fh2
		2405	or die "pipe: $!";
		2406
		2407	if (my $pid = fork) {
		2408	close $fh2;
		2409
		2410	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
		2411	$res = Coro::Storable::thaw $res;
		2412
		2413	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
		2414
		2415	die $$res unless "ARRAY" eq ref $res;
		2416
		2417	return wantarray ? @$res : $res->[-1];
		2418	} else {
		2419	local $SIG{__WARN__};
		2420	eval {
		2421	local $SIG{__DIE__};
		2422	close $fh1;
		2423
		2424	my @res = eval { $cb->(@args) };
		2425	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
		2426	};
		2427
		2428	warn $@ if $@;
		2429	_exit 0;
		2430	}
		2431	}
		2432
		2433
2333		2434
2334	#############################################################################	2435	#############################################################################
2335	# the server's init and main functions	2436	# the server's init and main functions
2336		2437
2337	sub load_facedata {	2438	sub load_facedata($) {
2338	my $path = sprintf "%s/facedata", cf::datadir;	2439	my ($path) = @_;
2339		2440
2340	warn "loading facedata from $path\n";	2441	warn "loading facedata from $path\n";
2341		2442
2342	my $facedata;	2443	my $facedata;
2343	0 < aio_load $path, $facedata	2444	0 < aio_load $path, $facedata
…		…
2384	}	2485	}
2385		2486
2386	1	2487	1
2387	}	2488	}
2388		2489
2389	our $archetypes_loaded;	2490	sub reload_facedata {
2390
2391	sub load_archetypes {
2392	return 1 if $archetypes_loaded++; # current can only load them once
2393	# load_archetype_file sprintf "%s/archetypes", cf::datadir;
2394	load_archetype_file sprintf "%s/archetypes", cf::datadir	2491	load_facedata sprintf "%s/facedata", cf::datadir
		2492	or die "unable to load facedata\n";
2395	}	2493	}
2396		2494
2397	sub load_treasures {
2398	load_treasure_file sprintf "%s/treasures", cf::datadir
2399	}
2400
2401	sub reload_resources {	2495	sub reload_regions {
2402	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir	2496	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2403	or die "unable to load regions file\n";	2497	or die "unable to load regions file\n";
2404	load_facedata	2498	}
2405	or die "unable to load facedata\n";	2499
2406	load_archetypes	2500	sub reload_archetypes {
		2501	load_resource_file sprintf "%s/archetypes", cf::datadir
2407	or die "unable to load archetypes\n";	2502	or die "unable to load archetypes\n";
2408	load_treasures	2503	}
		2504
		2505	sub reload_treasures {
		2506	load_resource_file sprintf "%s/treasures", cf::datadir
2409	or die "unable to load treasurelists\n";	2507	or die "unable to load treasurelists\n";
		2508	}
		2509
		2510	sub reload_resources {
		2511	warn "reloading resource files...\n";
		2512
		2513	reload_regions;
		2514	reload_facedata;
		2515	reload_archetypes;
		2516	reload_treasures;
		2517
		2518	warn "finished reloading resource files\n";
2410	}	2519	}
2411		2520
2412	sub init {	2521	sub init {
2413	reload_resources;	2522	reload_resources;
2414	}	2523	}
…		…
2507		2616
2508	warn Carp::longmess "post_cleanup backtrace"	2617	warn Carp::longmess "post_cleanup backtrace"
2509	if $make_core;	2618	if $make_core;
2510	}	2619	}
2511		2620
2512	sub reload() {	2621	sub do_reload_perl() {
2513	# can/must only be called in main	2622	# can/must only be called in main
2514	if ($Coro::current != $Coro::main) {	2623	if ($Coro::current != $Coro::main) {
2515	warn "can only reload from main coroutine";	2624	warn "can only reload from main coroutine";
2516	return;	2625	return;
2517	}	2626	}
…		…
2592	Symbol::delete_package "safe::$_"	2701	Symbol::delete_package "safe::$_"
2593	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2702	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2594		2703
2595	warn "unloading cf.pm \"a bit\"";	2704	warn "unloading cf.pm \"a bit\"";
2596	delete $INC{"cf.pm"};	2705	delete $INC{"cf.pm"};
		2706	delete $INC{"cf/pod.pm"};
2597		2707
2598	# don't, removes xs symbols, too,	2708	# don't, removes xs symbols, too,
2599	# and global variables created in xs	2709	# and global variables created in xs
2600	#Symbol::delete_package __PACKAGE__;	2710	#Symbol::delete_package __PACKAGE__;
2601		2711
…		…
2616	warn "reattaching attachments to maps";	2726	warn "reattaching attachments to maps";
2617	reattach $_ for values %MAP;	2727	reattach $_ for values %MAP;
2618	warn "reattaching attachments to players";	2728	warn "reattaching attachments to players";
2619	reattach $_ for values %PLAYER;	2729	reattach $_ for values %PLAYER;
2620		2730
2621	warn "loading reloadable resources";
2622	reload_resources;
2623
2624	warn "leaving sync_job";	2731	warn "leaving sync_job";
2625		2732
2626	1	2733	1
2627	} or do {	2734	} or do {
2628	warn $@;	2735	warn $@;
…		…
2633	warn "reloaded";	2740	warn "reloaded";
2634	};	2741	};
2635		2742
2636	our $RELOAD_WATCHER; # used only during reload	2743	our $RELOAD_WATCHER; # used only during reload
2637		2744
		2745	sub reload_perl() {
		2746	# doing reload synchronously and two reloads happen back-to-back,
		2747	# coro crashes during coro_state_free->destroy here.
		2748
		2749	$RELOAD_WATCHER \|\|= Event->timer (
		2750	reentrant => 0,
		2751	after => 0,
		2752	data => WF_AUTOCANCEL,
		2753	cb => sub {
		2754	do_reload_perl;
		2755	undef $RELOAD_WATCHER;
		2756	},
		2757	);
		2758	}
		2759
2638	register_command "reload" => sub {	2760	register_command "reload" => sub {
2639	my ($who, $arg) = @_;	2761	my ($who, $arg) = @_;
2640		2762
2641	if ($who->flag (FLAG_WIZ)) {	2763	if ($who->flag (FLAG_WIZ)) {
2642	$who->message ("reloading server.");	2764	$who->message ("reloading server.");
2643		2765	async { reload_perl };
2644	# doing reload synchronously and two reloads happen back-to-back,
2645	# coro crashes during coro_state_free->destroy here.
2646
2647	$RELOAD_WATCHER \|\|= Event->timer (
2648	reentrant => 0,
2649	after => 0,
2650	data => WF_AUTOCANCEL,
2651	cb => sub {
2652	reload;
2653	undef $RELOAD_WATCHER;
2654	},
2655	);
2656	}	2766	}
2657	};	2767	};
2658		2768
2659	unshift @INC, $LIBDIR;	2769	unshift @INC, $LIBDIR;
2660		2770
…		…
2695	}	2805	}
2696		2806
2697	$NOW = Event::time;	2807	$NOW = Event::time;
2698		2808
2699	cf::server_tick; # one server iteration	2809	cf::server_tick; # one server iteration
		2810
2700	$RUNTIME += $TICK;	2811	$RUNTIME += $TICK;
2701	$NEXT_TICK += $TICK;	2812	$NEXT_TICK += $TICK;
2702		2813
2703	if ($NOW >= $NEXT_RUNTIME_WRITE) {	2814	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2704	$NEXT_RUNTIME_WRITE = $NOW + 10;	2815	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
2706	write_runtime	2817	write_runtime
2707	or warn "ERROR: unable to write runtime file: $!";	2818	or warn "ERROR: unable to write runtime file: $!";
2708	};	2819	};
2709	}	2820	}
2710		2821
		2822	# my $AFTER = Event::time;
		2823	# warn $AFTER - $NOW;#d#
		2824
		2825	# if we are delayed by four ticks or more, skip them all
		2826	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
		2827
		2828	$TICK_WATCHER->at ($NEXT_TICK);
		2829	$TICK_WATCHER->start;
		2830
2711	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	2831	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2712	$sig->send;	2832	$sig->send;
2713	}	2833	}
2714	while (my $sig = shift @WAIT_FOR_TICK) {	2834	while (my $sig = shift @WAIT_FOR_TICK) {
2715	$sig->send;	2835	$sig->send;
2716	}	2836	}
2717		2837
2718	# my $AFTER = Event::time;	2838	_post_tick;
2719	# warn $AFTER - $NOW;#d#
2720
2721	# if we are delayed by four ticks or more, skip them all
2722	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2723
2724	$TICK_WATCHER->at ($NEXT_TICK);
2725	$TICK_WATCHER->start;
2726	},	2839	},
2727	);	2840	);
2728		2841
2729	{	2842	{
2730	BDB::max_poll_time $TICK * 0.1;	2843	BDB::max_poll_time $TICK * 0.1;
…		…
2789	prio => 6,	2902	prio => 6,
2790	cb => \&IO::AIO::poll_cb,	2903	cb => \&IO::AIO::poll_cb,
2791	);	2904	);
2792	}	2905	}
2793		2906
		2907	# load additional modules
		2908	use cf::pod;
		2909
2794	END { cf::emergency_save }	2910	END { cf::emergency_save }
2795		2911
2796	1	2912	1
2797		2913

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.242 by root, Mon Apr 16 12:37:08 2007 UTC vs. Revision 1.252 by root, Wed Apr 18 15:28:18 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.242 by root, Mon Apr 16 12:37:08 2007 UTC vs.
Revision 1.252 by root, Wed Apr 18 15:28:18 2007 UTC