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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.502 by root, Sat Jan 23 20:24:50 2010 UTC vs.
Revision 1.512 by root, Sun Apr 11 04:52:07 2010 UTC

…		…
1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
503		503
504	sub sync_job(&) {	504	sub sync_job(&) {
505	my ($job) = @_;	505	my ($job) = @_;
506		506
507	if ($Coro::current == $Coro::main) {	507	if ($Coro::current == $Coro::main) {
508	my $time = EV::time;	508	my $time = AE::time;
509		509
510	# this is the main coro, too bad, we have to block	510	# this is the main coro, too bad, we have to block
511	# till the operation succeeds, freezing the server :/	511	# till the operation succeeds, freezing the server :/
512		512
513	LOG llevError, Carp::longmess "sync job";#d#	513	LOG llevError, Carp::longmess "sync job";#d#
…		…
530	} else {	530	} else {
531	EV::loop EV::LOOP_ONESHOT;	531	EV::loop EV::LOOP_ONESHOT;
532	}	532	}
533	}	533	}
534		534
535	my $time = EV::time - $time;	535	my $time = AE::time - $time;
536		536
537	$TICK_START += $time; # do not account sync jobs to server load	537	$TICK_START += $time; # do not account sync jobs to server load
538		538
539	wantarray ? @res : $res[0]	539	wantarray ? @res : $res[0]
540	} else {	540	} else {
…		…
1310	}	1310	}
1311		1311
1312	use File::Glob ();	1312	use File::Glob ();
1313		1313
1314	cf::player->attach (	1314	cf::player->attach (
1315	on_command => sub {	1315	on_unknown_command => sub {
1316	my ($pl, $name, $params) = @_;	1316	my ($pl, $name, $params) = @_;
1317		1317
1318	my $cb = $COMMAND{$name}	1318	my $cb = $COMMAND{$name}
1319	or return;	1319	or return;
1320		1320
…		…
1399	. "\n};\n1";	1399	. "\n};\n1";
1400		1400
1401	$todo{$base} = \%ext;	1401	$todo{$base} = \%ext;
1402	}	1402	}
1403		1403
		1404	my $pass = 0;
1404	my %done;	1405	my %done;
1405	while (%todo) {	1406	while (%todo) {
1406	my $progress;	1407	my $progress;
1407		1408
		1409	++$pass;
		1410
		1411	ext:
1408	while (my ($k, $v) = each %todo) {	1412	while (my ($k, $v) = each %todo) {
1409	for (split /,\s*/, $v->{meta}{depends}) {	1413	for (split /,\s*/, $v->{meta}{depends}) {
1410	goto skip	1414	next ext
1411	unless exists $done{$_};	1415	unless exists $done{$_};
1412	}	1416	}
1413		1417
1414	warn "... loading '$k' into '$v->{pkg}'\n";	1418	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1415		1419
1416	unless (eval $v->{source}) {	1420	my $active = eval $v->{source};
		1421
		1422	if (length $@) {
1417	my $msg = $@ ? "$v->{path}: $@\n"	1423	warn "$v->{path}: $@\n";
1418	: "$v->{base}: extension inactive.\n";
1419		1424
1420	if (exists $v->{meta}{mandatory}) {
1421	warn $msg;
1422	cf::cleanup "mandatory extension failed to load, exiting.";	1425	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1423	}	1426	if exists $v->{meta}{mandatory};
1424		1427	} else {
1425	warn $msg;	1428	$done{$k} = delete $todo{$k};
		1429	push @EXTS, $v->{pkg};
		1430	$progress = 1;
		1431
		1432	warn "$v->{base}: extension inactive.\n"
		1433	unless $active;
1426	}	1434	}
1427
1428	$done{$k} = delete $todo{$k};
1429	push @EXTS, $v->{pkg};
1430	$progress = 1;
1431	}	1435	}
1432		1436
1433	skip:	1437	unless ($progress) {
1434	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1438	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1435	unless $progress;	1439
		1440	while (my ($k, $v) = each %todo) {
		1441	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1442	if exists $v->{meta}{mandatory};
		1443	}
		1444	}
1436	}	1445	}
1437	};	1446	};
1438	}	1447	}
1439		1448
1440	#############################################################################	1449	#############################################################################
…		…
1524	$cf::PLAYER{$login} = $pl	1533	$cf::PLAYER{$login} = $pl
1525	}	1534	}
1526	}	1535	}
1527	}	1536	}
1528		1537
		1538	cf::player->attach (
		1539	on_load => sub {
		1540	my ($pl, $path) = @_;
		1541
		1542	# restore slots saved in save, below
		1543	my $slots = delete $pl->{_slots};
		1544
		1545	$pl->ob->current_weapon ($slots->[0]);
		1546	$pl->combat_ob ($slots->[1]);
		1547	$pl->ranged_ob ($slots->[2]);
		1548	},
		1549	);
		1550
1529	sub save($) {	1551	sub save($) {
1530	my ($pl) = @_;	1552	my ($pl) = @_;
1531		1553
1532	return if $pl->{deny_save};	1554	return if $pl->{deny_save};
1533		1555
…		…
1538		1560
1539	aio_mkdir playerdir $pl, 0770;	1561	aio_mkdir playerdir $pl, 0770;
1540	$pl->{last_save} = $cf::RUNTIME;	1562	$pl->{last_save} = $cf::RUNTIME;
1541		1563
1542	cf::get_slot 0.01;	1564	cf::get_slot 0.01;
		1565
		1566	# save slots, to be restored later
		1567	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1543		1568
1544	$pl->save_pl ($path);	1569	$pl->save_pl ($path);
1545	cf::cede_to_tick;	1570	cf::cede_to_tick;
1546	}	1571	}
1547		1572
…		…
1760	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1785	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1761		1786
1762	# mit "rum" bekleckern, nicht	1787	# mit "rum" bekleckern, nicht
1763	$self->_create_random_map (	1788	$self->_create_random_map (
1764	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1789	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1765	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1790	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1766	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1791	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1767	$rmp->{exit_on_final_map},	1792	$rmp->{exit_on_final_map},
1768	$rmp->{xsize}, $rmp->{ysize},	1793	$rmp->{xsize}, $rmp->{ysize},
1769	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1794	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1770	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1795	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
…		…
2084	}	2109	}
2085		2110
2086	$self->post_load;	2111	$self->post_load;
2087	}	2112	}
2088		2113
		2114	# customize the map for a given player, i.e.
		2115	# return the _real_ map. used by e.g. per-player
		2116	# maps to change the path to ~playername/mappath
2089	sub customise_for {	2117	sub customise_for {
2090	my ($self, $ob) = @_;	2118	my ($self, $ob) = @_;
2091		2119
2092	return find "~" . $ob->name . "/" . $self->{path}	2120	return find "~" . $ob->name . "/" . $self->{path}
2093	if $self->per_player;	2121	if $self->per_player;
…		…
3122		3150
3123	$coro	3151	$coro
3124	}	3152	}
3125		3153
3126	cf::client->attach (	3154	cf::client->attach (
3127	on_destroy => sub {	3155	on_client_destroy => sub {
3128	my ($ns) = @_;	3156	my ($ns) = @_;
3129		3157
3130	$_->cancel for values %{ (delete $ns->{_coro}) \|\| {} };	3158	$_->cancel for values %{ (delete $ns->{_coro}) \|\| {} };
3131	},	3159	},
3132	);	3160	);
…		…
3529	reload_config;	3557	reload_config;
3530	db_init;	3558	db_init;
3531		3559
3532	cf::init_uuid;	3560	cf::init_uuid;
3533	cf::init_signals;	3561	cf::init_signals;
3534	cf::init_commands;
3535	cf::init_skills;	3562	cf::init_skills;
3536		3563
3537	cf::init_beforeplay;	3564	cf::init_beforeplay;
3538		3565
3539	atomic;	3566	atomic;
…		…
3557		3584
3558	# install some emergency cleanup handlers	3585	# install some emergency cleanup handlers
3559	BEGIN {	3586	BEGIN {
3560	our %SIGWATCHER = ();	3587	our %SIGWATCHER = ();
3561	for my $signal (qw(INT HUP TERM)) {	3588	for my $signal (qw(INT HUP TERM)) {
3562	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3589	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3563	cf::cleanup "SIG$signal";	3590	cf::cleanup "SIG$signal";
3564	};	3591	};
3565	}	3592	}
3566	}	3593	}
3567		3594
3568	sub write_runtime_sync {	3595	sub write_runtime_sync {
		3596	my $t0 = AE::time;
		3597
3569	# first touch the runtime file to show we are still running:	3598	# first touch the runtime file to show we are still running:
3570	# the fsync below can take a very very long time.	3599	# the fsync below can take a very very long time.
3571		3600
3572	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3601	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3573		3602
3574	my $guard = cf::lock_acquire "write_runtime";	3603	my $guard = cf::lock_acquire "write_runtime";
3575		3604
3576	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY \| O_CREAT, 0644	3605	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY \| O_CREAT \| O_TRUNC, 0644
3577	or return;	3606	or return;
3578		3607
3579	my $value = $cf::RUNTIME + 90 + 10;	3608	my $value = $cf::RUNTIME + 90 + 10;
3580	# 10 is the runtime save interval, for a monotonic clock	3609	# 10 is the runtime save interval, for a monotonic clock
3581	# 60 allows for the watchdog to kill the server.	3610	# 60 allows for the watchdog to kill the server.
…		…
3594	or return;	3623	or return;
3595		3624
3596	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3625	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3597	and return;	3626	and return;
3598		3627
3599	warn "runtime file written.\n";	3628	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3600		3629
3601	1	3630	1
3602	}	3631	}
3603		3632
3604	our $uuid_lock;	3633	our $uuid_lock;
…		…
3742	return;	3771	return;
3743	}	3772	}
3744		3773
3745	return if $RELOAD++;	3774	return if $RELOAD++;
3746		3775
3747	my $t1 = EV::time;	3776	my $t1 = AE::time;
3748		3777
3749	while ($RELOAD) {	3778	while ($RELOAD) {
3750	warn "reloading...";	3779	warn "reloading...";
3751		3780
3752	warn "entering sync_job";	3781	warn "entering sync_job";
…		…
3855		3884
3856	warn "reloaded";	3885	warn "reloaded";
3857	--$RELOAD;	3886	--$RELOAD;
3858	}	3887	}
3859		3888
3860	$t1 = EV::time - $t1;	3889	$t1 = AE::time - $t1;
3861	warn "reload completed in ${t1}s\n";	3890	warn "reload completed in ${t1}s\n";
3862	};	3891	};
3863		3892
3864	our $RELOAD_WATCHER; # used only during reload	3893	our $RELOAD_WATCHER; # used only during reload
3865		3894
…		…
3868	# coro crashes during coro_state_free->destroy here.	3897	# coro crashes during coro_state_free->destroy here.
3869		3898
3870	$RELOAD_WATCHER \|\|= cf::async {	3899	$RELOAD_WATCHER \|\|= cf::async {
3871	Coro::AIO::aio_wait cache_extensions;	3900	Coro::AIO::aio_wait cache_extensions;
3872		3901
3873	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	3902	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3874	do_reload_perl;	3903	do_reload_perl;
3875	undef $RELOAD_WATCHER;	3904	undef $RELOAD_WATCHER;
3876	};	3905	};
3877	};	3906	};
3878	}	3907	}
…		…
3919	return;	3948	return;
3920	}	3949	}
3921		3950
3922	cf::server_tick; # one server iteration	3951	cf::server_tick; # one server iteration
3923		3952
3924	#for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#	3953	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3925		3954
3926	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3955	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3927	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	3956	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3928	Coro::async_pool {	3957	Coro::async_pool {
3929	$Coro::current->{desc} = "runtime saver";	3958	$Coro::current->{desc} = "runtime saver";
…		…
3952	}	3981	}
3953		3982
3954	{	3983	{
3955	# configure BDB	3984	# configure BDB
3956		3985
3957	BDB::min_parallel 8;	3986	BDB::min_parallel 16;
3958	BDB::max_poll_reqs $TICK * 0.1;	3987	BDB::max_poll_reqs $TICK * 0.1;
3959	$AnyEvent::BDB::WATCHER->priority (1);	3988	$AnyEvent::BDB::WATCHER->priority (1);
3960		3989
3961	unless ($DB_ENV) {	3990	unless ($DB_ENV) {
3962	$DB_ENV = BDB::db_env_create;	3991	$DB_ENV = BDB::db_env_create;

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.502 by root, Sat Jan 23 20:24:50 2010 UTC vs. Revision 1.512 by root, Sun Apr 11 04:52:07 2010 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.502 by root, Sat Jan 23 20:24:50 2010 UTC vs.
Revision 1.512 by root, Sun Apr 11 04:52:07 2010 UTC