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.537 by root, Sun May 2 19:16:16 2010 UTC vs.
Revision 1.580 by root, Wed Jan 4 03:22:48 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 = 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
342=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
343 392
344Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
345 394
346=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
… …
352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353 402
354sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
355sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
356 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
357=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
358 438
359Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
361 441
362The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
363is a reload or not. 443is a reload or not.
364 444
365=cut 445=cut
366 446
367sub post_init(&) { 447sub post_init(&) {
368 push @POST_INIT, shift; 448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
369} 466}
370 467
371=item cf::lock_wait $string 468=item cf::lock_wait $string
372 469
373Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
… …
426 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
427} 524}
428 525
429=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
430 527
431Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
432This call blocks and returns only when you have at least C<$time> seconds 529(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. 530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
434 535
435The optional C<$name> can be used to identify the job to run. It might be 536The 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. 537used for statistical purposes and should identify the same time-class.
437 538
438Useful for short background jobs. 539Useful for short background jobs.
… …
467 } 568 }
468 } 569 }
469 570
470 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
471 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
472 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
473 $signal->wait;
474 } else { 574 } else {
475 $busy = 0; 575 $busy = 0;
476 Coro::schedule; 576 Coro::schedule;
477 } 577 }
478 } 578 }
… …
578 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
579 679
580 $coro 680 $coro
581} 681}
582 682
583=item fork_call { }, $args 683=item fork_call { }, @args
584 684
585Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
586process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
587Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
588never block itself or use any form of event handling. 688never block itself or use any form of event handling.
589 689
590=cut 690=cut
591 691
692sub post_fork {
693 reset_signals;
694}
695
592sub fork_call(&@) { 696sub fork_call(&@) {
593 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
594 698
595 # we seemingly have to make a local copy of the whole thing, 699 # we seemingly have to make a local copy of the whole thing,
596 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
597 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
598 702
599 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
600 reset_signals; 704 cf::post_fork;
601 &$cb 705 &$cb
602 }, @args; 706 } @args;
603 707
604 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
605} 709}
606 710
607sub objinfo { 711sub objinfo {
… …
729 833
730 my @data; 834 my @data;
731 my $md5; 835 my $md5;
732 836
733 for (0 .. $#$src) { 837 for (0 .. $#$src) {
734 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
735 or Carp::croak "$src->[$_]: $!";
736 } 839 }
737 840
738 # if processing is expensive, check 841 # if processing is expensive, check
739 # checksum first 842 # checksum first
740 if (1) { 843 if (1) {
… …
1358 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1359 1462
1360 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1361 1464
1362 if (ref $msg) { 1465 if (ref $msg) {
1363 my ($type, $reply, @payload) = 1466 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 1467
1368 my @reply; 1468 my @reply;
1369 1469
1370 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1371 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
… …
1423 1523
1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1426 1526
1427 $ext{source} = 1527 $ext{source} =
1428 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1429 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1430 . $source 1530 . $source
1431 . "\n};\n1"; 1531 . "\n};\n1";
1432 1532
1433 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
… …
1474 1574
1475 while (my ($k, $v) = each %todo) { 1575 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory}; 1577 if exists $v->{meta}{mandatory};
1478 } 1578 }
1579
1580 last;
1479 } 1581 }
1480 } 1582 }
1481 }; 1583 };
1482} 1584}
1483 1585
… …
1641 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1642 1744
1643 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1746 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1645 1747
1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1647 $pl->deactivate; 1749 $pl->deactivate;
1750
1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1649 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1650 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1651 1756
1652 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1653 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1654 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
… …
1820sub generate_random_map { 1925sub generate_random_map {
1821 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1822 1927
1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824 1929
1825 # mit "rum" bekleckern, nicht
1826 $self->_create_random_map ( 1930 $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} 1931}
1840 1932
1841=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1842 1934
1843Register a handler for the map path matching the given regex at the 1935Register a handler for the map path matching the given regex at the
… …
1848 1940
1849sub register { 1941sub register {
1850 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1851 my $pkg = caller; 1943 my $pkg = caller;
1852 1944
1853 no strict;
1854 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1855 1946
1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1857} 1948}
1858 1949
… …
1870} 1961}
1871 1962
1872sub normalise { 1963sub normalise {
1873 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1874 1965
1875 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1876 1967
1877 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1878 1969
1879 # map plan: 1970 # map plan:
1880 # 1971 #
… …
1895 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1896 $path = "$base/$path"; 1987 $path = "$base/$path";
1897 } 1988 }
1898 1989
1899 for ($path) { 1990 for ($path) {
1900 redo if s{//}{/};
1901 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1902 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1903 } 1993 }
1904 1994
1905 $path 1995 $path
… …
1919 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1920 return $self; 2010 return $self;
1921 } 2011 }
1922 } 2012 }
1923 2013
1924 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1925 () 2015 ()
1926} 2016}
1927 2017
2018# may re-bless or do other evil things
1928sub init { 2019sub init {
1929 my ($self) = @_; 2020 my ($self) = @_;
1930 2021
1931 $self 2022 $self
1932} 2023}
… …
1997 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1998 2089
1999 1 2090 1
2000} 2091}
2001 2092
2093# used to laod the header of an original map
2002sub load_header_orig { 2094sub load_header_orig {
2003 my ($self) = @_; 2095 my ($self) = @_;
2004 2096
2005 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
2006} 2098}
2007 2099
2100# used to laod the header of an instantiated map
2008sub load_header_temp { 2101sub load_header_temp {
2009 my ($self) = @_; 2102 my ($self) = @_;
2010 2103
2011 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
2012} 2105}
2013 2106
2107# called after loading the header from an instantiated map
2014sub prepare_temp { 2108sub prepare_temp {
2015 my ($self) = @_; 2109 my ($self) = @_;
2016 2110
2017 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
2018 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
2019 # safety 2113 # safety
2020 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
2021 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
2022} 2116}
2023 2117
2118# called after loading the header from an original map
2024sub prepare_orig { 2119sub prepare_orig {
2025 my ($self) = @_; 2120 my ($self) = @_;
2026 2121
2027 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
2028 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
… …
2052 2147
2053sub find; 2148sub find;
2054sub find { 2149sub find {
2055 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
2056 2151
2152 cf::cede_to_tick;
2153
2057 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
2058 2155
2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2060 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
2061 2158
2062 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
… …
2093 2190
2094 { 2191 {
2095 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2096 2193
2097 return unless $self->valid; 2194 return unless $self->valid;
2098 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2099
2100 $self->in_memory (cf::MAP_LOADING);
2101 2196
2102 $self->alloc; 2197 $self->alloc;
2103 2198
2104 $self->pre_load; 2199 $self->pre_load;
2105 cf::cede_to_tick; 2200 cf::cede_to_tick;
2106 2201
2202 if (exists $self->{load_path}) {
2107 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2108 $f->skip_block; 2204 $f->skip_block;
2109 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2110 or return; 2206 or return;
2111 2207
2112 $self->post_load_original 2208 $self->post_load_original
2113 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2114 2210
2115 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2116 utf8::encode $uniq; 2212 utf8::encode $uniq;
2117 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2118 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2119 $self->clear_unique_items; 2215 $self->clear_unique_items;
2120 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2121 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2122 } 2219 }
2123 } 2220 }
2124 }
2125 2221
2126 $f->resolve_delayed_derefs; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
2127 2229
2128 cf::cede_to_tick; 2230 cf::cede_to_tick;
2129 # now do the right thing for maps 2231 # now do the right thing for maps
2130 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2131 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
… …
2135 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2136 $self->decay_objects; 2238 $self->decay_objects;
2137 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2138 $self->update_buttons; 2240 $self->update_buttons;
2139 cf::cede_to_tick; 2241 cf::cede_to_tick;
2140 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2141 } 2243 }
2142 2244
2143 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2144 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2145
2146 $self->in_memory (cf::MAP_ACTIVE);
2147 } 2247 }
2148 2248
2149 $self->post_load; 2249 $self->post_load;
2250
2251 1
2150} 2252}
2151 2253
2152# customize the map for a given player, i.e. 2254# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player 2255# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath 2256# maps to change the path to ~playername/mappath
… …
2162# if $self->per_party; 2264# if $self->per_party;
2163 2265
2164 $self 2266 $self
2165} 2267}
2166 2268
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 { 2269sub find_sync {
2195 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2196 2271
2272 # it's a bug to call this from the main context
2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main; 2274 if $Coro::current == $Coro::main;
2199 2275
2200 find $path, $origin 2276 find $path, $origin
2201} 2277}
2202 2278
2203sub do_load_sync { 2279sub do_load_sync {
2204 my ($map) = @_; 2280 my ($map) = @_;
2205 2281
2282 # it's a bug to call this from the main context
2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2207 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2208 2285
2209 $map->load; 2286 $map->load;
2210} 2287}
… …
2213our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2214 2291
2215sub find_async { 2292sub find_async {
2216 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2217 2294
2218 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2219 2296
2220 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2221 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2222 } 2299 }
2223 2300
2224 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2225 2302
2226 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
… …
2285sub swap_out { 2362sub swap_out {
2286 my ($self) = @_; 2363 my ($self) = @_;
2287 2364
2288 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2289 2366
2290 return if $self->in_memory != cf::MAP_ACTIVE; 2367 return if !$self->linkable;
2291 return if $self->{deny_save}; 2368 return if $self->{deny_save};
2292 return if $self->players; 2369 return if $self->players;
2293 2370
2294 # first deactivate the map and "unlink" it from the core 2371 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate; 2372 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP; 2373 $_->clear_links_to ($self) for values %cf::MAP;
2297 $self->in_memory (cf::MAP_SWAPPED); 2374 $self->state (cf::MAP_SWAPPED);
2298 2375
2299 # then atomically save 2376 # then atomically save
2300 $self->_save; 2377 $self->_save;
2301 2378
2302 # then free the map 2379 # then free the map
… …
2328 2405
2329 return if $self->players; 2406 return if $self->players;
2330 2407
2331 cf::trace "resetting map ", $self->path, "\n"; 2408 cf::trace "resetting map ", $self->path, "\n";
2332 2409
2333 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2334 2411
2335 # need to save uniques path 2412 # need to save uniques path
2336 unless ($self->{deny_save}) { 2413 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq; 2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338 2415
… …
2668 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2669 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2670 if $x <= 0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2671 2748
2672 $map->load; 2749 $map->load;
2673 $map->load_neighbours;
2674 2750
2675 return unless $self->contr->active; 2751 return unless $self->contr->active;
2676 2752
2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2678 if ($self->enter_map ($map, $x, $y)) { 2754 if ($self->enter_map ($map, $x, $y)) {
… …
2734 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2735 } 2811 }
2736 } 2812 }
2737 2813
2738 my $map = eval { 2814 my $map = eval {
2739 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2740 2816
2741 if ($map) { 2817 if ($map) {
2742 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2743 $map = $check->($map, $x, $y, $self) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2744 } else { 2820 } else {
… …
2834 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2835 2911
2836 unless (eval { 2912 unless (eval {
2837 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2838 2914
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; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2848 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2849 my $y = $exit->stats->sp; 2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2850 2941
2851 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2852 2943
2853 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2854 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
… …
3096=cut 3187=cut
3097 3188
3098sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
3099 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
3100 3191
3101 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $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} 3195}
3109 3196
3110=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
3111 3198
3112Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
… …
3167 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
3168 3255
3169 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3170 3257
3171 if (ref $msg) { 3258 if (ref $msg) {
3172 my ($type, $reply, @payload) = 3259 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 3260
3177 my @reply; 3261 my @reply;
3178 3262
3179 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3180 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
… …
3273 decrease split destroy change_exp value msg lore send_msg)], 3357 decrease split destroy change_exp value msg lore send_msg)],
3274 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
3275 ["cf::player" => qw(peaceful send_msg)], 3359 ["cf::player" => qw(peaceful send_msg)],
3276 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
3277) { 3361) {
3278 no strict 'refs';
3279 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3281 for @funs; 3364 for @funs;
3282} 3365}
3283 3366
… …
3370 3453
3371 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3372 3455
3373 trace "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3374 3457
3375 my $facedata; 3458 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 3459
3381 $facedata->{version} == 2 3460 $facedata->{version} == 2
3382 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3383 3462
3384 # patch in the exptable 3463 # patch in the exptable
… …
3398 3477
3399 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3400 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3403 3483
3404 cf::cede_to_tick; 3484 cf::cede_to_tick;
3405 } 3485 }
3406 3486
3407 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
… …
3434 3514
3435 { 3515 {
3436 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3437 3517
3438 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3439 if (defined $info->{type}) { 3519 if (defined (my $type = $info->{type})) {
3520 # 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; 3521 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3441 3522
3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3523 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3443 cf::face::set_type $idx, $info->{type}; 3524 cf::face::set_type $idx, $type;
3525 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3444 } else { 3526 } else {
3445 $RESOURCE{$name} = $info; # unused 3527# $RESOURCE{$name} = $info; # unused
3446 } 3528 }
3447 3529
3448 cf::cede_to_tick; 3530 cf::cede_to_tick;
3449 } 3531 }
3450 } 3532 }
… …
3502} 3584}
3503 3585
3504sub reload_sound { 3586sub reload_sound {
3505 trace "loading sound config from $DATADIR/sound\n"; 3587 trace "loading sound config from $DATADIR/sound\n";
3506 3588
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); 3589 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3511 3590
3512 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3591 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513 my $sound = $soundconf->{compat}[$_] 3592 my $sound = $soundconf->{compat}[$_]
3514 or next; 3593 or next;
3515 3594
… …
3525} 3604}
3526 3605
3527sub reload_resources { 3606sub reload_resources {
3528 trace "reloading resource files...\n"; 3607 trace "reloading resource files...\n";
3529 3608
3609 reload_exp_table;
3610 reload_materials;
3530 reload_facedata; 3611 reload_facedata;
3531 reload_sound; 3612 reload_sound;
3532 reload_archetypes; 3613 reload_archetypes;
3533 reload_regions; 3614 reload_regions;
3534 reload_treasures; 3615 reload_treasures;
… …
3537} 3618}
3538 3619
3539sub reload_config { 3620sub reload_config {
3540 trace "reloading config file...\n"; 3621 trace "reloading config file...\n";
3541 3622
3542 open my $fh, "<:utf8", "$CONFDIR/config" 3623 my $config = load_file "$CONFDIR/config";
3543 or return; 3624 utf8::decode $config;
3544 3625 *CFG = decode_yaml $config;
3545 local $/;
3546 *CFG = YAML::XS::Load scalar <$fh>;
3547 3626
3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3627 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3549 3628
3550 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3629 $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}; 3630 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3555 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3634 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3556 and die "WARNING: m(un)lockall failed: $!\n"; 3635 and die "WARNING: m(un)lockall failed: $!\n";
3557 }; 3636 };
3558 warn $@ if $@; 3637 warn $@ if $@;
3559 } 3638 }
3560
3561 trace "finished reloading resource files\n";
3562} 3639}
3563 3640
3564sub pidfile() { 3641sub pidfile() {
3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3642 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3566 or die "$PIDFILE: $!"; 3643 or die "$PIDFILE: $!";
… …
3591 3668
3592sub main { 3669sub main {
3593 cf::init_globals; # initialise logging 3670 cf::init_globals; # initialise logging
3594 3671
3595 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3672 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3596 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3673 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3597 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3674 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3598 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3675 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3599 3676
3600 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3677 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3601 3678
… …
3609 }; 3686 };
3610 3687
3611 evthread_start IO::AIO::poll_fileno; 3688 evthread_start IO::AIO::poll_fileno;
3612 3689
3613 cf::sync_job { 3690 cf::sync_job {
3614 cf::init_experience; 3691 cf::incloader::init ();
3692
3615 cf::init_anim; 3693 cf::init_anim;
3616 cf::init_attackmess; 3694 cf::init_attackmess;
3617 cf::init_dynamic; 3695 cf::init_dynamic;
3618 3696
3619 cf::load_settings; 3697 cf::load_settings;
3620 cf::load_materials;
3621 3698
3622 reload_resources; 3699 reload_resources;
3623 reload_config; 3700 reload_config;
3624 db_init; 3701 db_init;
3625 3702
… …
3637 3714
3638 # no (long-running) fork's whatsoever before this point(!) 3715 # no (long-running) fork's whatsoever before this point(!)
3639 use POSIX (); 3716 use POSIX ();
3640 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3717 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3641 3718
3642 (pop @POST_INIT)->(0) while @POST_INIT; 3719 cf::_post_init 0;
3643 }; 3720 };
3644 3721
3645 cf::object::thawer::errors_are_fatal 0; 3722 cf::object::thawer::errors_are_fatal 0;
3646 info "parse errors in files are no longer fatal from this point on.\n"; 3723 info "parse errors in files are no longer fatal from this point on.\n";
3647 3724
3725 AE::postpone {
3726 undef &main; # free gobs of memory :)
3727 };
3728
3648 main_loop; 3729 goto &main_loop;
3649} 3730}
3650 3731
3651############################################################################# 3732#############################################################################
3652# initialisation and cleanup 3733# initialisation and cleanup
3653 3734
… …
3806 3887
3807 cf::write_runtime_sync; # external watchdog should not bark 3888 cf::write_runtime_sync; # external watchdog should not bark
3808 3889
3809 trace "emergency_perl_save: flushing outstanding aio requests"; 3890 trace "emergency_perl_save: flushing outstanding aio requests";
3810 while (IO::AIO::nreqs || BDB::nreqs) { 3891 while (IO::AIO::nreqs || BDB::nreqs) {
3811 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3892 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3812 } 3893 }
3813 3894
3814 cf::write_runtime_sync; # external watchdog should not bark 3895 cf::write_runtime_sync; # external watchdog should not bark
3815 }; 3896 };
3816 3897
… …
3854 } 3935 }
3855} 3936}
3856 3937
3857sub do_reload_perl() { 3938sub do_reload_perl() {
3858 # can/must only be called in main 3939 # can/must only be called in main
3859 if (in_main) { 3940 unless (in_main) {
3860 error "can only reload from main coroutine"; 3941 error "can only reload from main coroutine";
3861 return; 3942 return;
3862 } 3943 }
3863 3944
3864 return if $RELOAD++; 3945 return if $RELOAD++;
3865 3946
3866 my $t1 = AE::time; 3947 my $t1 = AE::time;
3867 3948
3868 while ($RELOAD) { 3949 while ($RELOAD) {
3950 cf::get_slot 0.1, -1, "reload_perl";
3869 info "reloading..."; 3951 info "perl_reload: reloading...";
3870 3952
3871 trace "entering sync_job"; 3953 trace "perl_reload: entering sync_job";
3872 3954
3873 cf::sync_job { 3955 cf::sync_job {
3874 cf::emergency_save; 3956 #cf::emergency_save;
3875 3957
3876 trace "cancelling all extension coros"; 3958 trace "perl_reload: cancelling all extension coros";
3877 $_->cancel for values %EXT_CORO; 3959 $_->cancel for values %EXT_CORO;
3878 %EXT_CORO = (); 3960 %EXT_CORO = ();
3879 3961
3880 trace "removing commands"; 3962 trace "perl_reload: removing commands";
3881 %COMMAND = (); 3963 %COMMAND = ();
3882 3964
3883 trace "removing ext/exti commands"; 3965 trace "perl_reload: removing ext/exti commands";
3884 %EXTCMD = (); 3966 %EXTCMD = ();
3885 %EXTICMD = (); 3967 %EXTICMD = ();
3886 3968
3887 trace "unloading/nuking all extensions"; 3969 trace "perl_reload: unloading/nuking all extensions";
3888 for my $pkg (@EXTS) { 3970 for my $pkg (@EXTS) {
3889 trace "... unloading $pkg"; 3971 trace "... unloading $pkg";
3890 3972
3891 if (my $cb = $pkg->can ("unload")) { 3973 if (my $cb = $pkg->can ("unload")) {
3892 eval { 3974 eval {
… …
3897 3979
3898 trace "... clearing $pkg"; 3980 trace "... clearing $pkg";
3899 clear_package $pkg; 3981 clear_package $pkg;
3900 } 3982 }
3901 3983
3902 trace "unloading all perl modules loaded from $LIBDIR"; 3984 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3903 while (my ($k, $v) = each %INC) { 3985 while (my ($k, $v) = each %INC) {
3904 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3986 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3905 3987
3906 trace "... unloading $k"; 3988 trace "... unloading $k";
3907 delete $INC{$k}; 3989 delete $INC{$k};
… …
3914 } 3996 }
3915 3997
3916 clear_package $k; 3998 clear_package $k;
3917 } 3999 }
3918 4000
3919 trace "getting rid of safe::, as good as possible"; 4001 trace "perl_reload: getting rid of safe::, as good as possible";
3920 clear_package "safe::$_" 4002 clear_package "safe::$_"
3921 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4003 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3922 4004
3923 trace "unloading cf.pm \"a bit\""; 4005 trace "perl_reload: unloading cf.pm \"a bit\"";
3924 delete $INC{"cf.pm"}; 4006 delete $INC{"cf.pm"};
3925 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4007 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3926 4008
3927 # don't, removes xs symbols, too, 4009 # don't, removes xs symbols, too,
3928 # and global variables created in xs 4010 # and global variables created in xs
3929 #clear_package __PACKAGE__; 4011 #clear_package __PACKAGE__;
3930 4012
3931 info "unload completed, starting to reload now"; 4013 info "perl_reload: unload completed, starting to reload now";
3932 4014
3933 trace "reloading cf.pm"; 4015 trace "perl_reload: reloading cf.pm";
3934 require cf; 4016 require cf;
3935 cf::_connect_to_perl_1; 4017 cf::_connect_to_perl_1;
3936 4018
3937 trace "loading config and database again"; 4019 trace "perl_reload: loading config and database again";
3938 cf::reload_config; 4020 cf::reload_config;
3939 4021
3940 trace "loading extensions"; 4022 trace "perl_reload: loading extensions";
3941 cf::load_extensions; 4023 cf::load_extensions;
3942 4024
3943 if ($REATTACH_ON_RELOAD) { 4025 if ($REATTACH_ON_RELOAD) {
3944 trace "reattaching attachments to objects/players"; 4026 trace "perl_reload: reattaching attachments to objects/players";
3945 _global_reattach; # objects, sockets 4027 _global_reattach; # objects, sockets
3946 trace "reattaching attachments to maps"; 4028 trace "perl_reload: reattaching attachments to maps";
3947 reattach $_ for values %MAP; 4029 reattach $_ for values %MAP;
3948 trace "reattaching attachments to players"; 4030 trace "perl_reload: reattaching attachments to players";
3949 reattach $_ for values %PLAYER; 4031 reattach $_ for values %PLAYER;
3950 } 4032 }
3951 4033
3952 trace "running post_init jobs"; 4034 cf::_post_init 1;
3953 (pop @POST_INIT)->(1) while @POST_INIT;
3954 4035
3955 trace "leaving sync_job"; 4036 trace "perl_reload: leaving sync_job";
3956 4037
3957 1 4038 1
3958 } or do { 4039 } or do {
3959 error $@; 4040 error $@;
3960 cf::cleanup "error while reloading, exiting."; 4041 cf::cleanup "perl_reload: error, exiting.";
3961 }; 4042 };
3962 4043
3963 info "reloaded";
3964 --$RELOAD; 4044 --$RELOAD;
3965 } 4045 }
3966 4046
3967 $t1 = AE::time - $t1; 4047 $t1 = AE::time - $t1;
3968 info "reload completed in ${t1}s\n"; 4048 info "perl_reload: completed in ${t1}s\n";
3969}; 4049};
3970 4050
3971our $RELOAD_WATCHER; # used only during reload 4051our $RELOAD_WATCHER; # used only during reload
3972 4052
3973sub reload_perl() { 4053sub reload_perl() {
… …
3994 reload_perl; 4074 reload_perl;
3995 }; 4075 };
3996 } 4076 }
3997}; 4077};
3998 4078
3999unshift @INC, $LIBDIR; 4079#############################################################################
4000 4080
4001my $bug_warning = 0; 4081my $bug_warning = 0;
4002 4082
4003our @WAIT_FOR_TICK;
4004our @WAIT_FOR_TICK_BEGIN;
4005
4006sub wait_for_tick { 4083sub wait_for_tick() {
4007 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4084 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4008 4085
4009 my $signal = new Coro::Signal; 4086 $WAIT_FOR_TICK->wait;
4010 push @WAIT_FOR_TICK, $signal;
4011 $signal->wait;
4012} 4087}
4013 4088
4014sub wait_for_tick_begin { 4089sub wait_for_tick_begin() {
4015 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4090 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4016 4091
4017 my $signal = new Coro::Signal; 4092 my $signal = new Coro::Signal;
4018 push @WAIT_FOR_TICK_BEGIN, $signal; 4093 push @WAIT_FOR_TICK_BEGIN, $signal;
4019 $signal->wait; 4094 $signal->wait;
4020} 4095}
… …
4024 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4099 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4025 unless ++$bug_warning > 10; 4100 unless ++$bug_warning > 10;
4026 return; 4101 return;
4027 } 4102 }
4028 4103
4029 cf::server_tick; # one server iteration 4104 cf::one_tick; # one server iteration
4030 4105
4031 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4106 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4032 4107
4033 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4108 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4034 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4109 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4040 } 4115 }
4041 4116
4042 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4117 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4043 $sig->send; 4118 $sig->send;
4044 } 4119 }
4045 while (my $sig = shift @WAIT_FOR_TICK) { 4120 $WAIT_FOR_TICK->broadcast;
4046 $sig->send;
4047 }
4048 4121
4049 $LOAD = ($NOW - $TICK_START) / $TICK; 4122 $LOAD = ($NOW - $TICK_START) / $TICK;
4050 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4051 4124
4052 if (0) { 4125 if (0) {
… …
4061{ 4134{
4062 # configure BDB 4135 # configure BDB
4063 4136
4064 BDB::min_parallel 16; 4137 BDB::min_parallel 16;
4065 BDB::max_poll_reqs $TICK * 0.1; 4138 BDB::max_poll_reqs $TICK * 0.1;
4066 $AnyEvent::BDB::WATCHER->priority (1); 4139 #$AnyEvent::BDB::WATCHER->priority (1);
4067 4140
4068 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
4069 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
4070 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4071 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4144 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4106 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
4107 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
4108 undef $AnyEvent::AIO::WATCHER; 4181 undef $AnyEvent::AIO::WATCHER;
4109} 4182}
4110 4183
4111my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
4112 4186
4113sub _log_backtrace { 4187sub _log_backtrace {
4114 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
4115 4189
4116 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
4117 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4118 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
4119 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
4120 ++$_log_backtrace; 4198 ++$_log_backtrace;
4121 my $perl_bt = Carp::longmess $msg; 4199 my $perl_bt = Carp::longmess $msg;
4122 async { 4200 async {
4123 $Coro::current->{desc} = "abt $msg"; 4201 $Coro::current->{desc} = "abt $msg";
4124 4202
… …
4144 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
4145 --$_log_backtrace; 4223 --$_log_backtrace;
4146 }; 4224 };
4147 } else { 4225 } else {
4148 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
4149 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4150 } 4228 }
4151} 4229}
4152 4230
4153# load additional modules 4231# load additional modules
4154require "cf/$_.pm" for @EXTRA_MODULES; 4232require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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