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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.231 by root, Wed Apr 4 00:02:06 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;
		23	use Coro::Storable;
21		24
22	use BDB ();	25	use BDB ();
23	use Data::Dumper;	26	use Data::Dumper;
24	use Digest::MD5;	27	use Digest::MD5;
25	use Fcntl;	28	use Fcntl;
…		…
28	use Time::HiRes;	31	use Time::HiRes;
29	use Compress::LZF;	32	use Compress::LZF;
30		33
31	# configure various modules to our taste	34	# configure various modules to our taste
32	#	35	#
		36	$Storable::canonical = 1; # reduce rsync transfers
33	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	37	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	38	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35		39
36	$Event::Eval = 1; # no idea why this is required, but it is	40	$Event::Eval = 1; # no idea why this is required, but it is
37		41
…		…
52		56
53	our $RELOAD; # number of reloads so far	57	our $RELOAD; # number of reloads so far
54	our @EVENT;	58	our @EVENT;
55	our $LIBDIR = datadir . "/ext";	59	our $LIBDIR = datadir . "/ext";
56		60
57	our $TICK = MAX_TIME * 1e-6;	61	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
58	our $TICK_WATCHER;	62	our $TICK_WATCHER;
59	our $AIO_POLL_WATCHER;	63	our $AIO_POLL_WATCHER;
60	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	64	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
61	our $NEXT_TICK;	65	our $NEXT_TICK;
62	our $NOW;	66	our $NOW;
…		…
74	our %MAP; # all maps	78	our %MAP; # all maps
75	our $LINK_MAP; # the special {link} map, which is always available	79	our $LINK_MAP; # the special {link} map, which is always available
76	our $RANDOM_MAPS = cf::localdir . "/random";	80	our $RANDOM_MAPS = cf::localdir . "/random";
77	our $BDB_ENV_DIR = cf::localdir . "/db";	81	our $BDB_ENV_DIR = cf::localdir . "/db";
78		82
79	our $WAIT_FOR_TICK; $WAIT_FOR_TICK \|\|= new Coro::Signal;
80	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE \|\|= new Coro::Signal;
81
82	# used to convert map paths into valid unix filenames by replacing / by ∕	83	# used to convert map paths into valid unix filenames by replacing / by ∕
83	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	84	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
84		85
85	binmode STDOUT;	86	binmode STDOUT;
86	binmode STDERR;	87	binmode STDERR;
…		…
134	=item %cf::CFG	135	=item %cf::CFG
135		136
136	Configuration for the server, loaded from C</etc/crossfire/config>, or	137	Configuration for the server, loaded from C</etc/crossfire/config>, or
137	from wherever your confdir points to.	138	from wherever your confdir points to.
138		139
139	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE	140	=item cf::wait_for_tick, cf::wait_for_tick_begin
140		141
141	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)	142	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
142	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick	143	returns directly I<after> the tick processing (and consequently, can only wake one process
143	processing has been done. Call C<< ->wait >> on them to maximise the	144	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
144	window of cpu time available, or simply to synchronise to the server tick.
145		145
146	=back	146	=back
147		147
148	=cut	148	=cut
149		149
150	BEGIN {	150	BEGIN {
151	*CORE::GLOBAL::warn = sub {	151	*CORE::GLOBAL::warn = sub {
152	my $msg = join "", @_;	152	my $msg = join "", @_;
153	utf8::encode $msg;
154		153
155	$msg .= "\n"	154	$msg .= "\n"
156	unless $msg =~ /\n$/;	155	unless $msg =~ /\n$/;
157		156
		157	$msg =~ s/([\x00-\x09\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
		158
		159	utf8::encode $msg;
158	LOG llevError, $msg;	160	LOG llevError, $msg;
159	};	161	};
160	}	162	}
161		163
162	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	164	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
963	}	965	}
964		966
965	sub path($) {	967	sub path($) {
966	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];	968	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
967		969
968	(playerdir $login) . "/$login.pl"	970	(playerdir $login) . "/playerdata"
969	}	971	}
970		972
971	sub find_active($) {	973	sub find_active($) {
972	$cf::PLAYER{$_[0]}	974	$cf::PLAYER{$_[0]}
973	and $cf::PLAYER{$_[0]}->active	975	and $cf::PLAYER{$_[0]}->active
…		…
986	my $login = $_[0];	988	my $login = $_[0];
987		989
988	my $guard = cf::lock_acquire "user_find:$login";	990	my $guard = cf::lock_acquire "user_find:$login";
989		991
990	$cf::PLAYER{$_[0]} \|\| do {	992	$cf::PLAYER{$_[0]} \|\| do {
		993	# rename old playerfiles to new ones
		994	#TODO: remove when no longer required
		995	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
		996	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
		997	aio_unlink +(playerdir $login) . "/$login.pl.pst";
		998	aio_unlink +(playerdir $login) . "/$login.pl";
		999
991	my $pl = load_pl path $login	1000	my $pl = load_pl path $login
992	or return;	1001	or return;
993	$cf::PLAYER{$login} = $pl	1002	$cf::PLAYER{$login} = $pl
994	}	1003	}
995	}	1004	}
…		…
1147	=cut	1156	=cut
1148		1157
1149	sub ext_event($$%) {	1158	sub ext_event($$%) {
1150	my ($self, $type, %msg) = @_;	1159	my ($self, $type, %msg) = @_;
1151		1160
1152	delete $msg{msgid};	1161	$self->ns->ext_event ($type, %msg);
1153	$msg{msgtype} = "event";
1154	$msg{eventtype} = $type;
1155
1156	$self->send ("ext " . cf::to_json \%msg);
1157	}	1162	}
1158		1163
1159	package cf;	1164	=head3 cf::region
		1165
		1166	=over 4
		1167
		1168	=cut
		1169
		1170	package cf::region;
		1171
		1172	=item cf::region::find_by_path $path
		1173
		1174	Tries to decuce the probable region for a map knowing only its path.
		1175
		1176	=cut
		1177
		1178	sub find_by_path($) {
		1179	my ($path) = @_;
		1180
		1181	my ($match, $specificity);
		1182
		1183	for my $region (list) {
		1184	if ($region->match && $path =~ $region->match) {
		1185	($match, $specificity) = ($region, $region->specificity)
		1186	if $region->specificity > $specificity;
		1187	}
		1188	}
		1189
		1190	$match
		1191	}
1160		1192
1161	=back	1193	=back
1162
1163		1194
1164	=head3 cf::map	1195	=head3 cf::map
1165		1196
1166	=over 4	1197	=over 4
1167		1198
…		…
1398	$self->load_header_orig	1429	$self->load_header_orig
1399	or return;	1430	or return;
1400	$self->prepare_orig;	1431	$self->prepare_orig;
1401	}	1432	}
1402		1433
		1434	$self->default_region (cf::region::find_by_path $self->{path})
		1435	unless $self->default_region;
		1436
1403	1	1437	1
1404	}	1438	}
1405		1439
1406	sub find;	1440	sub find;
1407	sub find {	1441	sub find {
…		…
1449	$self->in_memory (cf::MAP_LOADING);	1483	$self->in_memory (cf::MAP_LOADING);
1450		1484
1451	$self->alloc;	1485	$self->alloc;
1452		1486
1453	$self->pre_load;	1487	$self->pre_load;
		1488	Coro::cede;
1454		1489
1455	$self->_load_objects ($self->{load_path}, 1)	1490	$self->_load_objects ($self->{load_path}, 1)
1456	or return;	1491	or return;
1457		1492
1458	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1493	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
…		…
1465	$self->_load_objects ($uniq, 0);	1500	$self->_load_objects ($uniq, 0);
1466	}	1501	}
1467	}	1502	}
1468		1503
1469	Coro::cede;	1504	Coro::cede;
1470
1471	# now do the right thing for maps	1505	# now do the right thing for maps
1472	$self->link_multipart_objects;	1506	$self->link_multipart_objects;
		1507	Coro::cede;
1473		1508
1474	unless ($self->{deny_activate}) {	1509	unless ($self->{deny_activate}) {
1475	$self->decay_objects;	1510	$self->decay_objects;
1476	$self->fix_auto_apply;	1511	$self->fix_auto_apply;
1477	$self->update_buttons;	1512	$self->update_buttons;
…		…
1479	$self->set_darkness_map;	1514	$self->set_darkness_map;
1480	$self->difficulty ($self->estimate_difficulty)	1515	$self->difficulty ($self->estimate_difficulty)
1481	unless $self->difficulty;	1516	unless $self->difficulty;
1482	Coro::cede;	1517	Coro::cede;
1483	$self->activate;	1518	$self->activate;
		1519	Coro::cede;
1484	}	1520	}
1485		1521
1486	$self->post_load;	1522	$self->post_load;
		1523	Coro::cede;
1487		1524
1488	$self->in_memory (cf::MAP_IN_MEMORY);	1525	$self->in_memory (cf::MAP_IN_MEMORY);
1489	}	1526	}
1490		1527
1491	sub customise_for {	1528	sub customise_for {
…		…
1969		2006
1970	return unless $self->type == cf::PLAYER;	2007	return unless $self->type == cf::PLAYER;
1971		2008
1972	if ($exit->slaying eq "/!") {	2009	if ($exit->slaying eq "/!") {
1973	#TODO: this should de-fi-ni-te-ly not be a sync-job	2010	#TODO: this should de-fi-ni-te-ly not be a sync-job
		2011	# the problem is that $exit might not survive long enough
		2012	# so it needs to be done right now, right here
1974	cf::sync_job { prepare_random_map $exit };	2013	cf::sync_job { prepare_random_map $exit };
1975	}	2014	}
1976		2015
1977	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2016	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1978	my $hp = $exit->stats->hp;	2017	my $hp = $exit->stats->hp;
…		…
1986	$self->goto ($slaying, $hp, $sp);	2025	$self->goto ($slaying, $hp, $sp);
1987		2026
1988	1;	2027	1;
1989	}) {	2028	}) {
1990	$self->message ("Something went wrong deep within the crossfire server. "	2029	$self->message ("Something went wrong deep within the crossfire server. "
1991	. "I'll try to bring you back to the map you were before. "	2030	. "I'll try to bring you back to the map you were before. "
1992	. "Please report this to the dungeon master!",	2031	. "Please report this to the dungeon master!",
1993	cf::NDI_UNIQUE \| cf::NDI_RED);	2032	cf::NDI_UNIQUE \| cf::NDI_RED);
1994		2033
1995	warn "ERROR in enter_exit: $@";	2034	warn "ERROR in enter_exit: $@";
1996	$self->leave_link;	2035	$self->leave_link;
1997	}	2036	}
1998	})->prio (1);	2037	})->prio (1);
…		…
2014		2053
2015	utf8::encode $text;	2054	utf8::encode $text;
2016	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2055	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2017	}	2056	}
2018		2057
		2058	=item $client->ext_event ($type, %msg)
		2059
		2060	Sends an exti event to the client.
		2061
		2062	=cut
		2063
		2064	sub cf::client::ext_event($$%) {
		2065	my ($self, $type, %msg) = @_;
		2066
		2067	$msg{msgtype} = "event_$type";
		2068	$self->send_packet ("ext " . cf::to_json \%msg);
		2069	}
2019		2070
2020	=item $success = $client->query ($flags, "text", \&cb)	2071	=item $success = $client->query ($flags, "text", \&cb)
2021		2072
2022	Queues a query to the client, calling the given callback with	2073	Queues a query to the client, calling the given callback with
2023	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2074	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
…		…
2215	#############################################################################	2266	#############################################################################
2216		2267
2217	=head2 EXTENSION DATABASE SUPPORT	2268	=head2 EXTENSION DATABASE SUPPORT
2218		2269
2219	Crossfire maintains a very simple database for extension use. It can	2270	Crossfire maintains a very simple database for extension use. It can
2220	currently store anything that can be serialised using Storable, which	2271	currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2221	excludes objects.	2272	convert to/from binary).
2222		2273
2223	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
2224	using it, it should be unique.	2275	using it, it should be unique.
2225		2276
2226	=over 4	2277	=over 4
…		…
2249	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;	2300	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
2250	cf::cleanup "db_open(db): $!" if $!;	2301	cf::cleanup "db_open(db): $!" if $!;
2251	};	2302	};
2252	cf::cleanup "db_open(db): $@" if $@;	2303	cf::cleanup "db_open(db): $@" if $@;
2253	};	2304	};
2254
2255	my $path = cf::localdir . "/database.pst";
2256	if (stat $path) {
2257	cf::sync_job {
2258	my $pst = Storable::retrieve $path;
2259
2260	cf::db_put (board => data => $pst->{board});
2261	cf::db_put (guildrules => data => $pst->{guildrules});
2262	cf::db_put (rent => balance => $pst->{rent}{balance});
2263	BDB::db_env_txn_checkpoint $DB_ENV;
2264
2265	unlink $path;
2266	};
2267	}
2268	}	2305	}
2269	}	2306	}
2270		2307
2271	sub db_get($$) {	2308	sub db_get($$) {
2272	my $key = "$_[0]/$_[1]";	2309	my $key = "$_[0]/$_[1]";
2273		2310
2274	cf::sync_job {	2311	cf::sync_job {
2275	BDB::db_get $DB, undef, $key, my $data;	2312	BDB::db_get $DB, undef, $key, my $data;
2276		2313
2277	$! ? ()	2314	$! ? ()
2278	: Compress::LZF::sthaw $data	2315	: $data
2279	}	2316	}
2280	}	2317	}
2281		2318
2282	sub db_put($$$) {	2319	sub db_put($$$) {
2283	BDB::dbreq_pri 4;	2320	BDB::dbreq_pri 4;
2284	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 { };
2285	}	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
2286		2434
2287	#############################################################################	2435	#############################################################################
2288	# the server's init and main functions	2436	# the server's init and main functions
2289		2437
2290	sub load_facedata {	2438	sub load_facedata($) {
2291	my $path = sprintf "%s/facedata", cf::datadir;	2439	my ($path) = @_;
2292		2440
2293	warn "loading facedata from $path\n";	2441	warn "loading facedata from $path\n";
2294		2442
2295	my $faces;	2443	my $facedata;
2296	0 < aio_load $path, $faces	2444	0 < aio_load $path, $facedata
2297	or die "$path: $!";	2445	or die "$path: $!";
2298		2446
2299	Coro::cede;
2300	$faces = Storable::thaw $faces;	2447	$facedata = Coro::Storable::thaw $facedata;
2301	Coro::cede;
2302		2448
2303	my $meta = delete $faces->{""};
2304	$meta->{version} == 1	2449	$facedata->{version} == 2
2305	or cf::cleanup "$path: version mismatch, cannot proceed.";	2450	or cf::cleanup "$path: version mismatch, cannot proceed.";
2306		2451
		2452	{
		2453	my $faces = $facedata->{faceinfo};
		2454
2307	while (my ($face, $info) = each %$faces) {	2455	while (my ($face, $info) = each %$faces) {
2308	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	2456	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2309	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2457	cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2310	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2458	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2311	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	2459	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2312	Coro::cede;	2460	Coro::cede;
2313	}	2461	}
2314		2462
2315	while (my ($face, $info) = each %$faces) {	2463	while (my ($face, $info) = each %$faces) {
2316	next unless $info->{smooth};	2464	next unless $info->{smooth};
2317	my $idx = cf::face::find $face	2465	my $idx = cf::face::find $face
2318	or next;	2466	or next;
2319	if (my $smooth = cf::face::find $info->{smooth}) {	2467	if (my $smooth = cf::face::find $info->{smooth}) {
2320	cf::face::set_smooth $idx, $smooth;	2468	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2321	} else {	2469	} else {
2322	warn "smooth face '$info->{smooth}' not found for face '$face'";	2470	warn "smooth face '$info->{smooth}' not found for face '$face'";
2323	}	2471	}
2324	Coro::cede;	2472	Coro::cede;
		2473	}
		2474	}
		2475
		2476	{
		2477	my $anims = $facedata->{animinfo};
		2478
		2479	while (my ($anim, $info) = each %$anims) {
		2480	cf::anim::set $anim, $info->{frames}, $info->{facings};
		2481	Coro::cede;
		2482	}
		2483
		2484	cf::anim::invalidate_all; # d'oh
2325	}	2485	}
2326		2486
2327	1	2487	1
2328	}	2488	}
2329		2489
		2490	sub reload_facedata {
		2491	load_facedata sprintf "%s/facedata", cf::datadir
		2492	or die "unable to load facedata\n";
		2493	}
		2494
		2495	sub reload_regions {
		2496	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
		2497	or die "unable to load regions file\n";
		2498	}
		2499
		2500	sub reload_archetypes {
		2501	load_resource_file sprintf "%s/archetypes", cf::datadir
		2502	or die "unable to load archetypes\n";
		2503	}
		2504
		2505	sub reload_treasures {
		2506	load_resource_file sprintf "%s/treasures", cf::datadir
		2507	or die "unable to load treasurelists\n";
		2508	}
		2509
2330	sub reload_resources {	2510	sub reload_resources {
2331	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir	2511	warn "reloading resource files...\n";
2332	or die "unable to load regions file\n";#d#	2512
		2513	reload_regions;
2333	load_facedata	2514	reload_facedata;
2334	or die "unable to load facedata\n";#d#	2515	reload_archetypes;
		2516	reload_treasures;
		2517
		2518	warn "finished reloading resource files\n";
2335	}	2519	}
2336		2520
2337	sub init {	2521	sub init {
2338	reload_resources;	2522	reload_resources;
2339	}	2523	}
…		…
2432		2616
2433	warn Carp::longmess "post_cleanup backtrace"	2617	warn Carp::longmess "post_cleanup backtrace"
2434	if $make_core;	2618	if $make_core;
2435	}	2619	}
2436		2620
2437	sub reload() {	2621	sub do_reload_perl() {
2438	# can/must only be called in main	2622	# can/must only be called in main
2439	if ($Coro::current != $Coro::main) {	2623	if ($Coro::current != $Coro::main) {
2440	warn "can only reload from main coroutine";	2624	warn "can only reload from main coroutine";
2441	return;	2625	return;
2442	}	2626	}
…		…
2517	Symbol::delete_package "safe::$_"	2701	Symbol::delete_package "safe::$_"
2518	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);
2519		2703
2520	warn "unloading cf.pm \"a bit\"";	2704	warn "unloading cf.pm \"a bit\"";
2521	delete $INC{"cf.pm"};	2705	delete $INC{"cf.pm"};
		2706	delete $INC{"cf/pod.pm"};
2522		2707
2523	# don't, removes xs symbols, too,	2708	# don't, removes xs symbols, too,
2524	# and global variables created in xs	2709	# and global variables created in xs
2525	#Symbol::delete_package __PACKAGE__;	2710	#Symbol::delete_package __PACKAGE__;
2526		2711
…		…
2541	warn "reattaching attachments to maps";	2726	warn "reattaching attachments to maps";
2542	reattach $_ for values %MAP;	2727	reattach $_ for values %MAP;
2543	warn "reattaching attachments to players";	2728	warn "reattaching attachments to players";
2544	reattach $_ for values %PLAYER;	2729	reattach $_ for values %PLAYER;
2545		2730
2546	warn "loading reloadable resources";
2547	reload_resources;
2548
2549	warn "leaving sync_job";	2731	warn "leaving sync_job";
2550		2732
2551	1	2733	1
2552	} or do {	2734	} or do {
2553	warn $@;	2735	warn $@;
…		…
2558	warn "reloaded";	2740	warn "reloaded";
2559	};	2741	};
2560		2742
2561	our $RELOAD_WATCHER; # used only during reload	2743	our $RELOAD_WATCHER; # used only during reload
2562		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
2563	register_command "reload" => sub {	2760	register_command "reload" => sub {
2564	my ($who, $arg) = @_;	2761	my ($who, $arg) = @_;
2565		2762
2566	if ($who->flag (FLAG_WIZ)) {	2763	if ($who->flag (FLAG_WIZ)) {
2567	$who->message ("reloading server.");	2764	$who->message ("reloading server.");
2568		2765	async { reload_perl };
2569	# doing reload synchronously and two reloads happen back-to-back,
2570	# coro crashes during coro_state_free->destroy here.
2571
2572	$RELOAD_WATCHER \|\|= Event->timer (
2573	reentrant => 0,
2574	after => 0,
2575	data => WF_AUTOCANCEL,
2576	cb => sub {
2577	reload;
2578	undef $RELOAD_WATCHER;
2579	},
2580	);
2581	}	2766	}
2582	};	2767	};
2583		2768
2584	unshift @INC, $LIBDIR;	2769	unshift @INC, $LIBDIR;
2585		2770
2586	my $bug_warning = 0;	2771	my $bug_warning = 0;
		2772
		2773	our @WAIT_FOR_TICK;
		2774	our @WAIT_FOR_TICK_BEGIN;
		2775
		2776	sub wait_for_tick {
		2777	return unless $TICK_WATCHER->is_active;
		2778	return if $Coro::current == $Coro::main;
		2779
		2780	my $signal = new Coro::Signal;
		2781	push @WAIT_FOR_TICK, $signal;
		2782	$signal->wait;
		2783	}
		2784
		2785	sub wait_for_tick_begin {
		2786	return unless $TICK_WATCHER->is_active;
		2787	return if $Coro::current == $Coro::main;
		2788
		2789	my $signal = new Coro::Signal;
		2790	push @WAIT_FOR_TICK_BEGIN, $signal;
		2791	$signal->wait;
		2792	}
2587		2793
2588	$TICK_WATCHER = Event->timer (	2794	$TICK_WATCHER = Event->timer (
2589	reentrant => 0,	2795	reentrant => 0,
2590	parked => 1,	2796	parked => 1,
2591	prio => 0,	2797	prio => 0,
…		…
2599	}	2805	}
2600		2806
2601	$NOW = Event::time;	2807	$NOW = Event::time;
2602		2808
2603	cf::server_tick; # one server iteration	2809	cf::server_tick; # one server iteration
		2810
2604	$RUNTIME += $TICK;	2811	$RUNTIME += $TICK;
2605	$NEXT_TICK += $TICK;	2812	$NEXT_TICK += $TICK;
2606		2813
2607	if ($NOW >= $NEXT_RUNTIME_WRITE) {	2814	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2608	$NEXT_RUNTIME_WRITE = $NOW + 10;	2815	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
2610	write_runtime	2817	write_runtime
2611	or warn "ERROR: unable to write runtime file: $!";	2818	or warn "ERROR: unable to write runtime file: $!";
2612	};	2819	};
2613	}	2820	}
2614		2821
2615	$WAIT_FOR_TICK->broadcast;
2616	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2617
2618	# my $AFTER = Event::time;	2822	# my $AFTER = Event::time;
2619	# warn $AFTER - $NOW;#d#	2823	# warn $AFTER - $NOW;#d#
2620		2824
2621	# if we are delayed by four ticks or more, skip them all	2825	# if we are delayed by four ticks or more, skip them all
2622	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2826	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2623		2827
2624	$TICK_WATCHER->at ($NEXT_TICK);	2828	$TICK_WATCHER->at ($NEXT_TICK);
2625	$TICK_WATCHER->start;	2829	$TICK_WATCHER->start;
		2830
		2831	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		2832	$sig->send;
		2833	}
		2834	while (my $sig = shift @WAIT_FOR_TICK) {
		2835	$sig->send;
		2836	}
		2837
		2838	_post_tick;
2626	},	2839	},
2627	);	2840	);
2628		2841
2629	{	2842	{
2630	BDB::max_poll_time $TICK * 0.1;	2843	BDB::max_poll_time $TICK * 0.1;
…		…
2689	prio => 6,	2902	prio => 6,
2690	cb => \&IO::AIO::poll_cb,	2903	cb => \&IO::AIO::poll_cb,
2691	);	2904	);
2692	}	2905	}
2693		2906
		2907	# load additional modules
		2908	use cf::pod;
		2909
2694	END { cf::emergency_save }	2910	END { cf::emergency_save }
2695		2911
2696	1	2912	1
2697		2913

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.231 by root, Wed Apr 4 00:02:06 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.231 by root, Wed Apr 4 00:02:06 2007 UTC vs.
Revision 1.252 by root, Wed Apr 18 15:28:18 2007 UTC