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.534 by root, Thu Apr 29 08:13:51 2010 UTC vs.
Revision 1.581 by root, Fri Feb 3 02:04:11 2012 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,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 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.
… …
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; # unused 113#our %RESOURCE; # unused
112 114
113our $OUTPUT_RATE_MIN = 3000; 115our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 116our $OUTPUT_RATE_MAX = 1000000;
115 117
116our $MAX_LINKS = 32; # how many chained exits to follow 118our $MAX_LINKS = 32; # how many chained exits to follow
… …
124our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 129our $DB_ENV;
128 130
129our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 132
131our %CFG; 133our %CFG;
132 134
133our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
135our $NOW; 138our $NOW;
136 139
137our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
… …
148 151
149our @POST_INIT; 152our @POST_INIT;
150 153
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
153 159
154binmode STDOUT; 160binmode STDOUT;
155binmode STDERR; 161binmode STDERR;
156 162
157# read virtual server time, if available 163# read virtual server time, if available
… …
191 197
192=over 4 198=over 4
193 199
194=item $cf::UPTIME 200=item $cf::UPTIME
195 201
196The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
197 218
198=item $cf::RUNTIME 219=item $cf::RUNTIME
199 220
200The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 222every server tick.
… …
207Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
210database environment. 231database environment.
211 232
212=item $cf::NOW
213
214The time of the last (current) server tick.
215
216=item $cf::TICK
217
218The interval between server ticks, in seconds.
219
220=item $cf::LOADAVG 233=item $cf::LOADAVG
221 234
222The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
223(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
… …
233from wherever your confdir points to. 246from wherever your confdir points to.
234 247
235=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
236 249
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238returns directly I<after> the tick processing (and consequently, can only wake one process 251returns directly I<after> the tick processing (and consequently, can only wake one thread
239per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
240 270
241=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
242 272
243This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
307} 337}
308 338
309$EV::DIED = sub { 339$EV::DIED = sub {
310 Carp::cluck "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
311}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
312 347
313############################################################################# 348#############################################################################
314 349
315=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
316 351
… …
337 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
338 $d 373 $d
339 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
340} 375}
341 376
377=item $scalar = cf::load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
391=item $success = cf::replace_file $path, $data, $sync
392
393Atomically replaces the file at the given $path with new $data, and
394optionally $sync the data to disk before replacing the file.
395
396=cut
397
398sub replace_file($$;$) {
399 my ($path, $data, $sync) = @_;
400
401 my $lock = cf::lock_acquire ("replace_file:$path");
402
403 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
404 or return;
405
406 $data = $data->() if ref $data;
407
408 length $data == aio_write $fh, 0, (length $data), $data, 0
409 or return;
410
411 !$sync
412 or !aio_fsync $fh
413 or return;
414
415 aio_close $fh
416 and return;
417
418 aio_rename "$path~", $path
419 and return;
420
421 if ($sync) {
422 $path =~ s%/[^/]*$%%;
423 aio_pathsync $path;
424 }
425
426 1
427}
428
342=item $ref = cf::decode_json $json 429=item $ref = cf::decode_json $json
343 430
344Converts a JSON string into the corresponding perl data structure. 431Converts a JSON string into the corresponding perl data structure.
345 432
346=item $json = cf::encode_json $ref 433=item $json = cf::encode_json $ref
… …
352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 439our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353 440
354sub encode_json($) { $json_coder->encode ($_[0]) } 441sub encode_json($) { $json_coder->encode ($_[0]) }
355sub decode_json($) { $json_coder->decode ($_[0]) } 442sub decode_json($) { $json_coder->decode ($_[0]) }
356 443
444=item $ref = cf::decode_storable $scalar
445
446Same as Coro::Storable::thaw, so blocks.
447
448=cut
449
450BEGIN { *decode_storable = \&Coro::Storable::thaw }
451
452=item $ref = cf::decode_yaml $scalar
453
454Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
455
456=cut
457
458sub decode_yaml($) {
459 fork_call { YAML::XS::Load $_[0] } @_
460}
461
462=item $scalar = cf::unlzf $scalar
463
464Same as Compress::LZF::compress, but takes server ticks into account, so
465blocks.
466
467=cut
468
469sub unlzf($) {
470 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
471 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
472 Compress::LZF::decompress $_[0]
473}
474
357=item cf::post_init { BLOCK } 475=item cf::post_init { BLOCK }
358 476
359Execute the given codeblock, I<after> all extensions have been (re-)loaded, 477Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again. 478but I<before> the server starts ticking again.
361 479
362The cdoeblock will have a single boolean argument to indicate whether this 480The codeblock will have a single boolean argument to indicate whether this
363is a reload or not. 481is a reload or not.
364 482
365=cut 483=cut
366 484
367sub post_init(&) { 485sub post_init(&) {
368 push @POST_INIT, shift; 486 push @POST_INIT, shift;
487}
488
489sub _post_init {
490 trace "running post_init jobs";
491
492 # run them in parallel...
493
494 my @join;
495
496 while () {
497 push @join, map &Coro::async ($_, 0), @POST_INIT;
498 @POST_INIT = ();
499
500 @join or last;
501
502 (pop @join)->join;
503 }
369} 504}
370 505
371=item cf::lock_wait $string 506=item cf::lock_wait $string
372 507
373Wait until the given lock is available. See cf::lock_acquire. 508Wait until the given lock is available. See cf::lock_acquire.
… …
426 EV::periodic $start, $interval, 0, $cb 561 EV::periodic $start, $interval, 0, $cb
427} 562}
428 563
429=item cf::get_slot $time[, $priority[, $name]] 564=item cf::get_slot $time[, $priority[, $name]]
430 565
431Allocate $time seconds of blocking CPU time at priority C<$priority>: 566Allocate $time seconds of blocking CPU time at priority C<$priority>
432This call blocks and returns only when you have at least C<$time> seconds 567(default: 0): This call blocks and returns only when you have at least
433of cpu time till the next tick. The slot is only valid till the next cede. 568C<$time> seconds of cpu time till the next tick. The slot is only valid
569till the next cede.
570
571Background jobs should use a priority les than zero, interactive jobs
572should use 100 or more.
434 573
435The optional C<$name> can be used to identify the job to run. It might be 574The optional C<$name> can be used to identify the job to run. It might be
436used for statistical purposes and should identify the same time-class. 575used for statistical purposes and should identify the same time-class.
437 576
438Useful for short background jobs. 577Useful for short background jobs.
… …
467 } 606 }
468 } 607 }
469 608
470 if (@SLOT_QUEUE) { 609 if (@SLOT_QUEUE) {
471 # we do not use wait_for_tick() as it returns immediately when tick is inactive 610 # we do not use wait_for_tick() as it returns immediately when tick is inactive
472 push @cf::WAIT_FOR_TICK, $signal; 611 $WAIT_FOR_TICK->wait;
473 $signal->wait;
474 } else { 612 } else {
475 $busy = 0; 613 $busy = 0;
476 Coro::schedule; 614 Coro::schedule;
477 } 615 }
478 } 616 }
… …
578 $EXT_CORO{$coro+0} = $coro; 716 $EXT_CORO{$coro+0} = $coro;
579 717
580 $coro 718 $coro
581} 719}
582 720
583=item fork_call { }, $args 721=item fork_call { }, @args
584 722
585Executes the given code block with the given arguments in a seperate 723Executes the given code block with the given arguments in a seperate
586process, returning the results. Everything must be serialisable with 724process, returning the results. Everything must be serialisable with
587Coro::Storable. May, of course, block. Note that the executed sub may 725Coro::Storable. May, of course, block. Note that the executed sub may
588never block itself or use any form of event handling. 726never block itself or use any form of event handling.
589 727
590=cut 728=cut
591 729
730sub post_fork {
731 reset_signals;
732}
733
592sub fork_call(&@) { 734sub fork_call(&@) {
593 my ($cb, @args) = @_; 735 my ($cb, @args) = @_;
594 736
595 # we seemingly have to make a local copy of the whole thing, 737 # we seemingly have to make a local copy of the whole thing,
596 # otherwise perl prematurely frees the stuff :/ 738 # otherwise perl prematurely frees the stuff :/
597 # TODO: investigate and fix (likely this will be rather laborious) 739 # TODO: investigate and fix (likely this will be rather laborious)
598 740
599 my @res = Coro::Util::fork_eval { 741 my @res = Coro::Util::fork_eval {
600 reset_signals; 742 cf::post_fork;
601 &$cb 743 &$cb
602 }, @args; 744 } @args;
603 745
604 wantarray ? @res : $res[-1] 746 wantarray ? @res : $res[-1]
605} 747}
606 748
607sub objinfo { 749sub objinfo {
… …
729 871
730 my @data; 872 my @data;
731 my $md5; 873 my $md5;
732 874
733 for (0 .. $#$src) { 875 for (0 .. $#$src) {
734 0 <= aio_load $src->[$_], $data[$_] 876 $data[$_] = load_file $src->[$_];
735 or Carp::croak "$src->[$_]: $!";
736 } 877 }
737 878
738 # if processing is expensive, check 879 # if processing is expensive, check
739 # checksum first 880 # checksum first
740 if (1) { 881 if (1) {
… …
1358 my ($pl, $buf) = @_; 1499 my ($pl, $buf) = @_;
1359 1500
1360 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1501 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1361 1502
1362 if (ref $msg) { 1503 if (ref $msg) {
1363 my ($type, $reply, @payload) = 1504 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1364 "ARRAY" eq ref $msg
1365 ? @$msg
1366 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1367 1505
1368 my @reply; 1506 my @reply;
1369 1507
1370 if (my $cb = $EXTCMD{$type}) { 1508 if (my $cb = $EXTCMD{$type}) {
1371 @reply = $cb->($pl, @payload); 1509 @reply = $cb->($pl, @payload);
… …
1423 1561
1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1562 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1563 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1426 1564
1427 $ext{source} = 1565 $ext{source} =
1428 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1566 "package $pkg; use common::sense;\n"
1429 . "#line 1 \"$path\"\n{\n" 1567 . "#line 1 \"$path\"\n{\n"
1430 . $source 1568 . $source
1431 . "\n};\n1"; 1569 . "\n};\n1";
1432 1570
1433 $todo{$base} = \%ext; 1571 $todo{$base} = \%ext;
… …
1474 1612
1475 while (my ($k, $v) = each %todo) { 1613 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1614 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory}; 1615 if exists $v->{meta}{mandatory};
1478 } 1616 }
1617
1618 last;
1479 } 1619 }
1480 } 1620 }
1481 }; 1621 };
1482} 1622}
1483 1623
… …
1641 my $name = $pl->ob->name; 1781 my $name = $pl->ob->name;
1642 1782
1643 $pl->{deny_save} = 1; 1783 $pl->{deny_save} = 1;
1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1784 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1645 1785
1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1786 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1647 $pl->deactivate; 1787 $pl->deactivate;
1788
1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1789 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1649 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1790 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1791 ext::highscore::check ($pl->ob);
1792
1650 $pl->ns->destroy if $pl->ns; 1793 $pl->ns->destroy if $pl->ns;
1651 1794
1652 my $path = playerdir $pl; 1795 my $path = playerdir $pl;
1653 my $temp = "$path~$cf::RUNTIME~deleting~"; 1796 my $temp = "$path~$cf::RUNTIME~deleting~";
1654 aio_rename $path, $temp; 1797 aio_rename $path, $temp;
… …
1820sub generate_random_map { 1963sub generate_random_map {
1821 my ($self, $rmp) = @_; 1964 my ($self, $rmp) = @_;
1822 1965
1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1966 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824 1967
1825 # mit "rum" bekleckern, nicht
1826 $self->_create_random_map ( 1968 $self->_create_random_map ($rmp);
1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1830 $rmp->{exit_on_final_map},
1831 $rmp->{xsize}, $rmp->{ysize},
1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1834 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1835 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1836 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1837 (cf::region::find $rmp->{region}), $rmp->{custom}
1838 )
1839} 1969}
1840 1970
1841=item cf::map->register ($regex, $prio) 1971=item cf::map->register ($regex, $prio)
1842 1972
1843Register a handler for the map path matching the given regex at the 1973Register a handler for the map path matching the given regex at the
… …
1848 1978
1849sub register { 1979sub register {
1850 my (undef, $regex, $prio) = @_; 1980 my (undef, $regex, $prio) = @_;
1851 my $pkg = caller; 1981 my $pkg = caller;
1852 1982
1853 no strict;
1854 push @{"$pkg\::ISA"}, __PACKAGE__; 1983 push @{"$pkg\::ISA"}, __PACKAGE__;
1855 1984
1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1985 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1857} 1986}
1858 1987
… …
1870} 1999}
1871 2000
1872sub normalise { 2001sub normalise {
1873 my ($path, $base) = @_; 2002 my ($path, $base) = @_;
1874 2003
1875 $path = "$path"; # make sure its a string 2004 $path = "$path"; # make sure it's a string
1876 2005
1877 $path =~ s/\.map$//; 2006 $path =~ s/\.map$//;
1878 2007
1879 # map plan: 2008 # map plan:
1880 # 2009 #
… …
1895 $base =~ s{[^/]+/?$}{}; 2024 $base =~ s{[^/]+/?$}{};
1896 $path = "$base/$path"; 2025 $path = "$base/$path";
1897 } 2026 }
1898 2027
1899 for ($path) { 2028 for ($path) {
1900 redo if s{//}{/};
1901 redo if s{/\.?/}{/}; 2029 redo if s{/\.?/}{/};
1902 redo if s{/[^/]+/\.\./}{/}; 2030 redo if s{/[^/]+/\.\./}{/};
1903 } 2031 }
1904 2032
1905 $path 2033 $path
… …
1919 $self->init; # pass $1 etc. 2047 $self->init; # pass $1 etc.
1920 return $self; 2048 return $self;
1921 } 2049 }
1922 } 2050 }
1923 2051
1924 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2052 Carp::cluck "unable to resolve path '$path' (base '$base')";
1925 () 2053 ()
1926} 2054}
1927 2055
2056# may re-bless or do other evil things
1928sub init { 2057sub init {
1929 my ($self) = @_; 2058 my ($self) = @_;
1930 2059
1931 $self 2060 $self
1932} 2061}
… …
1997 $self->{load_path} = $path; 2126 $self->{load_path} = $path;
1998 2127
1999 1 2128 1
2000} 2129}
2001 2130
2131# used to laod the header of an original map
2002sub load_header_orig { 2132sub load_header_orig {
2003 my ($self) = @_; 2133 my ($self) = @_;
2004 2134
2005 $self->load_header_from ($self->load_path) 2135 $self->load_header_from ($self->load_path)
2006} 2136}
2007 2137
2138# used to laod the header of an instantiated map
2008sub load_header_temp { 2139sub load_header_temp {
2009 my ($self) = @_; 2140 my ($self) = @_;
2010 2141
2011 $self->load_header_from ($self->save_path) 2142 $self->load_header_from ($self->save_path)
2012} 2143}
2013 2144
2145# called after loading the header from an instantiated map
2014sub prepare_temp { 2146sub prepare_temp {
2015 my ($self) = @_; 2147 my ($self) = @_;
2016 2148
2017 $self->last_access ((delete $self->{last_access}) 2149 $self->last_access ((delete $self->{last_access})
2018 || $cf::RUNTIME); #d# 2150 || $cf::RUNTIME); #d#
2019 # safety 2151 # safety
2020 $self->{instantiate_time} = $cf::RUNTIME 2152 $self->{instantiate_time} = $cf::RUNTIME
2021 if $self->{instantiate_time} > $cf::RUNTIME; 2153 if $self->{instantiate_time} > $cf::RUNTIME;
2022} 2154}
2023 2155
2156# called after loading the header from an original map
2024sub prepare_orig { 2157sub prepare_orig {
2025 my ($self) = @_; 2158 my ($self) = @_;
2026 2159
2027 $self->{load_original} = 1; 2160 $self->{load_original} = 1;
2028 $self->{instantiate_time} = $cf::RUNTIME; 2161 $self->{instantiate_time} = $cf::RUNTIME;
… …
2052 2185
2053sub find; 2186sub find;
2054sub find { 2187sub find {
2055 my ($path, $origin) = @_; 2188 my ($path, $origin) = @_;
2056 2189
2190 cf::cede_to_tick;
2191
2057 $path = normalise $path, $origin && $origin->path; 2192 $path = normalise $path, $origin;
2058 2193
2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2194 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2060 my $guard2 = cf::lock_acquire "map_find:$path"; 2195 my $guard2 = cf::lock_acquire "map_find:$path";
2061 2196
2062 $cf::MAP{$path} || do { 2197 $cf::MAP{$path} || do {
… …
2093 2228
2094 { 2229 {
2095 my $guard = cf::lock_acquire "map_data:$path"; 2230 my $guard = cf::lock_acquire "map_data:$path";
2096 2231
2097 return unless $self->valid; 2232 return unless $self->valid;
2098 return unless $self->in_memory == cf::MAP_SWAPPED; 2233 return unless $self->state == cf::MAP_SWAPPED;
2099
2100 $self->in_memory (cf::MAP_LOADING);
2101 2234
2102 $self->alloc; 2235 $self->alloc;
2103 2236
2104 $self->pre_load; 2237 $self->pre_load;
2105 cf::cede_to_tick; 2238 cf::cede_to_tick;
2106 2239
2240 if (exists $self->{load_path}) {
2107 my $f = new_from_file cf::object::thawer $self->{load_path}; 2241 my $f = new_from_file cf::object::thawer $self->{load_path};
2108 $f->skip_block; 2242 $f->skip_block;
2109 $self->_load_objects ($f) 2243 $self->_load_objects ($f)
2110 or return; 2244 or return;
2111 2245
2112 $self->post_load_original 2246 $self->post_load_original
2113 if delete $self->{load_original}; 2247 if delete $self->{load_original};
2114 2248
2115 if (my $uniq = $self->uniq_path) { 2249 if (my $uniq = $self->uniq_path) {
2116 utf8::encode $uniq; 2250 utf8::encode $uniq;
2117 unless (aio_stat $uniq) { 2251 unless (aio_stat $uniq) {
2118 if (my $f = new_from_file cf::object::thawer $uniq) { 2252 if (my $f = new_from_file cf::object::thawer $uniq) {
2119 $self->clear_unique_items; 2253 $self->clear_unique_items;
2120 $self->_load_objects ($f); 2254 $self->_load_objects ($f);
2121 $f->resolve_delayed_derefs; 2255 $f->resolve_delayed_derefs;
2256 }
2122 } 2257 }
2123 } 2258 }
2124 }
2125 2259
2126 $f->resolve_delayed_derefs; 2260 $f->resolve_delayed_derefs;
2261 } else {
2262 $self->post_load_original
2263 if delete $self->{load_original};
2264 }
2265
2266 $self->state (cf::MAP_INACTIVE);
2127 2267
2128 cf::cede_to_tick; 2268 cf::cede_to_tick;
2129 # now do the right thing for maps 2269 # now do the right thing for maps
2130 $self->link_multipart_objects; 2270 $self->link_multipart_objects;
2131 $self->difficulty ($self->estimate_difficulty) 2271 $self->difficulty ($self->estimate_difficulty)
… …
2135 unless ($self->{deny_activate}) { 2275 unless ($self->{deny_activate}) {
2136 $self->decay_objects; 2276 $self->decay_objects;
2137 $self->fix_auto_apply; 2277 $self->fix_auto_apply;
2138 $self->update_buttons; 2278 $self->update_buttons;
2139 cf::cede_to_tick; 2279 cf::cede_to_tick;
2140 $self->activate; 2280 #$self->activate; # no longer activate maps automatically
2141 } 2281 }
2142 2282
2143 $self->{last_save} = $cf::RUNTIME; 2283 $self->{last_save} = $cf::RUNTIME;
2144 $self->last_access ($cf::RUNTIME); 2284 $self->last_access ($cf::RUNTIME);
2145
2146 $self->in_memory (cf::MAP_ACTIVE);
2147 } 2285 }
2148 2286
2149 $self->post_load; 2287 $self->post_load;
2288
2289 1
2150} 2290}
2151 2291
2152# customize the map for a given player, i.e. 2292# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player 2293# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath 2294# maps to change the path to ~playername/mappath
… …
2162# if $self->per_party; 2302# if $self->per_party;
2163 2303
2164 $self 2304 $self
2165} 2305}
2166 2306
2167# find and load all maps in the 3x3 area around a map
2168sub load_neighbours {
2169 my ($map) = @_;
2170
2171 my @neigh; # diagonal neighbours
2172
2173 for (0 .. 3) {
2174 my $neigh = $map->tile_path ($_)
2175 or next;
2176 $neigh = find $neigh, $map
2177 or next;
2178 $neigh->load;
2179
2180 # now find the diagonal neighbours
2181 push @neigh,
2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2184 }
2185
2186 for (grep defined $_->[0], @neigh) {
2187 my ($path, $origin) = @$_;
2188 my $neigh = find $path, $origin
2189 or next;
2190 $neigh->load;
2191 }
2192}
2193
2194sub find_sync { 2307sub find_sync {
2195 my ($path, $origin) = @_; 2308 my ($path, $origin) = @_;
2196 2309
2310 # it's a bug to call this from the main context
2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2311 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main; 2312 if $Coro::current == $Coro::main;
2199 2313
2200 find $path, $origin 2314 find $path, $origin
2201} 2315}
2202 2316
2203sub do_load_sync { 2317sub do_load_sync {
2204 my ($map) = @_; 2318 my ($map) = @_;
2205 2319
2320 # it's a bug to call this from the main context
2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2321 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2207 if $Coro::current == $Coro::main; 2322 if $Coro::current == $Coro::main;
2208 2323
2209 $map->load; 2324 $map->load;
2210} 2325}
… …
2213our $MAP_PREFETCHER = undef; 2328our $MAP_PREFETCHER = undef;
2214 2329
2215sub find_async { 2330sub find_async {
2216 my ($path, $origin, $load) = @_; 2331 my ($path, $origin, $load) = @_;
2217 2332
2218 $path = normalise $path, $origin && $origin->{path}; 2333 $path = normalise $path, $origin;
2219 2334
2220 if (my $map = $cf::MAP{$path}) { 2335 if (my $map = $cf::MAP{$path}) {
2221 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2336 return $map if !$load || $map->linkable;
2222 } 2337 }
2223 2338
2224 $MAP_PREFETCH{$path} |= $load; 2339 $MAP_PREFETCH{$path} |= $load;
2225 2340
2226 $MAP_PREFETCHER ||= cf::async { 2341 $MAP_PREFETCHER ||= cf::async {
… …
2285sub swap_out { 2400sub swap_out {
2286 my ($self) = @_; 2401 my ($self) = @_;
2287 2402
2288 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
2289 2404
2290 return if $self->in_memory != cf::MAP_ACTIVE; 2405 return if !$self->linkable;
2291 return if $self->{deny_save}; 2406 return if $self->{deny_save};
2292 return if $self->players; 2407 return if $self->players;
2293 2408
2294 # first deactivate the map and "unlink" it from the core 2409 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate; 2410 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP; 2411 $_->clear_links_to ($self) for values %cf::MAP;
2297 $self->in_memory (cf::MAP_SWAPPED); 2412 $self->state (cf::MAP_SWAPPED);
2298 2413
2299 # then atomically save 2414 # then atomically save
2300 $self->_save; 2415 $self->_save;
2301 2416
2302 # then free the map 2417 # then free the map
… …
2328 2443
2329 return if $self->players; 2444 return if $self->players;
2330 2445
2331 cf::trace "resetting map ", $self->path, "\n"; 2446 cf::trace "resetting map ", $self->path, "\n";
2332 2447
2333 $self->in_memory (cf::MAP_SWAPPED); 2448 $self->state (cf::MAP_SWAPPED);
2334 2449
2335 # need to save uniques path 2450 # need to save uniques path
2336 unless ($self->{deny_save}) { 2451 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq; 2452 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338 2453
… …
2668 # use -1 or undef as default coordinates, not 0, 0 2783 # use -1 or undef as default coordinates, not 0, 0
2669 ($x, $y) = ($map->enter_x, $map->enter_y) 2784 ($x, $y) = ($map->enter_x, $map->enter_y)
2670 if $x <= 0 && $y <= 0; 2785 if $x <= 0 && $y <= 0;
2671 2786
2672 $map->load; 2787 $map->load;
2673 $map->load_neighbours;
2674 2788
2675 return unless $self->contr->active; 2789 return unless $self->contr->active;
2676 2790
2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2791 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2678 if ($self->enter_map ($map, $x, $y)) { 2792 if ($self->enter_map ($map, $x, $y)) {
… …
2734 ($path, $x, $y) = (undef, undef, undef); 2848 ($path, $x, $y) = (undef, undef, undef);
2735 } 2849 }
2736 } 2850 }
2737 2851
2738 my $map = eval { 2852 my $map = eval {
2739 my $map = defined $path ? cf::map::find $path : undef; 2853 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2740 2854
2741 if ($map) { 2855 if ($map) {
2742 $map = $map->customise_for ($self); 2856 $map = $map->customise_for ($self);
2743 $map = $check->($map, $x, $y, $self) if $check && $map; 2857 $map = $check->($map, $x, $y, $self) if $check && $map;
2744 } else { 2858 } else {
… …
2834 $Coro::current->{desc} = "enter_exit"; 2948 $Coro::current->{desc} = "enter_exit";
2835 2949
2836 unless (eval { 2950 unless (eval {
2837 $self->deactivate_recursive; # just to be sure 2951 $self->deactivate_recursive; # just to be sure
2838 2952
2839 # random map handling
2840 {
2841 my $guard = cf::lock_acquire "exit_prepare:$exit";
2842
2843 prepare_random_map $exit
2844 if $exit->slaying eq "/!";
2845 }
2846
2847 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2953 my $map = cf::map::normalise $exit->slaying, $exit->map;
2848 my $x = $exit->stats->hp; 2954 my $x = $exit->stats->hp;
2849 my $y = $exit->stats->sp; 2955 my $y = $exit->stats->sp;
2956
2957 # special map handling
2958 my $slaying = $exit->slaying;
2959
2960 # special map handling
2961 if ($slaying eq "/!") {
2962 my $guard = cf::lock_acquire "exit_prepare:$exit";
2963
2964 prepare_random_map $exit
2965 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2966
2967 $map = $exit->slaying;
2968
2969 } elsif ($slaying eq '!up') {
2970 $map = $exit->map->tile_path (cf::TILE_UP);
2971 $x = $exit->x;
2972 $y = $exit->y;
2973
2974 } elsif ($slaying eq '!down') {
2975 $map = $exit->map->tile_path (cf::TILE_DOWN);
2976 $x = $exit->x;
2977 $y = $exit->y;
2978 }
2850 2979
2851 $self->goto ($map, $x, $y); 2980 $self->goto ($map, $x, $y);
2852 2981
2853 # if exit is damned, update players death & WoR home-position 2982 # if exit is damned, update players death & WoR home-position
2854 $self->contr->savebed ($map, $x, $y) 2983 $self->contr->savebed ($map, $x, $y)
… …
3096=cut 3225=cut
3097 3226
3098sub cf::client::ext_reply($$@) { 3227sub cf::client::ext_reply($$@) {
3099 my ($self, $id, @msg) = @_; 3228 my ($self, $id, @msg) = @_;
3100 3229
3101 if ($self->extcmd == 2) { 3230 return unless $self->extcmd == 2;
3231
3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3232 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3103 } elsif ($self->extcmd == 1) {
3104 #TODO: version 1, remove
3105 unshift @msg, msgtype => "reply", msgid => $id;
3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3107 }
3108} 3233}
3109 3234
3110=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
3111 3236
3112Queues a query to the client, calling the given callback with 3237Queues a query to the client, calling the given callback with
… …
3167 my ($ns, $buf) = @_; 3292 my ($ns, $buf) = @_;
3168 3293
3169 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3294 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3170 3295
3171 if (ref $msg) { 3296 if (ref $msg) {
3172 my ($type, $reply, @payload) = 3297 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3173 "ARRAY" eq ref $msg
3174 ? @$msg
3175 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3176 3298
3177 my @reply; 3299 my @reply;
3178 3300
3179 if (my $cb = $EXTICMD{$type}) { 3301 if (my $cb = $EXTICMD{$type}) {
3180 @reply = $cb->($ns, @payload); 3302 @reply = $cb->($ns, @payload);
… …
3273 decrease split destroy change_exp value msg lore send_msg)], 3395 decrease split destroy change_exp value msg lore send_msg)],
3274 ["cf::object::player" => qw(player)], 3396 ["cf::object::player" => qw(player)],
3275 ["cf::player" => qw(peaceful send_msg)], 3397 ["cf::player" => qw(peaceful send_msg)],
3276 ["cf::map" => qw(trigger)], 3398 ["cf::map" => qw(trigger)],
3277) { 3399) {
3278 no strict 'refs';
3279 my ($pkg, @funs) = @$_; 3400 my ($pkg, @funs) = @$_;
3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3401 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3281 for @funs; 3402 for @funs;
3282} 3403}
3283 3404
… …
3370 3491
3371 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3492 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3372 3493
3373 trace "loading facedata from $path\n"; 3494 trace "loading facedata from $path\n";
3374 3495
3375 my $facedata; 3496 my $facedata = decode_storable load_file $path;
3376 0 < aio_load $path, $facedata
3377 or die "$path: $!";
3378
3379 $facedata = Coro::Storable::thaw $facedata;
3380 3497
3381 $facedata->{version} == 2 3498 $facedata->{version} == 2
3382 or cf::cleanup "$path: version mismatch, cannot proceed."; 3499 or cf::cleanup "$path: version mismatch, cannot proceed.";
3383 3500
3384 # patch in the exptable 3501 # patch in the exptable
… …
3398 3515
3399 cf::face::set_visibility $idx, $info->{visibility}; 3516 cf::face::set_visibility $idx, $info->{visibility};
3400 cf::face::set_magicmap $idx, $info->{magicmap}; 3517 cf::face::set_magicmap $idx, $info->{magicmap};
3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3518 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3519 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3520 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3403 3521
3404 cf::cede_to_tick; 3522 cf::cede_to_tick;
3405 } 3523 }
3406 3524
3407 while (my ($face, $info) = each %$faces) { 3525 while (my ($face, $info) = each %$faces) {
… …
3434 3552
3435 { 3553 {
3436 my $res = $facedata->{resource}; 3554 my $res = $facedata->{resource};
3437 3555
3438 while (my ($name, $info) = each %$res) { 3556 while (my ($name, $info) = each %$res) {
3439 if (defined $info->{type}) { 3557 if (defined (my $type = $info->{type})) {
3558 # TODO: different hash - must free and use new index, or cache ixface data queue
3440 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3559 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3441 3560
3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3561 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3443 cf::face::set_type $idx, $info->{type}; 3562 cf::face::set_type $idx, $type;
3563 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3444 } else { 3564 } else {
3445 $RESOURCE{$name} = $info; # unused 3565# $RESOURCE{$name} = $info; # unused
3446 } 3566 }
3447 3567
3448 cf::cede_to_tick; 3568 cf::cede_to_tick;
3449 } 3569 }
3450 } 3570 }
… …
3502} 3622}
3503 3623
3504sub reload_sound { 3624sub reload_sound {
3505 trace "loading sound config from $DATADIR/sound\n"; 3625 trace "loading sound config from $DATADIR/sound\n";
3506 3626
3507 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508 or die "$DATADIR/sound $!";
3509
3510 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3627 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3511 3628
3512 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3629 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513 my $sound = $soundconf->{compat}[$_] 3630 my $sound = $soundconf->{compat}[$_]
3514 or next; 3631 or next;
3515 3632
… …
3525} 3642}
3526 3643
3527sub reload_resources { 3644sub reload_resources {
3528 trace "reloading resource files...\n"; 3645 trace "reloading resource files...\n";
3529 3646
3647 reload_exp_table;
3648 reload_materials;
3530 reload_facedata; 3649 reload_facedata;
3531 reload_sound; 3650 reload_sound;
3532 reload_archetypes; 3651 reload_archetypes;
3533 reload_regions; 3652 reload_regions;
3534 reload_treasures; 3653 reload_treasures;
… …
3537} 3656}
3538 3657
3539sub reload_config { 3658sub reload_config {
3540 trace "reloading config file...\n"; 3659 trace "reloading config file...\n";
3541 3660
3542 open my $fh, "<:utf8", "$CONFDIR/config" 3661 my $config = load_file "$CONFDIR/config";
3543 or return; 3662 utf8::decode $config;
3544 3663 *CFG = decode_yaml $config;
3545 local $/;
3546 *CFG = YAML::XS::Load scalar <$fh>;
3547 3664
3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3665 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3549 3666
3550 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3667 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3551 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3668 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3555 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3672 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3556 and die "WARNING: m(un)lockall failed: $!\n"; 3673 and die "WARNING: m(un)lockall failed: $!\n";
3557 }; 3674 };
3558 warn $@ if $@; 3675 warn $@ if $@;
3559 } 3676 }
3560
3561 trace "finished reloading resource files\n";
3562} 3677}
3563 3678
3564sub pidfile() { 3679sub pidfile() {
3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3680 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3566 or die "$PIDFILE: $!"; 3681 or die "$PIDFILE: $!";
… …
3591 3706
3592sub main { 3707sub main {
3593 cf::init_globals; # initialise logging 3708 cf::init_globals; # initialise logging
3594 3709
3595 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3710 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3596 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3711 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3597 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3712 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3598 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3713 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3599 3714
3600 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3715 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3601 3716
… …
3609 }; 3724 };
3610 3725
3611 evthread_start IO::AIO::poll_fileno; 3726 evthread_start IO::AIO::poll_fileno;
3612 3727
3613 cf::sync_job { 3728 cf::sync_job {
3614 cf::init_experience; 3729 cf::incloader::init ();
3730
3615 cf::init_anim; 3731 cf::init_anim;
3616 cf::init_attackmess; 3732 cf::init_attackmess;
3617 cf::init_dynamic; 3733 cf::init_dynamic;
3618 3734
3619 cf::load_settings; 3735 cf::load_settings;
3620 cf::load_materials;
3621 3736
3622 reload_resources; 3737 reload_resources;
3623 reload_config; 3738 reload_config;
3624 db_init; 3739 db_init;
3625 3740
… …
3637 3752
3638 # no (long-running) fork's whatsoever before this point(!) 3753 # no (long-running) fork's whatsoever before this point(!)
3639 use POSIX (); 3754 use POSIX ();
3640 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3755 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3641 3756
3642 (pop @POST_INIT)->(0) while @POST_INIT; 3757 cf::_post_init 0;
3643 }; 3758 };
3644 3759
3645 cf::object::thawer::errors_are_fatal 0; 3760 cf::object::thawer::errors_are_fatal 0;
3646 info "parse errors in files are no longer fatal from this point on.\n"; 3761 info "parse errors in files are no longer fatal from this point on.\n";
3647 3762
3763 AE::postpone {
3764 undef &main; # free gobs of memory :)
3765 };
3766
3648 main_loop; 3767 goto &main_loop;
3649} 3768}
3650 3769
3651############################################################################# 3770#############################################################################
3652# initialisation and cleanup 3771# initialisation and cleanup
3653 3772
… …
3758 # save all maps without fsync, and later call a global sync 3877 # save all maps without fsync, and later call a global sync
3759 # (which in turn might be very very slow) 3878 # (which in turn might be very very slow)
3760 local $USE_FSYNC = 0; 3879 local $USE_FSYNC = 0;
3761 3880
3762 cf::sync_job { 3881 cf::sync_job {
3882 cf::write_runtime_sync; # external watchdog should not bark
3883
3763 # use a peculiar iteration method to avoid tripping on perl 3884 # use a peculiar iteration method to avoid tripping on perl
3764 # refcount bugs in for. also avoids problems with players 3885 # refcount bugs in for. also avoids problems with players
3765 # and maps saved/destroyed asynchronously. 3886 # and maps saved/destroyed asynchronously.
3766 info "emergency_perl_save: begin player save\n"; 3887 info "emergency_perl_save: begin player save\n";
3767 for my $login (keys %cf::PLAYER) { 3888 for my $login (keys %cf::PLAYER) {
… …
3770 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3891 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3771 $pl->save; 3892 $pl->save;
3772 } 3893 }
3773 info "emergency_perl_save: end player save\n"; 3894 info "emergency_perl_save: end player save\n";
3774 3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3775 info "emergency_perl_save: begin map save\n"; 3898 info "emergency_perl_save: begin map save\n";
3776 for my $path (keys %cf::MAP) { 3899 for my $path (keys %cf::MAP) {
3777 my $map = $cf::MAP{$path} or next; 3900 my $map = $cf::MAP{$path} or next;
3778 $map->valid or next; 3901 $map->valid or next;
3779 $map->save; 3902 $map->save;
3780 } 3903 }
3781 info "emergency_perl_save: end map save\n"; 3904 info "emergency_perl_save: end map save\n";
3782 3905
3906 cf::write_runtime_sync; # external watchdog should not bark
3907
3783 info "emergency_perl_save: begin database checkpoint\n"; 3908 info "emergency_perl_save: begin database checkpoint\n";
3784 BDB::db_env_txn_checkpoint $DB_ENV; 3909 BDB::db_env_txn_checkpoint $DB_ENV;
3785 info "emergency_perl_save: end database checkpoint\n"; 3910 info "emergency_perl_save: end database checkpoint\n";
3786 3911
3787 info "emergency_perl_save: begin write uuid\n"; 3912 info "emergency_perl_save: begin write uuid\n";
3788 write_uuid_sync 1; 3913 write_uuid_sync 1;
3789 info "emergency_perl_save: end write uuid\n"; 3914 info "emergency_perl_save: end write uuid\n";
3790 };
3791 3915
3916 cf::write_runtime_sync; # external watchdog should not bark
3917
3918 trace "emergency_perl_save: syncing database to disk";
3919 BDB::db_env_txn_checkpoint $DB_ENV;
3920
3792 info "emergency_perl_save: starting sync()\n"; 3921 info "emergency_perl_save: starting sync\n";
3793 IO::AIO::aio_sync sub { 3922 IO::AIO::aio_sync sub {
3794 info "emergency_perl_save: finished sync()\n"; 3923 info "emergency_perl_save: finished sync\n";
3924 };
3925
3926 cf::write_runtime_sync; # external watchdog should not bark
3927
3928 trace "emergency_perl_save: flushing outstanding aio requests";
3929 while (IO::AIO::nreqs || BDB::nreqs) {
3930 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3931 }
3932
3933 cf::write_runtime_sync; # external watchdog should not bark
3795 }; 3934 };
3796 3935
3797 info "emergency_perl_save: leave\n"; 3936 info "emergency_perl_save: leave\n";
3798} 3937}
3799 3938
3800sub post_cleanup { 3939sub post_cleanup {
3801 my ($make_core) = @_; 3940 my ($make_core) = @_;
3941
3942 IO::AIO::flush;
3802 3943
3803 error Carp::longmess "post_cleanup backtrace" 3944 error Carp::longmess "post_cleanup backtrace"
3804 if $make_core; 3945 if $make_core;
3805 3946
3806 my $fh = pidfile; 3947 my $fh = pidfile;
… …
3832 } 3973 }
3833} 3974}
3834 3975
3835sub do_reload_perl() { 3976sub do_reload_perl() {
3836 # can/must only be called in main 3977 # can/must only be called in main
3837 if (in_main) { 3978 unless (in_main) {
3838 error "can only reload from main coroutine"; 3979 error "can only reload from main coroutine";
3839 return; 3980 return;
3840 } 3981 }
3841 3982
3842 return if $RELOAD++; 3983 return if $RELOAD++;
3843 3984
3844 my $t1 = AE::time; 3985 my $t1 = AE::time;
3845 3986
3846 while ($RELOAD) { 3987 while ($RELOAD) {
3988 cf::get_slot 0.1, -1, "reload_perl";
3847 info "reloading..."; 3989 info "perl_reload: reloading...";
3848 3990
3849 trace "entering sync_job"; 3991 trace "perl_reload: entering sync_job";
3850 3992
3851 cf::sync_job { 3993 cf::sync_job {
3852 cf::write_runtime_sync; # external watchdog should not bark
3853 cf::emergency_save; 3994 #cf::emergency_save;
3854 cf::write_runtime_sync; # external watchdog should not bark
3855 3995
3856 trace "syncing database to disk";
3857 BDB::db_env_txn_checkpoint $DB_ENV;
3858
3859 # if anything goes wrong in here, we should simply crash as we already saved
3860
3861 trace "flushing outstanding aio requests";
3862 while (IO::AIO::nreqs || BDB::nreqs) {
3863 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3864 }
3865
3866 trace "cancelling all extension coros"; 3996 trace "perl_reload: cancelling all extension coros";
3867 $_->cancel for values %EXT_CORO; 3997 $_->cancel for values %EXT_CORO;
3868 %EXT_CORO = (); 3998 %EXT_CORO = ();
3869 3999
3870 trace "removing commands"; 4000 trace "perl_reload: removing commands";
3871 %COMMAND = (); 4001 %COMMAND = ();
3872 4002
3873 trace "removing ext/exti commands"; 4003 trace "perl_reload: removing ext/exti commands";
3874 %EXTCMD = (); 4004 %EXTCMD = ();
3875 %EXTICMD = (); 4005 %EXTICMD = ();
3876 4006
3877 trace "unloading/nuking all extensions"; 4007 trace "perl_reload: unloading/nuking all extensions";
3878 for my $pkg (@EXTS) { 4008 for my $pkg (@EXTS) {
3879 trace "... unloading $pkg"; 4009 trace "... unloading $pkg";
3880 4010
3881 if (my $cb = $pkg->can ("unload")) { 4011 if (my $cb = $pkg->can ("unload")) {
3882 eval { 4012 eval {
… …
3887 4017
3888 trace "... clearing $pkg"; 4018 trace "... clearing $pkg";
3889 clear_package $pkg; 4019 clear_package $pkg;
3890 } 4020 }
3891 4021
3892 trace "unloading all perl modules loaded from $LIBDIR"; 4022 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3893 while (my ($k, $v) = each %INC) { 4023 while (my ($k, $v) = each %INC) {
3894 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4024 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3895 4025
3896 trace "... unloading $k"; 4026 trace "... unloading $k";
3897 delete $INC{$k}; 4027 delete $INC{$k};
… …
3904 } 4034 }
3905 4035
3906 clear_package $k; 4036 clear_package $k;
3907 } 4037 }
3908 4038
3909 trace "getting rid of safe::, as good as possible"; 4039 trace "perl_reload: getting rid of safe::, as good as possible";
3910 clear_package "safe::$_" 4040 clear_package "safe::$_"
3911 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4041 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3912 4042
3913 trace "unloading cf.pm \"a bit\""; 4043 trace "perl_reload: unloading cf.pm \"a bit\"";
3914 delete $INC{"cf.pm"}; 4044 delete $INC{"cf.pm"};
3915 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4045 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3916 4046
3917 # don't, removes xs symbols, too, 4047 # don't, removes xs symbols, too,
3918 # and global variables created in xs 4048 # and global variables created in xs
3919 #clear_package __PACKAGE__; 4049 #clear_package __PACKAGE__;
3920 4050
3921 info "unload completed, starting to reload now"; 4051 info "perl_reload: unload completed, starting to reload now";
3922 4052
3923 trace "reloading cf.pm"; 4053 trace "perl_reload: reloading cf.pm";
3924 require cf; 4054 require cf;
3925 cf::_connect_to_perl_1; 4055 cf::_connect_to_perl_1;
3926 4056
3927 trace "loading config and database again"; 4057 trace "perl_reload: loading config and database again";
3928 cf::reload_config; 4058 cf::reload_config;
3929 4059
3930 trace "loading extensions"; 4060 trace "perl_reload: loading extensions";
3931 cf::load_extensions; 4061 cf::load_extensions;
3932 4062
3933 if ($REATTACH_ON_RELOAD) { 4063 if ($REATTACH_ON_RELOAD) {
3934 trace "reattaching attachments to objects/players"; 4064 trace "perl_reload: reattaching attachments to objects/players";
3935 _global_reattach; # objects, sockets 4065 _global_reattach; # objects, sockets
3936 trace "reattaching attachments to maps"; 4066 trace "perl_reload: reattaching attachments to maps";
3937 reattach $_ for values %MAP; 4067 reattach $_ for values %MAP;
3938 trace "reattaching attachments to players"; 4068 trace "perl_reload: reattaching attachments to players";
3939 reattach $_ for values %PLAYER; 4069 reattach $_ for values %PLAYER;
3940 } 4070 }
3941 4071
3942 trace "running post_init jobs"; 4072 cf::_post_init 1;
3943 (pop @POST_INIT)->(1) while @POST_INIT;
3944 4073
3945 trace "leaving sync_job"; 4074 trace "perl_reload: leaving sync_job";
3946 4075
3947 1 4076 1
3948 } or do { 4077 } or do {
3949 error $@; 4078 error $@;
3950 cf::cleanup "error while reloading, exiting."; 4079 cf::cleanup "perl_reload: error, exiting.";
3951 }; 4080 };
3952 4081
3953 info "reloaded";
3954 --$RELOAD; 4082 --$RELOAD;
3955 } 4083 }
3956 4084
3957 $t1 = AE::time - $t1; 4085 $t1 = AE::time - $t1;
3958 info "reload completed in ${t1}s\n"; 4086 info "perl_reload: completed in ${t1}s\n";
3959}; 4087};
3960 4088
3961our $RELOAD_WATCHER; # used only during reload 4089our $RELOAD_WATCHER; # used only during reload
3962 4090
3963sub reload_perl() { 4091sub reload_perl() {
… …
3984 reload_perl; 4112 reload_perl;
3985 }; 4113 };
3986 } 4114 }
3987}; 4115};
3988 4116
3989unshift @INC, $LIBDIR; 4117#############################################################################
3990 4118
3991my $bug_warning = 0; 4119my $bug_warning = 0;
3992 4120
3993our @WAIT_FOR_TICK;
3994our @WAIT_FOR_TICK_BEGIN;
3995
3996sub wait_for_tick { 4121sub wait_for_tick() {
3997 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4122 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3998 4123
3999 my $signal = new Coro::Signal; 4124 $WAIT_FOR_TICK->wait;
4000 push @WAIT_FOR_TICK, $signal;
4001 $signal->wait;
4002} 4125}
4003 4126
4004sub wait_for_tick_begin { 4127sub wait_for_tick_begin() {
4005 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4128 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4006 4129
4007 my $signal = new Coro::Signal; 4130 my $signal = new Coro::Signal;
4008 push @WAIT_FOR_TICK_BEGIN, $signal; 4131 push @WAIT_FOR_TICK_BEGIN, $signal;
4009 $signal->wait; 4132 $signal->wait;
4010} 4133}
… …
4014 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4137 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4015 unless ++$bug_warning > 10; 4138 unless ++$bug_warning > 10;
4016 return; 4139 return;
4017 } 4140 }
4018 4141
4019 cf::server_tick; # one server iteration 4142 cf::one_tick; # one server iteration
4020 4143
4021 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4144 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4022 4145
4023 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4024 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4147 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4030 } 4153 }
4031 4154
4032 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4155 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4033 $sig->send; 4156 $sig->send;
4034 } 4157 }
4035 while (my $sig = shift @WAIT_FOR_TICK) { 4158 $WAIT_FOR_TICK->broadcast;
4036 $sig->send;
4037 }
4038 4159
4039 $LOAD = ($NOW - $TICK_START) / $TICK; 4160 $LOAD = ($NOW - $TICK_START) / $TICK;
4040 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4161 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4041 4162
4042 if (0) { 4163 if (0) {
… …
4051{ 4172{
4052 # configure BDB 4173 # configure BDB
4053 4174
4054 BDB::min_parallel 16; 4175 BDB::min_parallel 16;
4055 BDB::max_poll_reqs $TICK * 0.1; 4176 BDB::max_poll_reqs $TICK * 0.1;
4056 $AnyEvent::BDB::WATCHER->priority (1); 4177 #$AnyEvent::BDB::WATCHER->priority (1);
4057 4178
4058 unless ($DB_ENV) { 4179 unless ($DB_ENV) {
4059 $DB_ENV = BDB::db_env_create; 4180 $DB_ENV = BDB::db_env_create;
4060 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4181 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4061 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4182 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4096 IO::AIO::min_parallel 8; 4217 IO::AIO::min_parallel 8;
4097 IO::AIO::max_poll_time $TICK * 0.1; 4218 IO::AIO::max_poll_time $TICK * 0.1;
4098 undef $AnyEvent::AIO::WATCHER; 4219 undef $AnyEvent::AIO::WATCHER;
4099} 4220}
4100 4221
4101my $_log_backtrace; 4222our $_log_backtrace;
4223our $_log_backtrace_last;
4102 4224
4103sub _log_backtrace { 4225sub _log_backtrace {
4104 my ($msg, @addr) = @_; 4226 my ($msg, @addr) = @_;
4105 4227
4106 $msg =~ s/\n//; 4228 $msg =~ s/\n$//;
4107 4229
4230 if ($_log_backtrace_last eq $msg) {
4231 LOG llevInfo, "[ABT] $msg\n";
4232 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4108 # limit the # of concurrent backtraces 4233 # limit the # of concurrent backtraces
4109 if ($_log_backtrace < 2) { 4234 } elsif ($_log_backtrace < 2) {
4235 $_log_backtrace_last = $msg;
4110 ++$_log_backtrace; 4236 ++$_log_backtrace;
4111 my $perl_bt = Carp::longmess $msg; 4237 my $perl_bt = Carp::longmess $msg;
4112 async { 4238 async {
4113 $Coro::current->{desc} = "abt $msg"; 4239 $Coro::current->{desc} = "abt $msg";
4114 4240
… …
4134 LOG llevInfo, "[ABT] $_\n" for @bt; 4260 LOG llevInfo, "[ABT] $_\n" for @bt;
4135 --$_log_backtrace; 4261 --$_log_backtrace;
4136 }; 4262 };
4137 } else { 4263 } else {
4138 LOG llevInfo, "[ABT] $msg\n"; 4264 LOG llevInfo, "[ABT] $msg\n";
4139 LOG llevInfo, "[ABT] [suppressed]\n"; 4265 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4140 } 4266 }
4141} 4267}
4142 4268
4143# load additional modules 4269# load additional modules
4144require "cf/$_.pm" for @EXTRA_MODULES; 4270require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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