ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.238 by root, Sat Apr 14 07:23:00 2007 UTC vs.
Revision 1.254 by root, Thu Apr 19 11:12:45 2007 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.52 (); 15use Coro 3.61 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
… …
52our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
53our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
54 56
55our $RELOAD; # number of reloads so far 57our $RELOAD; # number of reloads so far
56our @EVENT; 58our @EVENT;
57our $LIBDIR = datadir . "/ext";
58 59
59our $TICK = MAX_TIME * 1e-6; 60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
71
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
60our $TICK_WATCHER; 73our $TICK_WATCHER;
61our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
63our $NEXT_TICK; 76our $NEXT_TICK;
64our $NOW; 77our $NOW;
… …
73our $RUNTIME; 86our $RUNTIME;
74 87
75our %PLAYER; # all users 88our %PLAYER; # all users
76our %MAP; # all maps 89our %MAP; # all maps
77our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db";
80
81our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
82our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
83 91
84# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
85our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
86 94
87binmode STDOUT; 95binmode STDOUT;
88binmode STDERR; 96binmode STDERR;
89 97
90# read virtual server time, if available 98# read virtual server time, if available
91unless ($RUNTIME || !-e cf::localdir . "/runtime") { 99unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
92 open my $fh, "<", cf::localdir . "/runtime" 100 open my $fh, "<", "$LOCALDIR/runtime"
93 or die "unable to read runtime file: $!"; 101 or die "unable to read runtime file: $!";
94 $RUNTIME = <$fh> + 0.; 102 $RUNTIME = <$fh> + 0.;
95} 103}
96 104
97mkdir cf::localdir; 105mkdir $_
98mkdir cf::localdir . "/" . cf::playerdir; 106 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
99mkdir cf::localdir . "/" . cf::tmpdir;
100mkdir cf::localdir . "/" . cf::uniquedir;
101mkdir $RANDOM_MAPS;
102mkdir $BDB_ENV_DIR;
103 107
104our $EMERGENCY_POSITION; 108our $EMERGENCY_POSITION;
105 109
106sub cf::map::normalise; 110sub cf::map::normalise;
107 111
… …
118=item $cf::RUNTIME 122=item $cf::RUNTIME
119 123
120The time this server has run, starts at 0 and is increased by $cf::TICK on 124The time this server has run, starts at 0 and is increased by $cf::TICK on
121every server tick. 125every server tick.
122 126
123=item $cf::LIBDIR 127=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
128$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
129$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
124 130
125The perl library directory, where extensions and cf-specific modules can 131Various directories - "/etc", read-only install directory, perl-library
126be found. It will be added to C<@INC> automatically. 132directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
133unique-items directory, player file directory, random maps directory and
134database environment.
127 135
128=item $cf::NOW 136=item $cf::NOW
129 137
130The time of the last (current) server tick. 138The time of the last (current) server tick.
131 139
… …
136=item %cf::CFG 144=item %cf::CFG
137 145
138Configuration for the server, loaded from C</etc/crossfire/config>, or 146Configuration for the server, loaded from C</etc/crossfire/config>, or
139from wherever your confdir points to. 147from wherever your confdir points to.
140 148
141=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 149=item cf::wait_for_tick, cf::wait_for_tick_begin
142 150
143These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 151These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
144or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 152returns directly I<after> the tick processing (and consequently, can only wake one process
145processing has been done. Call C<< ->wait >> on them to maximise the 153per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
146window of cpu time available, or simply to synchronise to the server tick.
147 154
148=back 155=back
149 156
150=cut 157=cut
151 158
152BEGIN { 159BEGIN {
153 *CORE::GLOBAL::warn = sub { 160 *CORE::GLOBAL::warn = sub {
154 my $msg = join "", @_; 161 my $msg = join "", @_;
155 utf8::encode $msg;
156 162
157 $msg .= "\n" 163 $msg .= "\n"
158 unless $msg =~ /\n$/; 164 unless $msg =~ /\n$/;
159 165
166 $msg =~ s/([\x00-\x09\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
167
168 utf8::encode $msg;
160 LOG llevError, $msg; 169 LOG llevError, $msg;
161 }; 170 };
162} 171}
163 172
164@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
234returned. 243returned.
235 244
236Lock names should begin with a unique identifier (for example, cf::map::find 245Lock names should begin with a unique identifier (for example, cf::map::find
237uses map_find and cf::map::load uses map_load). 246uses map_find and cf::map::load uses map_load).
238 247
248=item $locked = cf::lock_active $string
249
250Return true if the lock is currently active, i.e. somebody has locked it.
251
239=cut 252=cut
240 253
241our %LOCK; 254our %LOCK;
242 255
243sub lock_wait($) { 256sub lock_wait($) {
… …
260 273
261 Coro::guard { 274 Coro::guard {
262 # wake up all waiters, to be on the safe side 275 # wake up all waiters, to be on the safe side
263 $_->ready for @{ delete $LOCK{$key} }; 276 $_->ready for @{ delete $LOCK{$key} };
264 } 277 }
278}
279
280sub lock_active($) {
281 my ($key) = @_;
282
283 ! ! $LOCK{$key}
265} 284}
266 285
267sub freeze_mainloop { 286sub freeze_mainloop {
268 return unless $TICK_WATCHER->is_active; 287 return unless $TICK_WATCHER->is_active;
269 288
… …
350} 369}
351 370
352sub write_runtime { 371sub write_runtime {
353 my $guard = cf::lock_acquire "write_runtime"; 372 my $guard = cf::lock_acquire "write_runtime";
354 373
355 my $runtime = cf::localdir . "/runtime"; 374 my $runtime = "$LOCALDIR/runtime";
356 375
357 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
358 or return; 377 or return;
359 378
360 my $value = $cf::RUNTIME + 90 + 10; 379 my $value = $cf::RUNTIME + 90 + 10;
… …
955Returns the given player object, loading it if necessary (might block). 974Returns the given player object, loading it if necessary (might block).
956 975
957=cut 976=cut
958 977
959sub playerdir($) { 978sub playerdir($) {
960 cf::localdir 979 "$PLAYERDIR/"
961 . "/"
962 . cf::playerdir
963 . "/"
964 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 980 . (ref $_[0] ? $_[0]->ob->name : $_[0])
965} 981}
966 982
967sub path($) { 983sub path($) {
968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 984 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
1088while and may block, so not sync_job-capable, ever. 1104while and may block, so not sync_job-capable, ever.
1089 1105
1090=cut 1106=cut
1091 1107
1092sub list_logins { 1108sub list_logins {
1093 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1109 my $dirs = aio_readdir $PLAYERDIR
1094 or return []; 1110 or return [];
1095 1111
1096 my @logins; 1112 my @logins;
1097 1113
1098 for my $login (@$dirs) { 1114 for my $login (@$dirs) {
… …
1336 1352
1337# the original (read-only) location 1353# the original (read-only) location
1338sub load_path { 1354sub load_path {
1339 my ($self) = @_; 1355 my ($self) = @_;
1340 1356
1341 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1357 "$MAPDIR/$self->{path}.map"
1342} 1358}
1343 1359
1344# the temporary/swap location 1360# the temporary/swap location
1345sub save_path { 1361sub save_path {
1346 my ($self) = @_; 1362 my ($self) = @_;
1347 1363
1348 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1364 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1349 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1365 "$TMPDIR/$path.map"
1350} 1366}
1351 1367
1352# the unique path, undef == no special unique path 1368# the unique path, undef == no special unique path
1353sub uniq_path { 1369sub uniq_path {
1354 my ($self) = @_; 1370 my ($self) = @_;
1355 1371
1356 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1372 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1357 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1373 "$UNIQUEDIR/$path"
1358} 1374}
1359 1375
1360# and all this just because we cannot iterate over 1376# and all this just because we cannot iterate over
1361# all maps in C++... 1377# all maps in C++...
1362sub change_all_map_light { 1378sub change_all_map_light {
… …
1483 $self->in_memory (cf::MAP_LOADING); 1499 $self->in_memory (cf::MAP_LOADING);
1484 1500
1485 $self->alloc; 1501 $self->alloc;
1486 1502
1487 $self->pre_load; 1503 $self->pre_load;
1504 Coro::cede;
1488 1505
1489 $self->_load_objects ($self->{load_path}, 1) 1506 $self->_load_objects ($self->{load_path}, 1)
1490 or return; 1507 or return;
1491 1508
1492 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1509 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1499 $self->_load_objects ($uniq, 0); 1516 $self->_load_objects ($uniq, 0);
1500 } 1517 }
1501 } 1518 }
1502 1519
1503 Coro::cede; 1520 Coro::cede;
1504
1505 # now do the right thing for maps 1521 # now do the right thing for maps
1506 $self->link_multipart_objects; 1522 $self->link_multipart_objects;
1523 Coro::cede;
1507 1524
1508 unless ($self->{deny_activate}) { 1525 unless ($self->{deny_activate}) {
1509 $self->decay_objects; 1526 $self->decay_objects;
1510 $self->fix_auto_apply; 1527 $self->fix_auto_apply;
1511 $self->update_buttons; 1528 $self->update_buttons;
… …
1513 $self->set_darkness_map; 1530 $self->set_darkness_map;
1514 $self->difficulty ($self->estimate_difficulty) 1531 $self->difficulty ($self->estimate_difficulty)
1515 unless $self->difficulty; 1532 unless $self->difficulty;
1516 Coro::cede; 1533 Coro::cede;
1517 $self->activate; 1534 $self->activate;
1535 Coro::cede;
1518 } 1536 }
1519 1537
1520 $self->post_load; 1538 $self->post_load;
1539 Coro::cede;
1521 1540
1522 $self->in_memory (cf::MAP_IN_MEMORY); 1541 $self->in_memory (cf::MAP_IN_MEMORY);
1523} 1542}
1524 1543
1525sub customise_for { 1544sub customise_for {
… …
1718instantiated unique items. May block. 1737instantiated unique items. May block.
1719 1738
1720=cut 1739=cut
1721 1740
1722sub unique_maps() { 1741sub unique_maps() {
1723 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1742 my $files = aio_readdir $UNIQUEDIR
1724 or return; 1743 or return;
1725 1744
1726 my @paths; 1745 my @paths;
1727 1746
1728 for (@$files) { 1747 for (@$files) {
… …
1984 2003
1985 $rmp->{random_seed} ||= $exit->random_seed; 2004 $rmp->{random_seed} ||= $exit->random_seed;
1986 2005
1987 my $data = cf::to_json $rmp; 2006 my $data = cf::to_json $rmp;
1988 my $md5 = Digest::MD5::md5_hex $data; 2007 my $md5 = Digest::MD5::md5_hex $data;
1989 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2008 my $meta = "$RANDOMDIR/$md5.meta";
1990 2009
1991 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2010 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1992 aio_write $fh, 0, (length $data), $data, 0; 2011 aio_write $fh, 0, (length $data), $data, 0;
1993 undef $fh; 2012 undef $fh;
1994 aio_rename "$meta~", $meta; 2013 aio_rename "$meta~", $meta;
… …
2263############################################################################# 2282#############################################################################
2264 2283
2265=head2 EXTENSION DATABASE SUPPORT 2284=head2 EXTENSION DATABASE SUPPORT
2266 2285
2267Crossfire maintains a very simple database for extension use. It can 2286Crossfire maintains a very simple database for extension use. It can
2268currently store anything that can be serialised using Storable, which 2287currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2269excludes objects. 2288convert to/from binary).
2270 2289
2271The parameter C<$family> should best start with the name of the extension 2290The parameter C<$family> should best start with the name of the extension
2272using it, it should be unique. 2291using it, it should be unique.
2273 2292
2274=over 4 2293=over 4
… …
2297 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2316 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2298 cf::cleanup "db_open(db): $!" if $!; 2317 cf::cleanup "db_open(db): $!" if $!;
2299 }; 2318 };
2300 cf::cleanup "db_open(db): $@" if $@; 2319 cf::cleanup "db_open(db): $@" if $@;
2301 }; 2320 };
2302
2303 my $path = cf::localdir . "/database.pst";
2304 if (stat $path) {
2305 cf::sync_job {
2306 my $pst = Storable::retrieve $path;
2307
2308 cf::db_put (board => data => $pst->{board});
2309 cf::db_put (guildrules => data => $pst->{guildrules});
2310 cf::db_put (rent => balance => $pst->{rent}{balance});
2311 BDB::db_env_txn_checkpoint $DB_ENV;
2312
2313 unlink $path;
2314 };
2315 }
2316 } 2321 }
2317} 2322}
2318 2323
2319sub db_get($$) { 2324sub db_get($$) {
2320 my $key = "$_[0]/$_[1]"; 2325 my $key = "$_[0]/$_[1]";
2321 2326
2322 cf::sync_job { 2327 cf::sync_job {
2323 BDB::db_get $DB, undef, $key, my $data; 2328 BDB::db_get $DB, undef, $key, my $data;
2324 2329
2325 $! ? () 2330 $! ? ()
2326 : Compress::LZF::sthaw $data 2331 : $data
2327 } 2332 }
2328} 2333}
2329 2334
2330sub db_put($$$) { 2335sub db_put($$$) {
2331 BDB::dbreq_pri 4; 2336 BDB::dbreq_pri 4;
2332 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2337 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2333} 2338}
2339
2340=item cf::cache $id => [$paths...], $processversion => $process
2341
2342Generic caching function that returns the value of the resource $id,
2343caching and regenerating as required.
2344
2345This function can block.
2346
2347=cut
2348
2349sub cache {
2350 my ($id, $src, $processversion, $process) = @_;
2351
2352 my $meta =
2353 join "\x00",
2354 $processversion,
2355 map {
2356 aio_stat $_
2357 and Carp::croak "$_: $!";
2358
2359 ($_, (stat _)[7,9])
2360 } @$src;
2361
2362 my $dbmeta = db_get cache => "$id/meta";
2363 if ($dbmeta ne $meta) {
2364 # changed, we may need to process
2365
2366 my @data;
2367 my $md5;
2368
2369 for (0 .. $#$src) {
2370 0 <= aio_load $src->[$_], $data[$_]
2371 or Carp::croak "$src->[$_]: $!";
2372 }
2373
2374 # if processing is expensive, check
2375 # checksum first
2376 if (1) {
2377 $md5 =
2378 join "\x00",
2379 $processversion,
2380 map {
2381 Coro::cede;
2382 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2383 } 0.. $#$src;
2384
2385
2386 my $dbmd5 = db_get cache => "$id/md5";
2387 if ($dbmd5 eq $md5) {
2388 db_put cache => "$id/meta", $meta;
2389
2390 return db_get cache => "$id/data";
2391 }
2392 }
2393
2394 my $t1 = Time::HiRes::time;
2395 my $data = $process->(\@data);
2396 my $t2 = Time::HiRes::time;
2397
2398 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2399
2400 db_put cache => "$id/data", $data;
2401 db_put cache => "$id/md5" , $md5;
2402 db_put cache => "$id/meta", $meta;
2403
2404 return $data;
2405 }
2406
2407 db_get cache => "$id/data"
2408}
2409
2410=item fork_call { }, $args
2411
2412Executes the given code block with the given arguments in a seperate
2413process, returning the results. Everything must be serialisable with
2414Coro::Storable. May, of course, block. Note that the executed sub may
2415never block itself or use any form of Event handling.
2416
2417=cut
2418
2419sub fork_call(&@) {
2420 my ($cb, @args) = @_;
2421
2422# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2423# or die "socketpair: $!";
2424 pipe my $fh1, my $fh2
2425 or die "pipe: $!";
2426
2427 if (my $pid = fork) {
2428 close $fh2;
2429
2430 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2431 $res = Coro::Storable::thaw $res;
2432
2433 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2434
2435 die $$res unless "ARRAY" eq ref $res;
2436
2437 return wantarray ? @$res : $res->[-1];
2438 } else {
2439 local $SIG{__WARN__};
2440 eval {
2441 local $SIG{__DIE__};
2442 close $fh1;
2443
2444 my @res = eval { $cb->(@args) };
2445 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2446 };
2447
2448 warn $@ if $@;
2449 _exit 0;
2450 }
2451}
2452
2453
2334 2454
2335############################################################################# 2455#############################################################################
2336# the server's init and main functions 2456# the server's init and main functions
2337 2457
2338sub load_facedata { 2458sub load_facedata($) {
2339 my $path = sprintf "%s/facedata", cf::datadir; 2459 my ($path) = @_;
2340 2460
2341 warn "loading facedata from $path\n"; 2461 warn "loading facedata from $path\n";
2342 2462
2343 my $facedata; 2463 my $facedata;
2344 0 < aio_load $path, $facedata 2464 0 < aio_load $path, $facedata
… …
2385 } 2505 }
2386 2506
2387 1 2507 1
2388} 2508}
2389 2509
2510sub reload_regions {
2511 load_resource_file "$MAPDIR/regions"
2512 or die "unable to load regions file\n";
2513}
2514
2515sub reload_facedata {
2516 load_facedata "$DATADIR/facedata"
2517 or die "unable to load facedata\n";
2518}
2519
2520sub reload_archetypes {
2521 load_resource_file "$DATADIR/archetypes"
2522 or die "unable to load archetypes\n";
2523}
2524
2525sub reload_treasures {
2526 load_resource_file "$DATADIR/treasures"
2527 or die "unable to load treasurelists\n";
2528}
2529
2390sub reload_resources { 2530sub reload_resources {
2391 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2531 warn "reloading resource files...\n";
2392 or die "unable to load regions file\n";#d# 2532
2533 reload_regions;
2393 load_facedata 2534 reload_facedata;
2394 or die "unable to load facedata\n";#d# 2535 reload_archetypes;
2536 reload_treasures;
2537
2538 warn "finished reloading resource files\n";
2395} 2539}
2396 2540
2397sub init { 2541sub init {
2398 reload_resources; 2542 reload_resources;
2399} 2543}
2400 2544
2401sub cfg_load { 2545sub cfg_load {
2402 open my $fh, "<:utf8", cf::confdir . "/config" 2546 open my $fh, "<:utf8", "$CONFDIR/config"
2403 or return; 2547 or return;
2404 2548
2405 local $/; 2549 local $/;
2406 *CFG = YAML::Syck::Load <$fh>; 2550 *CFG = YAML::Syck::Load <$fh>;
2407 2551
… …
2492 2636
2493 warn Carp::longmess "post_cleanup backtrace" 2637 warn Carp::longmess "post_cleanup backtrace"
2494 if $make_core; 2638 if $make_core;
2495} 2639}
2496 2640
2497sub reload() { 2641sub do_reload_perl() {
2498 # can/must only be called in main 2642 # can/must only be called in main
2499 if ($Coro::current != $Coro::main) { 2643 if ($Coro::current != $Coro::main) {
2500 warn "can only reload from main coroutine"; 2644 warn "can only reload from main coroutine";
2501 return; 2645 return;
2502 } 2646 }
… …
2577 Symbol::delete_package "safe::$_" 2721 Symbol::delete_package "safe::$_"
2578 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2722 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2579 2723
2580 warn "unloading cf.pm \"a bit\""; 2724 warn "unloading cf.pm \"a bit\"";
2581 delete $INC{"cf.pm"}; 2725 delete $INC{"cf.pm"};
2726 delete $INC{"cf/pod.pm"};
2582 2727
2583 # don't, removes xs symbols, too, 2728 # don't, removes xs symbols, too,
2584 # and global variables created in xs 2729 # and global variables created in xs
2585 #Symbol::delete_package __PACKAGE__; 2730 #Symbol::delete_package __PACKAGE__;
2586 2731
… …
2601 warn "reattaching attachments to maps"; 2746 warn "reattaching attachments to maps";
2602 reattach $_ for values %MAP; 2747 reattach $_ for values %MAP;
2603 warn "reattaching attachments to players"; 2748 warn "reattaching attachments to players";
2604 reattach $_ for values %PLAYER; 2749 reattach $_ for values %PLAYER;
2605 2750
2606 warn "loading reloadable resources";
2607 reload_resources;
2608
2609 warn "leaving sync_job"; 2751 warn "leaving sync_job";
2610 2752
2611 1 2753 1
2612 } or do { 2754 } or do {
2613 warn $@; 2755 warn $@;
… …
2618 warn "reloaded"; 2760 warn "reloaded";
2619}; 2761};
2620 2762
2621our $RELOAD_WATCHER; # used only during reload 2763our $RELOAD_WATCHER; # used only during reload
2622 2764
2765sub reload_perl() {
2766 # doing reload synchronously and two reloads happen back-to-back,
2767 # coro crashes during coro_state_free->destroy here.
2768
2769 $RELOAD_WATCHER ||= Event->timer (
2770 reentrant => 0,
2771 after => 0,
2772 data => WF_AUTOCANCEL,
2773 cb => sub {
2774 do_reload_perl;
2775 undef $RELOAD_WATCHER;
2776 },
2777 );
2778}
2779
2623register_command "reload" => sub { 2780register_command "reload" => sub {
2624 my ($who, $arg) = @_; 2781 my ($who, $arg) = @_;
2625 2782
2626 if ($who->flag (FLAG_WIZ)) { 2783 if ($who->flag (FLAG_WIZ)) {
2627 $who->message ("reloading server."); 2784 $who->message ("reloading server.");
2628 2785 async { reload_perl };
2629 # doing reload synchronously and two reloads happen back-to-back,
2630 # coro crashes during coro_state_free->destroy here.
2631
2632 $RELOAD_WATCHER ||= Event->timer (
2633 reentrant => 0,
2634 after => 0,
2635 data => WF_AUTOCANCEL,
2636 cb => sub {
2637 reload;
2638 undef $RELOAD_WATCHER;
2639 },
2640 );
2641 } 2786 }
2642}; 2787};
2643 2788
2644unshift @INC, $LIBDIR; 2789unshift @INC, $LIBDIR;
2645 2790
2646my $bug_warning = 0; 2791my $bug_warning = 0;
2792
2793our @WAIT_FOR_TICK;
2794our @WAIT_FOR_TICK_BEGIN;
2795
2796sub wait_for_tick {
2797 return unless $TICK_WATCHER->is_active;
2798 return if $Coro::current == $Coro::main;
2799
2800 my $signal = new Coro::Signal;
2801 push @WAIT_FOR_TICK, $signal;
2802 $signal->wait;
2803}
2804
2805sub wait_for_tick_begin {
2806 return unless $TICK_WATCHER->is_active;
2807 return if $Coro::current == $Coro::main;
2808
2809 my $signal = new Coro::Signal;
2810 push @WAIT_FOR_TICK_BEGIN, $signal;
2811 $signal->wait;
2812}
2647 2813
2648$TICK_WATCHER = Event->timer ( 2814$TICK_WATCHER = Event->timer (
2649 reentrant => 0, 2815 reentrant => 0,
2650 parked => 1, 2816 parked => 1,
2651 prio => 0, 2817 prio => 0,
… …
2659 } 2825 }
2660 2826
2661 $NOW = Event::time; 2827 $NOW = Event::time;
2662 2828
2663 cf::server_tick; # one server iteration 2829 cf::server_tick; # one server iteration
2830
2664 $RUNTIME += $TICK; 2831 $RUNTIME += $TICK;
2665 $NEXT_TICK += $TICK; 2832 $NEXT_TICK += $TICK;
2666 2833
2667 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2834 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2668 $NEXT_RUNTIME_WRITE = $NOW + 10; 2835 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2670 write_runtime 2837 write_runtime
2671 or warn "ERROR: unable to write runtime file: $!"; 2838 or warn "ERROR: unable to write runtime file: $!";
2672 }; 2839 };
2673 } 2840 }
2674 2841
2675 $WAIT_FOR_TICK->broadcast;
2676 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2677
2678# my $AFTER = Event::time; 2842# my $AFTER = Event::time;
2679# warn $AFTER - $NOW;#d# 2843# warn $AFTER - $NOW;#d#
2680 2844
2681 # if we are delayed by four ticks or more, skip them all 2845 # if we are delayed by four ticks or more, skip them all
2682 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2846 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2683 2847
2684 $TICK_WATCHER->at ($NEXT_TICK); 2848 $TICK_WATCHER->at ($NEXT_TICK);
2685 $TICK_WATCHER->start; 2849 $TICK_WATCHER->start;
2850
2851 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2852 $sig->send;
2853 }
2854 while (my $sig = shift @WAIT_FOR_TICK) {
2855 $sig->send;
2856 }
2857
2858 _post_tick;
2686 }, 2859 },
2687); 2860);
2688 2861
2689{ 2862{
2690 BDB::max_poll_time $TICK * 0.1; 2863 BDB::max_poll_time $TICK * 0.1;
… …
2718 2891
2719 cf::sync_job { 2892 cf::sync_job {
2720 eval { 2893 eval {
2721 BDB::db_env_open 2894 BDB::db_env_open
2722 $DB_ENV, 2895 $DB_ENV,
2723 $BDB_ENV_DIR, 2896 $BDBDIR,
2724 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2897 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2725 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2898 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2726 0666; 2899 0666;
2727 2900
2728 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2901 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2729 2902
2730 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2903 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2731 $DB_ENV->set_lk_detect; 2904 $DB_ENV->set_lk_detect;
2732 }; 2905 };
2733 2906
… …
2749 prio => 6, 2922 prio => 6,
2750 cb => \&IO::AIO::poll_cb, 2923 cb => \&IO::AIO::poll_cb,
2751 ); 2924 );
2752} 2925}
2753 2926
2927# load additional modules
2928use cf::pod;
2929
2754END { cf::emergency_save } 2930END { cf::emergency_save }
2755 2931
27561 29321
2757 2933

Diff Legend

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