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.540 by root, Tue May 4 23:32:29 2010 UTC vs.
Revision 1.581 by root, Fri Feb 3 02:04:11 2012 UTC

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

Diff Legend

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