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.542 by root, Wed May 5 09:05:03 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.
… …
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);
… …
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
… …
1869} 1961}
1870 1962
1871sub normalise { 1963sub normalise {
1872 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1873 1965
1874 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1875 1967
1876 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1877 1969
1878 # map plan: 1970 # map plan:
1879 # 1971 #
… …
1894 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1895 $path = "$base/$path"; 1987 $path = "$base/$path";
1896 } 1988 }
1897 1989
1898 for ($path) { 1990 for ($path) {
1899 redo if s{//}{/};
1900 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1901 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1902 } 1993 }
1903 1994
1904 $path 1995 $path
… …
1918 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1919 return $self; 2010 return $self;
1920 } 2011 }
1921 } 2012 }
1922 2013
1923 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1924 () 2015 ()
1925} 2016}
1926 2017
2018# may re-bless or do other evil things
1927sub init { 2019sub init {
1928 my ($self) = @_; 2020 my ($self) = @_;
1929 2021
1930 $self 2022 $self
1931} 2023}
… …
1996 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1997 2089
1998 1 2090 1
1999} 2091}
2000 2092
2093# used to laod the header of an original map
2001sub load_header_orig { 2094sub load_header_orig {
2002 my ($self) = @_; 2095 my ($self) = @_;
2003 2096
2004 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
2005} 2098}
2006 2099
2100# used to laod the header of an instantiated map
2007sub load_header_temp { 2101sub load_header_temp {
2008 my ($self) = @_; 2102 my ($self) = @_;
2009 2103
2010 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
2011} 2105}
2012 2106
2107# called after loading the header from an instantiated map
2013sub prepare_temp { 2108sub prepare_temp {
2014 my ($self) = @_; 2109 my ($self) = @_;
2015 2110
2016 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
2017 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
2018 # safety 2113 # safety
2019 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
2020 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
2021} 2116}
2022 2117
2118# called after loading the header from an original map
2023sub prepare_orig { 2119sub prepare_orig {
2024 my ($self) = @_; 2120 my ($self) = @_;
2025 2121
2026 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
2027 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
… …
2051 2147
2052sub find; 2148sub find;
2053sub find { 2149sub find {
2054 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
2055 2151
2152 cf::cede_to_tick;
2153
2056 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
2057 2155
2058 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2059 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
2060 2158
2061 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
… …
2092 2190
2093 { 2191 {
2094 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2095 2193
2096 return unless $self->valid; 2194 return unless $self->valid;
2097 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2098
2099 $self->in_memory (cf::MAP_LOADING);
2100 2196
2101 $self->alloc; 2197 $self->alloc;
2102 2198
2103 $self->pre_load; 2199 $self->pre_load;
2104 cf::cede_to_tick; 2200 cf::cede_to_tick;
2105 2201
2202 if (exists $self->{load_path}) {
2106 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2107 $f->skip_block; 2204 $f->skip_block;
2108 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2109 or return; 2206 or return;
2110 2207
2111 $self->post_load_original 2208 $self->post_load_original
2112 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2113 2210
2114 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2115 utf8::encode $uniq; 2212 utf8::encode $uniq;
2116 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2117 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2118 $self->clear_unique_items; 2215 $self->clear_unique_items;
2119 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2120 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2121 } 2219 }
2122 } 2220 }
2123 }
2124 2221
2125 $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);
2126 2229
2127 cf::cede_to_tick; 2230 cf::cede_to_tick;
2128 # now do the right thing for maps 2231 # now do the right thing for maps
2129 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2130 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
… …
2134 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2135 $self->decay_objects; 2238 $self->decay_objects;
2136 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2137 $self->update_buttons; 2240 $self->update_buttons;
2138 cf::cede_to_tick; 2241 cf::cede_to_tick;
2139 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2140 } 2243 }
2141 2244
2142 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2143 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2144
2145 $self->in_memory (cf::MAP_ACTIVE);
2146 } 2247 }
2147 2248
2148 $self->post_load; 2249 $self->post_load;
2250
2251 1
2149} 2252}
2150 2253
2151# customize the map for a given player, i.e. 2254# customize the map for a given player, i.e.
2152# return the _real_ map. used by e.g. per-player 2255# return the _real_ map. used by e.g. per-player
2153# maps to change the path to ~playername/mappath 2256# maps to change the path to ~playername/mappath
… …
2161# if $self->per_party; 2264# if $self->per_party;
2162 2265
2163 $self 2266 $self
2164} 2267}
2165 2268
2166# find and load all maps in the 3x3 area around a map
2167sub load_neighbours {
2168 my ($map) = @_;
2169
2170 my @neigh; # diagonal neighbours
2171
2172 for (0 .. 3) {
2173 my $neigh = $map->tile_path ($_)
2174 or next;
2175 $neigh = find $neigh, $map
2176 or next;
2177 $neigh->load;
2178
2179 # now find the diagonal neighbours
2180 push @neigh,
2181 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2182 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2183 }
2184
2185 for (grep defined $_->[0], @neigh) {
2186 my ($path, $origin) = @$_;
2187 my $neigh = find $path, $origin
2188 or next;
2189 $neigh->load;
2190 }
2191}
2192
2193sub find_sync { 2269sub find_sync {
2194 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2195 2271
2272 # it's a bug to call this from the main context
2196 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2197 if $Coro::current == $Coro::main; 2274 if $Coro::current == $Coro::main;
2198 2275
2199 find $path, $origin 2276 find $path, $origin
2200} 2277}
2201 2278
2202sub do_load_sync { 2279sub do_load_sync {
2203 my ($map) = @_; 2280 my ($map) = @_;
2204 2281
2282 # it's a bug to call this from the main context
2205 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2206 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2207 2285
2208 $map->load; 2286 $map->load;
2209} 2287}
… …
2212our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2213 2291
2214sub find_async { 2292sub find_async {
2215 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2216 2294
2217 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2218 2296
2219 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2220 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2221 } 2299 }
2222 2300
2223 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2224 2302
2225 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
… …
2284sub swap_out { 2362sub swap_out {
2285 my ($self) = @_; 2363 my ($self) = @_;
2286 2364
2287 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2288 2366
2289 return if $self->in_memory != cf::MAP_ACTIVE; 2367 return if !$self->linkable;
2290 return if $self->{deny_save}; 2368 return if $self->{deny_save};
2291 return if $self->players; 2369 return if $self->players;
2292 2370
2293 # first deactivate the map and "unlink" it from the core 2371 # first deactivate the map and "unlink" it from the core
2294 $self->deactivate; 2372 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP; 2373 $_->clear_links_to ($self) for values %cf::MAP;
2296 $self->in_memory (cf::MAP_SWAPPED); 2374 $self->state (cf::MAP_SWAPPED);
2297 2375
2298 # then atomically save 2376 # then atomically save
2299 $self->_save; 2377 $self->_save;
2300 2378
2301 # then free the map 2379 # then free the map
… …
2327 2405
2328 return if $self->players; 2406 return if $self->players;
2329 2407
2330 cf::trace "resetting map ", $self->path, "\n"; 2408 cf::trace "resetting map ", $self->path, "\n";
2331 2409
2332 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2333 2411
2334 # need to save uniques path 2412 # need to save uniques path
2335 unless ($self->{deny_save}) { 2413 unless ($self->{deny_save}) {
2336 my $uniq = $self->uniq_path; utf8::encode $uniq; 2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2337 2415
… …
2667 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2668 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2669 if $x <= 0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2670 2748
2671 $map->load; 2749 $map->load;
2672 $map->load_neighbours;
2673 2750
2674 return unless $self->contr->active; 2751 return unless $self->contr->active;
2675 2752
2676 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2677 if ($self->enter_map ($map, $x, $y)) { 2754 if ($self->enter_map ($map, $x, $y)) {
… …
2733 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2734 } 2811 }
2735 } 2812 }
2736 2813
2737 my $map = eval { 2814 my $map = eval {
2738 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2739 2816
2740 if ($map) { 2817 if ($map) {
2741 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2742 $map = $check->($map, $x, $y, $self) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2743 } else { 2820 } else {
… …
2833 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2834 2911
2835 unless (eval { 2912 unless (eval {
2836 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2837 2914
2838 # random map handling
2839 {
2840 my $guard = cf::lock_acquire "exit_prepare:$exit";
2841
2842 prepare_random_map $exit
2843 if $exit->slaying eq "/!";
2844 }
2845
2846 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2847 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2848 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 }
2849 2941
2850 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2851 2943
2852 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2853 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
… …
3095=cut 3187=cut
3096 3188
3097sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
3098 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
3099 3191
3100 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
3101 $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]));
3102 } elsif ($self->extcmd == 1) {
3103 #TODO: version 1, remove
3104 unshift @msg, msgtype => "reply", msgid => $id;
3105 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3106 }
3107} 3195}
3108 3196
3109=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
3110 3198
3111Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
… …
3166 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
3167 3255
3168 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3169 3257
3170 if (ref $msg) { 3258 if (ref $msg) {
3171 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3172 "ARRAY" eq ref $msg
3173 ? @$msg
3174 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3175 3260
3176 my @reply; 3261 my @reply;
3177 3262
3178 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3179 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
… …
3357=cut 3442=cut
3358 3443
3359############################################################################# 3444#############################################################################
3360# the server's init and main functions 3445# the server's init and main functions
3361 3446
3362# async inc loader. yay.
3363sub inc_loader {
3364 my $mod = $_[1];
3365
3366 if (in_main && !tick_inhibit) {
3367 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3368 } else {
3369 debug "loading perl module $mod\n";
3370 }
3371
3372 # 1. find real file
3373 for my $dir (@ORIG_INC) {
3374 ref $dir and next;
3375 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3376 or next;
3377
3378 $data = "#line 1 $dir/$mod\n$data";
3379
3380 open my $fh, "<", \$data or die;
3381
3382 return $fh;
3383 }
3384
3385 ()
3386}
3387
3388sub init_inc {
3389 # save original @INC
3390 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3391
3392 # make sure we can do scalar-opens
3393 open my $dummy, "<", \my $dummy2;
3394
3395 # execute some stuff so perl load's some of the core modules
3396 /Ü/ =~ /ü/i;
3397 eval { &Storable::nstore_fd };
3398
3399 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3400
3401 debug "module loading will be asynchronous from this point on.";
3402}
3403
3404sub load_facedata($) { 3447sub load_facedata($) {
3405 my ($path) = @_; 3448 my ($path) = @_;
3406 3449
3407 # HACK to clear player env face cache, we need some signal framework 3450 # HACK to clear player env face cache, we need some signal framework
3408 # for this (global event?) 3451 # for this (global event?)
… …
3410 3453
3411 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3412 3455
3413 trace "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3414 3457
3415 my $facedata; 3458 my $facedata = decode_storable load_file $path;
3416 0 < aio_load $path, $facedata
3417 or die "$path: $!";
3418
3419 $facedata = Coro::Storable::thaw $facedata;
3420 3459
3421 $facedata->{version} == 2 3460 $facedata->{version} == 2
3422 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3423 3462
3424 # patch in the exptable 3463 # patch in the exptable
… …
3438 3477
3439 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3440 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3442 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} ;
3443 3483
3444 cf::cede_to_tick; 3484 cf::cede_to_tick;
3445 } 3485 }
3446 3486
3447 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
… …
3474 3514
3475 { 3515 {
3476 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3477 3517
3478 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3479 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
3480 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3521 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3481 3522
3482 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3523 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3483 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
3484 } else { 3526 } else {
3485 $RESOURCE{$name} = $info; # unused 3527# $RESOURCE{$name} = $info; # unused
3486 } 3528 }
3487 3529
3488 cf::cede_to_tick; 3530 cf::cede_to_tick;
3489 } 3531 }
3490 } 3532 }
… …
3542} 3584}
3543 3585
3544sub reload_sound { 3586sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n"; 3587 trace "loading sound config from $DATADIR/sound\n";
3546 3588
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3589 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3551 3590
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3591 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_] 3592 my $sound = $soundconf->{compat}[$_]
3554 or next; 3593 or next;
3555 3594
… …
3565} 3604}
3566 3605
3567sub reload_resources { 3606sub reload_resources {
3568 trace "reloading resource files...\n"; 3607 trace "reloading resource files...\n";
3569 3608
3609 reload_exp_table;
3610 reload_materials;
3570 reload_facedata; 3611 reload_facedata;
3571 reload_sound; 3612 reload_sound;
3572 reload_archetypes; 3613 reload_archetypes;
3573 reload_regions; 3614 reload_regions;
3574 reload_treasures; 3615 reload_treasures;
… …
3577} 3618}
3578 3619
3579sub reload_config { 3620sub reload_config {
3580 trace "reloading config file...\n"; 3621 trace "reloading config file...\n";
3581 3622
3582 open my $fh, "<:utf8", "$CONFDIR/config" 3623 my $config = load_file "$CONFDIR/config";
3583 or return; 3624 utf8::decode $config;
3584 3625 *CFG = decode_yaml $config;
3585 local $/;
3586 *CFG = YAML::XS::Load scalar <$fh>;
3587 3626
3588 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3627 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3589 3628
3590 $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};
3591 $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};
… …
3595 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3634 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3596 and die "WARNING: m(un)lockall failed: $!\n"; 3635 and die "WARNING: m(un)lockall failed: $!\n";
3597 }; 3636 };
3598 warn $@ if $@; 3637 warn $@ if $@;
3599 } 3638 }
3600
3601 trace "finished reloading resource files\n";
3602} 3639}
3603 3640
3604sub pidfile() { 3641sub pidfile() {
3605 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3642 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3606 or die "$PIDFILE: $!"; 3643 or die "$PIDFILE: $!";
… …
3631 3668
3632sub main { 3669sub main {
3633 cf::init_globals; # initialise logging 3670 cf::init_globals; # initialise logging
3634 3671
3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3672 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3673 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3674 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3675 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3639 3676
3640 $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
3641 3678
… …
3649 }; 3686 };
3650 3687
3651 evthread_start IO::AIO::poll_fileno; 3688 evthread_start IO::AIO::poll_fileno;
3652 3689
3653 cf::sync_job { 3690 cf::sync_job {
3654 init_inc; 3691 cf::incloader::init ();
3655 3692
3656 cf::init_experience;
3657 cf::init_anim; 3693 cf::init_anim;
3658 cf::init_attackmess; 3694 cf::init_attackmess;
3659 cf::init_dynamic; 3695 cf::init_dynamic;
3660 3696
3661 cf::load_settings; 3697 cf::load_settings;
3662 cf::load_materials;
3663 3698
3664 reload_resources; 3699 reload_resources;
3665 reload_config; 3700 reload_config;
3666 db_init; 3701 db_init;
3667 3702
… …
3679 3714
3680 # no (long-running) fork's whatsoever before this point(!) 3715 # no (long-running) fork's whatsoever before this point(!)
3681 use POSIX (); 3716 use POSIX ();
3682 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};
3683 3718
3684 (pop @POST_INIT)->(0) while @POST_INIT; 3719 cf::_post_init 0;
3685 }; 3720 };
3686 3721
3687 cf::object::thawer::errors_are_fatal 0; 3722 cf::object::thawer::errors_are_fatal 0;
3688 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";
3689 3724
3690 my $free_main; $free_main = EV::idle sub { 3725 AE::postpone {
3691 undef $free_main;
3692 undef &main; # free gobs of memory :) 3726 undef &main; # free gobs of memory :)
3693 }; 3727 };
3694 3728
3695 goto &main_loop; 3729 goto &main_loop;
3696} 3730}
… …
3853 3887
3854 cf::write_runtime_sync; # external watchdog should not bark 3888 cf::write_runtime_sync; # external watchdog should not bark
3855 3889
3856 trace "emergency_perl_save: flushing outstanding aio requests"; 3890 trace "emergency_perl_save: flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) { 3891 while (IO::AIO::nreqs || BDB::nreqs) {
3858 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
3859 } 3893 }
3860 3894
3861 cf::write_runtime_sync; # external watchdog should not bark 3895 cf::write_runtime_sync; # external watchdog should not bark
3862 }; 3896 };
3863 3897
… …
3901 } 3935 }
3902} 3936}
3903 3937
3904sub do_reload_perl() { 3938sub do_reload_perl() {
3905 # can/must only be called in main 3939 # can/must only be called in main
3906 if (in_main) { 3940 unless (in_main) {
3907 error "can only reload from main coroutine"; 3941 error "can only reload from main coroutine";
3908 return; 3942 return;
3909 } 3943 }
3910 3944
3911 return if $RELOAD++; 3945 return if $RELOAD++;
3912 3946
3913 my $t1 = AE::time; 3947 my $t1 = AE::time;
3914 3948
3915 while ($RELOAD) { 3949 while ($RELOAD) {
3950 cf::get_slot 0.1, -1, "reload_perl";
3916 info "reloading..."; 3951 info "perl_reload: reloading...";
3917 3952
3918 trace "entering sync_job"; 3953 trace "perl_reload: entering sync_job";
3919 3954
3920 cf::sync_job { 3955 cf::sync_job {
3921 cf::emergency_save; 3956 #cf::emergency_save;
3922 3957
3923 trace "cancelling all extension coros"; 3958 trace "perl_reload: cancelling all extension coros";
3924 $_->cancel for values %EXT_CORO; 3959 $_->cancel for values %EXT_CORO;
3925 %EXT_CORO = (); 3960 %EXT_CORO = ();
3926 3961
3927 trace "removing commands"; 3962 trace "perl_reload: removing commands";
3928 %COMMAND = (); 3963 %COMMAND = ();
3929 3964
3930 trace "removing ext/exti commands"; 3965 trace "perl_reload: removing ext/exti commands";
3931 %EXTCMD = (); 3966 %EXTCMD = ();
3932 %EXTICMD = (); 3967 %EXTICMD = ();
3933 3968
3934 trace "unloading/nuking all extensions"; 3969 trace "perl_reload: unloading/nuking all extensions";
3935 for my $pkg (@EXTS) { 3970 for my $pkg (@EXTS) {
3936 trace "... unloading $pkg"; 3971 trace "... unloading $pkg";
3937 3972
3938 if (my $cb = $pkg->can ("unload")) { 3973 if (my $cb = $pkg->can ("unload")) {
3939 eval { 3974 eval {
… …
3944 3979
3945 trace "... clearing $pkg"; 3980 trace "... clearing $pkg";
3946 clear_package $pkg; 3981 clear_package $pkg;
3947 } 3982 }
3948 3983
3949 trace "unloading all perl modules loaded from $LIBDIR"; 3984 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3950 while (my ($k, $v) = each %INC) { 3985 while (my ($k, $v) = each %INC) {
3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3986 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3952 3987
3953 trace "... unloading $k"; 3988 trace "... unloading $k";
3954 delete $INC{$k}; 3989 delete $INC{$k};
… …
3961 } 3996 }
3962 3997
3963 clear_package $k; 3998 clear_package $k;
3964 } 3999 }
3965 4000
3966 trace "getting rid of safe::, as good as possible"; 4001 trace "perl_reload: getting rid of safe::, as good as possible";
3967 clear_package "safe::$_" 4002 clear_package "safe::$_"
3968 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);
3969 4004
3970 trace "unloading cf.pm \"a bit\""; 4005 trace "perl_reload: unloading cf.pm \"a bit\"";
3971 delete $INC{"cf.pm"}; 4006 delete $INC{"cf.pm"};
3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4007 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3973 4008
3974 # don't, removes xs symbols, too, 4009 # don't, removes xs symbols, too,
3975 # and global variables created in xs 4010 # and global variables created in xs
3976 #clear_package __PACKAGE__; 4011 #clear_package __PACKAGE__;
3977 4012
3978 info "unload completed, starting to reload now"; 4013 info "perl_reload: unload completed, starting to reload now";
3979 4014
3980 trace "reloading cf.pm"; 4015 trace "perl_reload: reloading cf.pm";
3981 require cf; 4016 require cf;
3982 cf::_connect_to_perl_1; 4017 cf::_connect_to_perl_1;
3983 4018
3984 trace "loading config and database again"; 4019 trace "perl_reload: loading config and database again";
3985 cf::reload_config; 4020 cf::reload_config;
3986 4021
3987 trace "loading extensions"; 4022 trace "perl_reload: loading extensions";
3988 cf::load_extensions; 4023 cf::load_extensions;
3989 4024
3990 if ($REATTACH_ON_RELOAD) { 4025 if ($REATTACH_ON_RELOAD) {
3991 trace "reattaching attachments to objects/players"; 4026 trace "perl_reload: reattaching attachments to objects/players";
3992 _global_reattach; # objects, sockets 4027 _global_reattach; # objects, sockets
3993 trace "reattaching attachments to maps"; 4028 trace "perl_reload: reattaching attachments to maps";
3994 reattach $_ for values %MAP; 4029 reattach $_ for values %MAP;
3995 trace "reattaching attachments to players"; 4030 trace "perl_reload: reattaching attachments to players";
3996 reattach $_ for values %PLAYER; 4031 reattach $_ for values %PLAYER;
3997 } 4032 }
3998 4033
3999 trace "running post_init jobs"; 4034 cf::_post_init 1;
4000 (pop @POST_INIT)->(1) while @POST_INIT;
4001 4035
4002 trace "leaving sync_job"; 4036 trace "perl_reload: leaving sync_job";
4003 4037
4004 1 4038 1
4005 } or do { 4039 } or do {
4006 error $@; 4040 error $@;
4007 cf::cleanup "error while reloading, exiting."; 4041 cf::cleanup "perl_reload: error, exiting.";
4008 }; 4042 };
4009 4043
4010 info "reloaded";
4011 --$RELOAD; 4044 --$RELOAD;
4012 } 4045 }
4013 4046
4014 $t1 = AE::time - $t1; 4047 $t1 = AE::time - $t1;
4015 info "reload completed in ${t1}s\n"; 4048 info "perl_reload: completed in ${t1}s\n";
4016}; 4049};
4017 4050
4018our $RELOAD_WATCHER; # used only during reload 4051our $RELOAD_WATCHER; # used only during reload
4019 4052
4020sub reload_perl() { 4053sub reload_perl() {
… …
4045 4078
4046############################################################################# 4079#############################################################################
4047 4080
4048my $bug_warning = 0; 4081my $bug_warning = 0;
4049 4082
4050our @WAIT_FOR_TICK;
4051our @WAIT_FOR_TICK_BEGIN;
4052
4053sub wait_for_tick { 4083sub wait_for_tick() {
4054 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4084 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4055 4085
4056 my $signal = new Coro::Signal; 4086 $WAIT_FOR_TICK->wait;
4057 push @WAIT_FOR_TICK, $signal;
4058 $signal->wait;
4059} 4087}
4060 4088
4061sub wait_for_tick_begin { 4089sub wait_for_tick_begin() {
4062 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4090 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4063 4091
4064 my $signal = new Coro::Signal; 4092 my $signal = new Coro::Signal;
4065 push @WAIT_FOR_TICK_BEGIN, $signal; 4093 push @WAIT_FOR_TICK_BEGIN, $signal;
4066 $signal->wait; 4094 $signal->wait;
4067} 4095}
… …
4071 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"
4072 unless ++$bug_warning > 10; 4100 unless ++$bug_warning > 10;
4073 return; 4101 return;
4074 } 4102 }
4075 4103
4076 cf::server_tick; # one server iteration 4104 cf::one_tick; # one server iteration
4077 4105
4078 #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#
4079 4107
4080 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4108 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4081 $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.;
… …
4087 } 4115 }
4088 4116
4089 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4117 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4090 $sig->send; 4118 $sig->send;
4091 } 4119 }
4092 while (my $sig = shift @WAIT_FOR_TICK) { 4120 $WAIT_FOR_TICK->broadcast;
4093 $sig->send;
4094 }
4095 4121
4096 $LOAD = ($NOW - $TICK_START) / $TICK; 4122 $LOAD = ($NOW - $TICK_START) / $TICK;
4097 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4098 4124
4099 if (0) { 4125 if (0) {
… …
4108{ 4134{
4109 # configure BDB 4135 # configure BDB
4110 4136
4111 BDB::min_parallel 16; 4137 BDB::min_parallel 16;
4112 BDB::max_poll_reqs $TICK * 0.1; 4138 BDB::max_poll_reqs $TICK * 0.1;
4113 $AnyEvent::BDB::WATCHER->priority (1); 4139 #$AnyEvent::BDB::WATCHER->priority (1);
4114 4140
4115 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
4116 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
4117 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4118 $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;
… …
4153 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
4154 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
4155 undef $AnyEvent::AIO::WATCHER; 4181 undef $AnyEvent::AIO::WATCHER;
4156} 4182}
4157 4183
4158my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
4159 4186
4160sub _log_backtrace { 4187sub _log_backtrace {
4161 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
4162 4189
4163 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
4164 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4165 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
4166 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
4167 ++$_log_backtrace; 4198 ++$_log_backtrace;
4168 my $perl_bt = Carp::longmess $msg; 4199 my $perl_bt = Carp::longmess $msg;
4169 async { 4200 async {
4170 $Coro::current->{desc} = "abt $msg"; 4201 $Coro::current->{desc} = "abt $msg";
4171 4202
… …
4191 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
4192 --$_log_backtrace; 4223 --$_log_backtrace;
4193 }; 4224 };
4194 } else { 4225 } else {
4195 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
4196 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4197 } 4228 }
4198} 4229}
4199 4230
4200# load additional modules 4231# load additional modules
4201require "cf/$_.pm" for @EXTRA_MODULES; 4232require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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