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.308 by root, Mon Jul 16 14:09:40 2007 UTC vs.
Revision 1.473 by root, Fri Jun 26 16:32:10 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict qw(vars subs);
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
25use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
26use BDB (); 54use BDB ();
27use Data::Dumper; 55use Data::Dumper;
28use Digest::MD5; 56use Digest::MD5;
29use Fcntl; 57use Fcntl;
30use YAML::Syck (); 58use YAML ();
31use IO::AIO 2.32 (); 59use IO::AIO ();
32use Time::HiRes; 60use Time::HiRes;
33use Compress::LZF; 61use Compress::LZF;
34use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
35 65
36# configure various modules to our taste 66# configure various modules to our taste
37# 67#
38$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 76
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 78
51our %COMMAND = (); 79our %COMMAND = ();
52our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
55our %EXTCMD = (); 83our %EXTCMD = ();
56our %EXTICMD = (); 84our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
59 87
60our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 89our @EVENT;
62 90
63our $CONFDIR = confdir; 91our $CONFDIR = confdir;
64our $DATADIR = datadir; 92our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
105our %RESOURCE;
74 106
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 109our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default on
82 111
112our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 114our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 115our $DB_ENV;
116
117our @EXTRA_MODULES = qw(pod mapscript);
85 118
86our %CFG; 119our %CFG;
87 120
88our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 122our $RUNTIME;
123our $NOW;
90 124
91our %PLAYER; # all users 125our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 126our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 127our $LINK_MAP; # the special {link} map, which is always available
94 128
95# used to convert map paths into valid unix filenames by replacing / by ∕ 129# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 130our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 131
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
134our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 135our $TICK_START; # for load detecting purposes
136
137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
101 140
102binmode STDOUT; 141binmode STDOUT;
103binmode STDERR; 142binmode STDERR;
104 143
105# read virtual server time, if available 144# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 146 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
110} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
111 152
112mkdir $_ 153mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
114 155
115our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
158 199
159The raw value load value from the last tick. 200The raw value load value from the last tick.
160 201
161=item %cf::CFG 202=item %cf::CFG
162 203
163Configuration for the server, loaded from C</etc/crossfire/config>, or 204Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 205from wherever your confdir points to.
165 206
166=item cf::wait_for_tick, cf::wait_for_tick_begin 207=item cf::wait_for_tick, cf::wait_for_tick_begin
167 208
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 209These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169returns directly I<after> the tick processing (and consequently, can only wake one process 210returns directly I<after> the tick processing (and consequently, can only wake one process
170per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 211per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171 212
213=item @cf::INVOKE_RESULTS
214
215This array contains the results of the last C<invoke ()> call. When
216C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call.
218
172=back 219=back
173 220
174=cut 221=cut
175 222
176BEGIN { 223BEGIN {
180 $msg .= "\n" 227 $msg .= "\n"
181 unless $msg =~ /\n$/; 228 unless $msg =~ /\n$/;
182 229
183 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
184 231
185 utf8::encode $msg;
186 LOG llevError, $msg; 232 LOG llevError, $msg;
187 }; 233 };
188} 234}
235
236$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "=="
238
239 if ($Coro::current == $Coro::main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d#
242 }#d#
243
244 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate
247};
248
249$SIG{__DIE__} = sub { }; #d#?
189 250
190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
191@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
192@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
193@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
200for my $pkg (qw( 261for my $pkg (qw(
201 cf::global cf::attachable 262 cf::global cf::attachable
202 cf::object cf::object::player 263 cf::object cf::object::player
203 cf::client cf::player 264 cf::client cf::player
204 cf::arch cf::living 265 cf::arch cf::living
266 cf::map cf::mapspace
205 cf::map cf::party cf::region 267 cf::party cf::region
206)) { 268)) {
207 no strict 'refs';
208 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
209} 270}
210 271
211$Event::DIED = sub { 272$EV::DIED = sub {
212 warn "error in event callback: @_"; 273 warn "error in event callback: @_";
213}; 274};
214 275
215############################################################################# 276#############################################################################
216 277
239 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 300 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
240 $d 301 $d
241 } || "[unable to dump $_[0]: '$@']"; 302 } || "[unable to dump $_[0]: '$@']";
242} 303}
243 304
244=item $ref = cf::from_json $json 305=item $ref = cf::decode_json $json
245 306
246Converts a JSON string into the corresponding perl data structure. 307Converts a JSON string into the corresponding perl data structure.
247 308
248=item $json = cf::to_json $ref 309=item $json = cf::encode_json $ref
249 310
250Converts a perl data structure into its JSON representation. 311Converts a perl data structure into its JSON representation.
251 312
252=cut 313=cut
253 314
254our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 316
256sub to_json ($) { $json_coder->encode ($_[0]) } 317sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 318sub decode_json($) { $json_coder->decode ($_[0]) }
319
320=item cf::post_init { BLOCK }
321
322Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again.
324
325The cdoeblock will have a single boolean argument to indicate whether this
326is a reload or not.
327
328=cut
329
330sub post_init(&) {
331 push @POST_INIT, shift;
332}
258 333
259=item cf::lock_wait $string 334=item cf::lock_wait $string
260 335
261Wait until the given lock is available. See cf::lock_acquire. 336Wait until the given lock is available. See cf::lock_acquire.
262 337
263=item my $lock = cf::lock_acquire $string 338=item my $lock = cf::lock_acquire $string
264 339
265Wait until the given lock is available and then acquires it and returns 340Wait until the given lock is available and then acquires it and returns
266a Coro::guard object. If the guard object gets destroyed (goes out of scope, 341a L<Guard> object. If the guard object gets destroyed (goes out of scope,
267for example when the coroutine gets canceled), the lock is automatically 342for example when the coroutine gets canceled), the lock is automatically
268returned. 343returned.
269 344
345Locks are *not* recursive, locking from the same coro twice results in a
346deadlocked coro.
347
270Lock names should begin with a unique identifier (for example, cf::map::find 348Lock names should begin with a unique identifier (for example, cf::map::find
271uses map_find and cf::map::load uses map_load). 349uses map_find and cf::map::load uses map_load).
272 350
273=item $locked = cf::lock_active $string 351=item $locked = cf::lock_active $string
274 352
275Return true if the lock is currently active, i.e. somebody has locked it. 353Return true if the lock is currently active, i.e. somebody has locked it.
276 354
277=cut 355=cut
278 356
279our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
280 358
281sub lock_wait($) { 359sub lock_wait($) {
282 my ($key) = @_; 360 $LOCKS->wait ($_[0]);
283
284 # wait for lock, if any
285 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule;
288 }
289} 361}
290 362
291sub lock_acquire($) { 363sub lock_acquire($) {
292 my ($key) = @_; 364 $LOCKS->guard ($_[0])
293
294 # wait, to be sure we are not locked
295 lock_wait $key;
296
297 $LOCK{$key} = [];
298
299 Coro::guard {
300 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} };
302 }
303} 365}
304 366
305sub lock_active($) { 367sub lock_active($) {
306 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
307
308 ! ! $LOCK{$key}
309} 369}
310 370
311sub freeze_mainloop { 371sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 372 tick_inhibit_inc;
313 373
314 my $guard = Coro::guard { 374 &Guard::guard (\&tick_inhibit_dec);
315 $TICK_WATCHER->start; 375}
376
377=item cf::periodic $interval, $cb
378
379Like EV::periodic, but randomly selects a starting point so that the actions
380get spread over timer.
381
382=cut
383
384sub periodic($$) {
385 my ($interval, $cb) = @_;
386
387 my $start = rand List::Util::min 180, $interval;
388
389 EV::periodic $start, $interval, 0, $cb
390}
391
392=item cf::get_slot $time[, $priority[, $name]]
393
394Allocate $time seconds of blocking CPU time at priority C<$priority>:
395This call blocks and returns only when you have at least C<$time> seconds
396of cpu time till the next tick. The slot is only valid till the next cede.
397
398The optional C<$name> can be used to identify the job to run. It might be
399used for statistical purposes and should identify the same time-class.
400
401Useful for short background jobs.
402
403=cut
404
405our @SLOT_QUEUE;
406our $SLOT_QUEUE;
407
408$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager");
411
412 my $signal = new Coro::Signal;
413
414 while () {
415 next_job:
416 my $avail = cf::till_tick;
417 if ($avail > 0.01) {
418 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) {
420 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send;
422 Coro::cede;
423 goto next_job;
424 }
425 }
426 }
427
428 if (@SLOT_QUEUE) {
429 # we do not use wait_for_tick() as it returns immediately when tick is inactive
430 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait;
432 } else {
433 Coro::schedule;
434 }
316 }; 435 }
317 $TICK_WATCHER->stop; 436};
318 $guard 437
438sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main;
440
441 my ($time, $pri, $name) = @_;
442
443 $time = $TICK * .6 if $time > $TICK * .6;
444 my $sig = new Coro::Signal;
445
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready;
449 $sig->wait;
319} 450}
320 451
321=item cf::async { BLOCK } 452=item cf::async { BLOCK }
322 453
323Currently the same as Coro::async_pool, meaning you cannot use 454Currently the same as Coro::async_pool, meaning you cannot use
328 459
329BEGIN { *async = \&Coro::async_pool } 460BEGIN { *async = \&Coro::async_pool }
330 461
331=item cf::sync_job { BLOCK } 462=item cf::sync_job { BLOCK }
332 463
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 464The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 465is always able to handle events or runnable, as Deliantra is only
335partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 466partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable. 467acceptable.
337 468
338If it must be done, put the blocking parts into C<sync_job>. This will run 469If it must be done, put the blocking parts into C<sync_job>. This will run
339the given BLOCK in another coroutine while waiting for the result. The 470the given BLOCK in another coroutine while waiting for the result. The
344 475
345sub sync_job(&) { 476sub sync_job(&) {
346 my ($job) = @_; 477 my ($job) = @_;
347 478
348 if ($Coro::current == $Coro::main) { 479 if ($Coro::current == $Coro::main) {
349 my $time = Event::time; 480 my $time = EV::time;
350 481
351 # this is the main coro, too bad, we have to block 482 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 483 # till the operation succeeds, freezing the server :/
353 484
354 # TODO: use suspend/resume instead 485 LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 486
356 my $freeze_guard = freeze_mainloop; 487 my $freeze_guard = freeze_mainloop;
357 488
358 my $busy = 1; 489 my $busy = 1;
359 my @res; 490 my @res;
360 491
361 (async { 492 (async {
493 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 494 @res = eval { $job->() };
363 warn $@ if $@; 495 warn $@ if $@;
364 undef $busy; 496 undef $busy;
365 })->prio (Coro::PRIO_MAX); 497 })->prio (Coro::PRIO_MAX);
366 498
367 while ($busy) { 499 while ($busy) {
368 Coro::cede or Event::one_event; 500 if (Coro::nready) {
501 Coro::cede_notself;
502 } else {
503 EV::loop EV::LOOP_ONESHOT;
369 } 504 }
505 }
370 506
371 $time = Event::time - $time; 507 my $time = EV::time - $time;
372 508
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 509 $TICK_START += $time; # do not account sync jobs to server load
377 510
378 wantarray ? @res : $res[0] 511 wantarray ? @res : $res[0]
379 } else { 512 } else {
380 # we are in another coroutine, how wonderful, everything just works 513 # we are in another coroutine, how wonderful, everything just works
381 514
406=item fork_call { }, $args 539=item fork_call { }, $args
407 540
408Executes the given code block with the given arguments in a seperate 541Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 542process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 543Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 544never block itself or use any form of event handling.
412 545
413=cut 546=cut
414
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423 547
424sub fork_call(&@) { 548sub fork_call(&@) {
425 my ($cb, @args) = @_; 549 my ($cb, @args) = @_;
426 550
427# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 551 # we seemingly have to make a local copy of the whole thing,
428# or die "socketpair: $!"; 552 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 553 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 554
432 if (my $pid = fork) { 555 my @res = Coro::Util::fork_eval {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals; 556 reset_signals;
446 local $SIG{__WARN__}; 557 &$cb
447 local $SIG{__DIE__}; 558 }, @args;
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453 559
454 eval { 560 wantarray ? @res : $res[-1]
455 close $fh1; 561}
456 562
457 my @res = eval { $cb->(@args) }; 563=item $coin = coin_from_name $name
458 564
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 565=cut
460 close $fh2;
461 };
462 566
463 warn $@ if $@; 567our %coin_alias = (
464 _exit 0; 568 "silver" => "silvercoin",
465 } 569 "silvercoin" => "silvercoin",
570 "silvercoins" => "silvercoin",
571 "gold" => "goldcoin",
572 "goldcoin" => "goldcoin",
573 "goldcoins" => "goldcoin",
574 "platinum" => "platinacoin",
575 "platinumcoin" => "platinacoin",
576 "platinumcoins" => "platinacoin",
577 "platina" => "platinacoin",
578 "platinacoin" => "platinacoin",
579 "platinacoins" => "platinacoin",
580 "royalty" => "royalty",
581 "royalties" => "royalty",
582);
583
584sub coin_from_name($) {
585 $coin_alias{$_[0]}
586 ? cf::arch::find $coin_alias{$_[0]}
587 : undef
466} 588}
467 589
468=item $value = cf::db_get $family => $key 590=item $value = cf::db_get $family => $key
469 591
470Returns a single value from the environment database. 592Returns a single value from the environment database.
472=item cf::db_put $family => $key => $value 594=item cf::db_put $family => $key => $value
473 595
474Stores the given C<$value> in the family. It can currently store binary 596Stores the given C<$value> in the family. It can currently store binary
475data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 597data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
476 598
599=item $db = cf::db_table "name"
600
601Create and/or open a new database table. The string must not be "db" and must be unique
602within each server.
603
477=cut 604=cut
605
606sub db_table($) {
607 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV;
609
610 eval {
611 $db->set_flags (BDB::CHKSUM);
612
613 utf8::encode $name;
614 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
615 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
616 cf::cleanup "db_open(db): $!" if $!;
617 };
618 cf::cleanup "db_open(db): $@" if $@;
619
620 $db
621}
478 622
479our $DB; 623our $DB;
480 624
481sub db_init { 625sub db_init {
482 unless ($DB) {
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job { 626 cf::sync_job {
486 eval { 627 $DB ||= db_table "db";
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 } 628 };
496} 629}
497 630
498sub db_get($$) { 631sub db_get($$) {
499 my $key = "$_[0]/$_[1]"; 632 my $key = "$_[0]/$_[1]";
500 633
550 if (1) { 683 if (1) {
551 $md5 = 684 $md5 =
552 join "\x00", 685 join "\x00",
553 $processversion, 686 $processversion,
554 map { 687 map {
555 Coro::cede; 688 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 689 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 690 } 0.. $#$src;
558 691
559 692
560 my $dbmd5 = db_get cache => "$id/md5"; 693 my $dbmd5 = db_get cache => "$id/md5";
598 731
599############################################################################# 732#############################################################################
600 733
601=head2 ATTACHABLE OBJECTS 734=head2 ATTACHABLE OBJECTS
602 735
603Many objects in crossfire are so-called attachable objects. That means you can 736Many objects in deliantra are so-called attachable objects. That means you can
604attach callbacks/event handlers (a collection of which is called an "attachment") 737attach callbacks/event handlers (a collection of which is called an "attachment")
605to it. All such attachable objects support the following methods. 738to it. All such attachable objects support the following methods.
606 739
607In the following description, CLASS can be any of C<global>, C<object> 740In the following description, CLASS can be any of C<global>, C<object>
608C<player>, C<client> or C<map> (i.e. the attachable objects in 741C<player>, C<client> or C<map> (i.e. the attachable objects in
609Crossfire TRT). 742Deliantra).
610 743
611=over 4 744=over 4
612 745
613=item $attachable->attach ($attachment, key => $value...) 746=item $attachable->attach ($attachment, key => $value...)
614 747
658=item cf::CLASS::attachment $name, ... 791=item cf::CLASS::attachment $name, ...
659 792
660Register an attachment by C<$name> through which attachable objects of the 793Register an attachment by C<$name> through which attachable objects of the
661given CLASS can refer to this attachment. 794given CLASS can refer to this attachment.
662 795
663Some classes such as crossfire maps and objects can specify attachments 796Some classes such as deliantra maps and objects can specify attachments
664that are attached at load/instantiate time, thus the need for a name. 797that are attached at load/instantiate time, thus the need for a name.
665 798
666These calls expect any number of the following handler/hook descriptions: 799These calls expect any number of the following handler/hook descriptions:
667 800
668=over 4 801=over 4
866 "; 999 ";
867 die if $@; 1000 die if $@;
868} 1001}
869 1002
870our $override; 1003our $override;
871our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1004our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872 1005
873sub override { 1006sub override {
874 $override = 1; 1007 $override = 1;
875 @invoke_results = (); 1008 @INVOKE_RESULTS = (@_);
876} 1009}
877 1010
878sub do_invoke { 1011sub do_invoke {
879 my $event = shift; 1012 my $event = shift;
880 my $callbacks = shift; 1013 my $callbacks = shift;
881 1014
882 @invoke_results = (); 1015 @INVOKE_RESULTS = ();
883 1016
884 local $override; 1017 local $override;
885 1018
886 for (@$callbacks) { 1019 for (@$callbacks) {
887 eval { &{$_->[1]} }; 1020 eval { &{$_->[1]} };
896 } 1029 }
897 1030
898 0 1031 0
899} 1032}
900 1033
901=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1034=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
902 1035
903=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1036=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
904 1037
905Generate an object-specific event with the given arguments. 1038Generate an object-specific event with the given arguments.
906 1039
907This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1040This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908removed in future versions), and there is no public API to access override 1041removed in future versions), and there is no public API to access override
909results (if you must, access C<@cf::invoke_results> directly). 1042results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 1043
911=back 1044=back
912 1045
913=cut 1046=cut
914 1047
915############################################################################# 1048#############################################################################
916# object support 1049# object support
1050
1051sub _object_equal($$);
1052sub _object_equal($$) {
1053 my ($a, $b) = @_;
1054
1055 return 0 unless (ref $a) eq (ref $b);
1056
1057 if ("HASH" eq ref $a) {
1058 my @ka = keys %$a;
1059 my @kb = keys %$b;
1060
1061 return 0 if @ka != @kb;
1062
1063 for (0 .. $#ka) {
1064 return 0 unless $ka[$_] eq $kb[$_];
1065 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1066 }
1067
1068 } elsif ("ARRAY" eq ref $a) {
1069
1070 return 0 if @$a != @$b;
1071
1072 for (0 .. $#$a) {
1073 return 0 unless _object_equal $a->[$_], $b->[$_];
1074 }
1075
1076 } elsif ($a ne $b) {
1077 return 0;
1078 }
1079
1080 1
1081}
1082
1083our $SLOW_MERGES;#d#
1084sub _can_merge {
1085 my ($ob1, $ob2) = @_;
1086
1087 ++$SLOW_MERGES;#d#
1088
1089 # we do the slow way here
1090 return _object_equal $ob1, $ob2
1091}
917 1092
918sub reattach { 1093sub reattach {
919 # basically do the same as instantiate, without calling instantiate 1094 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 1095 my ($obj) = @_;
921 1096
1097 # no longer needed after getting rid of delete_package?
922 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1098 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
923 1099
924 my $registry = $obj->registry; 1100 my $registry = $obj->registry;
925 1101
926 @$registry = (); 1102 @$registry = ();
927 1103
942cf::attachable->attach ( 1118cf::attachable->attach (
943 prio => -1000000, 1119 prio => -1000000,
944 on_instantiate => sub { 1120 on_instantiate => sub {
945 my ($obj, $data) = @_; 1121 my ($obj, $data) = @_;
946 1122
947 $data = from_json $data; 1123 $data = decode_json $data;
948 1124
949 for (@$data) { 1125 for (@$data) {
950 my ($name, $args) = @$_; 1126 my ($name, $args) = @$_;
951 1127
952 $obj->attach ($name, %{$args || {} }); 1128 $obj->attach ($name, %{$args || {} });
968sub object_freezer_save { 1144sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1145 my ($filename, $rdata, $objs) = @_;
970 1146
971 sync_job { 1147 sync_job {
972 if (length $$rdata) { 1148 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename);
973 warn sprintf "saving %s (%d,%d)\n", 1150 warn sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1151 $decname, length $$rdata, scalar @$objs;
975 1152
976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
978 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979 aio_fsync $fh if $cf::USE_FSYNC; 1156 if ($cf::USE_FSYNC) {
1157 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1158 aio_fsync $fh;
1159 }
980 close $fh; 1160 aio_close $fh;
981 1161
982 if (@$objs) { 1162 if (@$objs) {
983 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1163 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
984 chmod SAVE_MODE, $fh; 1164 aio_chmod $fh, SAVE_MODE;
985 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986 aio_write $fh, 0, (length $data), $data, 0; 1166 aio_write $fh, 0, (length $data), $data, 0;
987 aio_fsync $fh if $cf::USE_FSYNC; 1167 if ($cf::USE_FSYNC) {
1168 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1169 aio_fsync $fh;
1170 }
988 close $fh; 1171 aio_close $fh;
989 aio_rename "$filename.pst~", "$filename.pst"; 1172 aio_rename "$filename.pst~", "$filename.pst";
990 } 1173 }
991 } else { 1174 } else {
992 aio_unlink "$filename.pst"; 1175 aio_unlink "$filename.pst";
993 } 1176 }
994 1177
995 aio_rename "$filename~", $filename; 1178 aio_rename "$filename~", $filename;
1179
1180 $filename =~ s%/[^/]+$%%;
1181 aio_pathsync $filename if $cf::USE_FSYNC;
996 } else { 1182 } else {
997 warn "FATAL: $filename~: $!\n"; 1183 warn "unable to save objects: $filename~: $!\n";
998 } 1184 }
999 } else { 1185 } else {
1000 aio_unlink $filename; 1186 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1187 aio_unlink "$filename.pst";
1002 } 1188 }
1003 } 1189 };
1004} 1190}
1005 1191
1006sub object_freezer_as_string { 1192sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1193 my ($rdata, $objs) = @_;
1008 1194
1020 or return; 1206 or return;
1021 1207
1022 unless (aio_stat "$filename.pst") { 1208 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1209 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1210 or return;
1211
1025 $av = eval { (Storable::thaw $av)->{objs} }; 1212 my $st = eval { Coro::Storable::thaw $av };
1213 $av = $st->{objs};
1026 } 1214 }
1027 1215
1216 utf8::decode (my $decname = $filename);
1028 warn sprintf "loading %s (%d)\n", 1217 warn sprintf "loading %s (%d,%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1218 $decname, length $data, scalar @{$av || []};
1219
1030 return ($data, $av); 1220 ($data, $av)
1031} 1221}
1032 1222
1033=head2 COMMAND CALLBACKS 1223=head2 COMMAND CALLBACKS
1034 1224
1035=over 4 1225=over 4
1089 my ($name, $cb) = @_; 1279 my ($name, $cb) = @_;
1090 1280
1091 $EXTICMD{$name} = $cb; 1281 $EXTICMD{$name} = $cb;
1092} 1282}
1093 1283
1284use File::Glob ();
1285
1094cf::player->attach ( 1286cf::player->attach (
1095 on_command => sub { 1287 on_command => sub {
1096 my ($pl, $name, $params) = @_; 1288 my ($pl, $name, $params) = @_;
1097 1289
1098 my $cb = $COMMAND{$name} 1290 my $cb = $COMMAND{$name}
1108 my ($pl, $buf) = @_; 1300 my ($pl, $buf) = @_;
1109 1301
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1302 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1303
1112 if (ref $msg) { 1304 if (ref $msg) {
1305 my ($type, $reply, @payload) =
1306 "ARRAY" eq ref $msg
1307 ? @$msg
1308 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1309
1310 my @reply;
1311
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1312 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1313 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1314 }
1315
1316 $pl->ext_reply ($reply, @reply)
1317 if $reply;
1318
1118 } else { 1319 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1320 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1321 }
1121 1322
1122 cf::override; 1323 cf::override;
1123 }, 1324 },
1124); 1325);
1326
1327# "readahead" all extensions
1328sub cache_extensions {
1329 my $grp = IO::AIO::aio_group;
1330
1331 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1332 for (grep /\.ext$/, @{$_[0]}) {
1333 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1334 }
1335 };
1336
1337 $grp
1338}
1125 1339
1126sub load_extensions { 1340sub load_extensions {
1127 cf::sync_job { 1341 cf::sync_job {
1128 my %todo; 1342 my %todo;
1129 1343
1149 1363
1150 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1364 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1151 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1365 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1152 1366
1153 $ext{source} = 1367 $ext{source} =
1154 "package $pkg; use strict; use utf8;\n" 1368 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1155 . "#line 1 \"$path\"\n{\n" 1369 . "#line 1 \"$path\"\n{\n"
1156 . $source 1370 . $source
1157 . "\n};\n1"; 1371 . "\n};\n1";
1158 1372
1159 $todo{$base} = \%ext; 1373 $todo{$base} = \%ext;
1175 my $msg = $@ ? "$v->{path}: $@\n" 1389 my $msg = $@ ? "$v->{path}: $@\n"
1176 : "$v->{base}: extension inactive.\n"; 1390 : "$v->{base}: extension inactive.\n";
1177 1391
1178 if (exists $v->{meta}{mandatory}) { 1392 if (exists $v->{meta}{mandatory}) {
1179 warn $msg; 1393 warn $msg;
1180 warn "mandatory extension failed to load, exiting.\n"; 1394 cf::cleanup "mandatory extension failed to load, exiting.";
1181 exit 1;
1182 } 1395 }
1183 1396
1184 warn $msg; 1397 warn $msg;
1185 } 1398 }
1186 1399
1200 1413
1201=back 1414=back
1202 1415
1203=head2 CORE EXTENSIONS 1416=head2 CORE EXTENSIONS
1204 1417
1205Functions and methods that extend core crossfire objects. 1418Functions and methods that extend core deliantra objects.
1206 1419
1207=cut 1420=cut
1208 1421
1209package cf::player; 1422package cf::player;
1210 1423
1211use Coro::AIO; 1424use Coro::AIO;
1212 1425
1213=head3 cf::player 1426=head3 cf::player
1214 1427
1215=over 4 1428=over 4
1429
1430=item cf::player::num_playing
1431
1432Returns the official number of playing players, as per the Crossfire metaserver rules.
1433
1434=cut
1435
1436sub num_playing {
1437 scalar grep
1438 $_->ob->map
1439 && !$_->hidden
1440 && !$_->ob->flag (cf::FLAG_WIZ),
1441 cf::player::list
1442}
1216 1443
1217=item cf::player::find $login 1444=item cf::player::find $login
1218 1445
1219Returns the given player object, loading it if necessary (might block). 1446Returns the given player object, loading it if necessary (might block).
1220 1447
1239 1466
1240sub exists($) { 1467sub exists($) {
1241 my ($login) = @_; 1468 my ($login) = @_;
1242 1469
1243 $cf::PLAYER{$login} 1470 $cf::PLAYER{$login}
1244 or cf::sync_job { !aio_stat path $login } 1471 or !aio_stat path $login
1245} 1472}
1246 1473
1247sub find($) { 1474sub find($) {
1248 return $cf::PLAYER{$_[0]} || do { 1475 return $cf::PLAYER{$_[0]} || do {
1249 my $login = $_[0]; 1476 my $login = $_[0];
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1483 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1484 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1485 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1486 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1487
1261 my $pl = load_pl path $login 1488 my $f = new_from_file cf::object::thawer path $login
1262 or return; 1489 or return;
1490
1491 my $pl = cf::player::load_pl $f
1492 or return;
1493
1494 local $cf::PLAYER_LOADING{$login} = $pl;
1495 $f->resolve_delayed_derefs;
1263 $cf::PLAYER{$login} = $pl 1496 $cf::PLAYER{$login} = $pl
1264 } 1497 }
1265 } 1498 }
1266} 1499}
1267 1500
1276 return if $pl->{deny_save}; 1509 return if $pl->{deny_save};
1277 1510
1278 aio_mkdir playerdir $pl, 0770; 1511 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1512 $pl->{last_save} = $cf::RUNTIME;
1280 1513
1514 cf::get_slot 0.01;
1515
1281 $pl->save_pl ($path); 1516 $pl->save_pl ($path);
1282 Coro::cede; 1517 cf::cede_to_tick;
1283} 1518}
1284 1519
1285sub new($) { 1520sub new($) {
1286 my ($login) = @_; 1521 my ($login) = @_;
1287 1522
1293 $cf::PLAYER{$login} = $self; 1528 $cf::PLAYER{$login} = $self;
1294 1529
1295 $self 1530 $self
1296} 1531}
1297 1532
1533=item $player->send_msg ($channel, $msg, $color, [extra...])
1534
1535=cut
1536
1537sub send_msg {
1538 my $ns = shift->ns
1539 or return;
1540 $ns->send_msg (@_);
1541}
1542
1298=item $pl->quit_character 1543=item $pl->quit_character
1299 1544
1300Nukes the player without looking back. If logged in, the connection will 1545Nukes the player without looking back. If logged in, the connection will
1301be destroyed. May block for a long time. 1546be destroyed. May block for a long time.
1302 1547
1306 my ($pl) = @_; 1551 my ($pl) = @_;
1307 1552
1308 my $name = $pl->ob->name; 1553 my $name = $pl->ob->name;
1309 1554
1310 $pl->{deny_save} = 1; 1555 $pl->{deny_save} = 1;
1311 $pl->password ("*"); # this should lock out the player until we nuked the dir 1556 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1312 1557
1313 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1558 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1314 $pl->deactivate; 1559 $pl->deactivate;
1560 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1561 $pl->ob->check_score;
1315 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1562 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1316 $pl->ns->destroy if $pl->ns; 1563 $pl->ns->destroy if $pl->ns;
1317 1564
1318 my $path = playerdir $pl; 1565 my $path = playerdir $pl;
1319 my $temp = "$path~$cf::RUNTIME~deleting~"; 1566 my $temp = "$path~$cf::RUNTIME~deleting~";
1355 or return []; 1602 or return [];
1356 1603
1357 my @logins; 1604 my @logins;
1358 1605
1359 for my $login (@$dirs) { 1606 for my $login (@$dirs) {
1607 my $path = path $login;
1608
1609 # a .pst is a dead give-away for a valid player
1610 # if no pst file found, open and chekc for blocked users
1611 if (aio_stat "$path.pst") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1612 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1613 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1614 $buf !~ /^password -------------$/m or next; # official not-valid tag
1615 }
1363 1616
1364 utf8::decode $login; 1617 utf8::decode $login;
1365 push @logins, $login; 1618 push @logins, $login;
1366 } 1619 }
1367 1620
1394 } 1647 }
1395 1648
1396 \@paths 1649 \@paths
1397} 1650}
1398 1651
1399=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1652=item $protocol_xml = $player->expand_cfpod ($cfpod)
1400 1653
1401Expand crossfire pod fragments into protocol xml. 1654Expand deliantra pod fragments into protocol xml.
1402 1655
1403=cut
1404
1405sub expand_cfpod {
1406 ((my $self), (local $_)) = @_;
1407
1408 # escape & and <
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411
1412 # this is buggy, it needs to properly take care of nested <'s
1413
1414 1 while
1415 # replace B<>, I<>, U<> etc.
1416 s/B<([^\>]*)>/<b>$1<\/b>/
1417 || s/I<([^\>]*)>/<i>$1<\/i>/
1418 || s/U<([^\>]*)>/<u>$1<\/u>/
1419 # replace G<male|female> tags
1420 || s{G<([^>|]*)\|([^>]*)>}{
1421 $self->gender ? $2 : $1
1422 }ge
1423 # replace H<hint text>
1424 || s{H<([^\>]*)>}
1425 {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "")
1429 [$self->{hintmode}]
1430 }ge;
1431
1432 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g;
1434
1435 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines
1440
1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1447}
1448
1449=item $player->ext_reply ($msgid, %msg) 1656=item $player->ext_reply ($msgid, @msg)
1450 1657
1451Sends an ext reply to the player. 1658Sends an ext reply to the player.
1452 1659
1453=cut 1660=cut
1454 1661
1455sub ext_reply($$%) { 1662sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1663 my ($self, $id, @msg) = @_;
1457 1664
1458 $msg{msgid} = $id; 1665 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1666}
1461 1667
1462=item $player->ext_event ($type, %msg) 1668=item $player->ext_msg ($type, @msg)
1463 1669
1464Sends an ext event to the client. 1670Sends an ext event to the client.
1465 1671
1466=cut 1672=cut
1467 1673
1468sub ext_event($$%) { 1674sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1675 my ($self, $type, @msg) = @_;
1470 1676
1471 $self->ns->ext_event ($type, %msg); 1677 $self->ns->ext_msg ($type, @msg);
1472} 1678}
1473 1679
1474=head3 cf::region 1680=head3 cf::region
1475 1681
1476=over 4 1682=over 4
1520our $MAX_RESET = 3600; 1726our $MAX_RESET = 3600;
1521our $DEFAULT_RESET = 3000; 1727our $DEFAULT_RESET = 3000;
1522 1728
1523sub generate_random_map { 1729sub generate_random_map {
1524 my ($self, $rmp) = @_; 1730 my ($self, $rmp) = @_;
1731
1732 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1733
1525 # mit "rum" bekleckern, nicht 1734 # mit "rum" bekleckern, nicht
1526 $self->_create_random_map ( 1735 $self->_create_random_map (
1527 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1736 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1528 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1737 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1529 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1738 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1651 1860
1652# the temporary/swap location 1861# the temporary/swap location
1653sub save_path { 1862sub save_path {
1654 my ($self) = @_; 1863 my ($self) = @_;
1655 1864
1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1865 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1657 "$TMPDIR/$path.map" 1866 "$TMPDIR/$path.map"
1658} 1867}
1659 1868
1660# the unique path, undef == no special unique path 1869# the unique path, undef == no special unique path
1661sub uniq_path { 1870sub uniq_path {
1662 my ($self) = @_; 1871 my ($self) = @_;
1663 1872
1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1665 "$UNIQUEDIR/$path" 1874 "$UNIQUEDIR/$path"
1666}
1667
1668# and all this just because we cannot iterate over
1669# all maps in C++...
1670sub change_all_map_light {
1671 my ($change) = @_;
1672
1673 $_->change_map_light ($change)
1674 for grep $_->outdoor, values %cf::MAP;
1675} 1875}
1676 1876
1677sub decay_objects { 1877sub decay_objects {
1678 my ($self) = @_; 1878 my ($self) = @_;
1679 1879
1692 1892
1693sub load_header_from($) { 1893sub load_header_from($) {
1694 my ($self, $path) = @_; 1894 my ($self, $path) = @_;
1695 1895
1696 utf8::encode $path; 1896 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1897 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 or return; 1898 or return;
1899
1900 $self->_load_header ($f)
1901 or return;
1902
1903 local $MAP_LOADING{$self->{path}} = $self;
1904 $f->resolve_delayed_derefs;
1702 1905
1703 $self->{load_path} = $path; 1906 $self->{load_path} = $path;
1704 1907
1705 1 1908 1
1706} 1909}
1760sub find { 1963sub find {
1761 my ($path, $origin) = @_; 1964 my ($path, $origin) = @_;
1762 1965
1763 $path = normalise $path, $origin && $origin->path; 1966 $path = normalise $path, $origin && $origin->path;
1764 1967
1968 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 1969 my $guard2 = cf::lock_acquire "map_find:$path";
1766 1970
1767 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
1768 my $guard = cf::lock_acquire "map_find:$path";
1769 my $map = new_from_path cf::map $path 1972 my $map = new_from_path cf::map $path
1770 or return; 1973 or return;
1771 1974
1772 $map->{last_save} = $cf::RUNTIME; 1975 $map->{last_save} = $cf::RUNTIME;
1773 1976
1775 or return; 1978 or return;
1776 1979
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1980 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 1981 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 1982 #$cf::WAIT_FOR_TICK->wait;
1983 undef $guard2;
1984 undef $guard1;
1780 $map->reset; 1985 $map->reset;
1781 undef $guard;
1782 return find $path; 1986 return find $path;
1783 } 1987 }
1784 1988
1785 $cf::MAP{$path} = $map 1989 $cf::MAP{$path} = $map
1786 } 1990 }
1795 local $self->{deny_reset} = 1; # loading can take a long time 1999 local $self->{deny_reset} = 1; # loading can take a long time
1796 2000
1797 my $path = $self->{path}; 2001 my $path = $self->{path};
1798 2002
1799 { 2003 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2004 my $guard = cf::lock_acquire "map_data:$path";
1801 2005
2006 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2007 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2008
1804 $self->in_memory (cf::MAP_LOADING); 2009 $self->in_memory (cf::MAP_LOADING);
1805 2010
1806 $self->alloc; 2011 $self->alloc;
1807 2012
1808 $self->pre_load; 2013 $self->pre_load;
1809 Coro::cede; 2014 cf::cede_to_tick;
1810 2015
2016 my $f = new_from_file cf::object::thawer $self->{load_path};
2017 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2018 $self->_load_objects ($f)
1812 or return; 2019 or return;
1813 2020
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2021 $self->post_load_original
1815 if delete $self->{load_original}; 2022 if delete $self->{load_original};
1816 2023
1817 if (my $uniq = $self->uniq_path) { 2024 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2025 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2026 unless (aio_stat $uniq) {
2027 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2028 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2029 $self->_load_objects ($f);
2030 $f->resolve_delayed_derefs;
2031 }
1822 } 2032 }
1823 } 2033 }
1824 2034
1825 Coro::cede; 2035 $f->resolve_delayed_derefs;
2036
2037 cf::cede_to_tick;
1826 # now do the right thing for maps 2038 # now do the right thing for maps
1827 $self->link_multipart_objects; 2039 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2040 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2041 unless $self->difficulty;
1830 Coro::cede; 2042 cf::cede_to_tick;
1831 2043
1832 unless ($self->{deny_activate}) { 2044 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2045 $self->decay_objects;
1834 $self->fix_auto_apply; 2046 $self->fix_auto_apply;
1835 $self->update_buttons; 2047 $self->update_buttons;
1836 Coro::cede; 2048 cf::cede_to_tick;
1837 $self->set_darkness_map;
1838 Coro::cede;
1839 $self->activate; 2049 $self->activate;
1840 } 2050 }
1841 2051
2052 $self->{last_save} = $cf::RUNTIME;
2053 $self->last_access ($cf::RUNTIME);
2054
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2055 $self->in_memory (cf::MAP_ACTIVE);
1843 } 2056 }
1844 2057
1845 $self->post_load; 2058 $self->post_load;
1846} 2059}
1847 2060
1856 2069
1857 $self 2070 $self
1858} 2071}
1859 2072
1860# find and load all maps in the 3x3 area around a map 2073# find and load all maps in the 3x3 area around a map
1861sub load_diag { 2074sub load_neighbours {
1862 my ($map) = @_; 2075 my ($map) = @_;
1863 2076
1864 my @diag; # diagonal neighbours 2077 my @neigh; # diagonal neighbours
1865 2078
1866 for (0 .. 3) { 2079 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2080 my $neigh = $map->tile_path ($_)
1868 or next; 2081 or next;
1869 $neigh = find $neigh, $map 2082 $neigh = find $neigh, $map
1870 or next; 2083 or next;
1871 $neigh->load; 2084 $neigh->load;
1872 2085
2086 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2087 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2088 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2089 }
1876 2090
1877 for (@diag) { 2091 for (grep defined $_->[0], @neigh) {
2092 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2093 my $neigh = find $path, $origin
1879 or next; 2094 or next;
1880 $neigh->load; 2095 $neigh->load;
1881 } 2096 }
1882} 2097}
1883 2098
1888} 2103}
1889 2104
1890sub do_load_sync { 2105sub do_load_sync {
1891 my ($map) = @_; 2106 my ($map) = @_;
1892 2107
2108 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2109 if $Coro::current == $Coro::main;
2110
1893 cf::sync_job { $map->load }; 2111 cf::sync_job { $map->load };
1894} 2112}
1895 2113
1896our %MAP_PREFETCH; 2114our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2115our $MAP_PREFETCHER = undef;
1898 2116
1899sub find_async { 2117sub find_async {
1900 my ($path, $origin) = @_; 2118 my ($path, $origin, $load) = @_;
1901 2119
1902 $path = normalise $path, $origin && $origin->{path}; 2120 $path = normalise $path, $origin && $origin->{path};
1903 2121
1904 if (my $map = $cf::MAP{$path}) { 2122 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2123 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1906 } 2124 }
1907 2125
1908 undef $MAP_PREFETCH{$path}; 2126 $MAP_PREFETCH{$path} |= $load;
2127
1909 $MAP_PREFETCHER ||= cf::async { 2128 $MAP_PREFETCHER ||= cf::async {
2129 $Coro::current->{desc} = "map prefetcher";
2130
1910 while (%MAP_PREFETCH) { 2131 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2132 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 if (my $map = find $path) { 2133 if (my $map = find $k) {
1913 $map->load; 2134 $map->load if $v;
1914 } 2135 }
1915 2136
1916 delete $MAP_PREFETCH{$path}; 2137 delete $MAP_PREFETCH{$k};
1917 } 2138 }
1918 } 2139 }
1919 undef $MAP_PREFETCHER; 2140 undef $MAP_PREFETCHER;
1920 }; 2141 };
1921 $MAP_PREFETCHER->prio (6); 2142 $MAP_PREFETCHER->prio (6);
1924} 2145}
1925 2146
1926sub save { 2147sub save {
1927 my ($self) = @_; 2148 my ($self) = @_;
1928 2149
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2150 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2151
1931 $self->{last_save} = $cf::RUNTIME; 2152 $self->{last_save} = $cf::RUNTIME;
1932 2153
1933 return unless $self->dirty; 2154 return unless $self->dirty;
1934 2155
1940 return if $self->{deny_save}; 2161 return if $self->{deny_save};
1941 2162
1942 local $self->{last_access} = $self->last_access;#d# 2163 local $self->{last_access} = $self->last_access;#d#
1943 2164
1944 cf::async { 2165 cf::async {
2166 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2167 $_->contr->save for $self->players;
1946 }; 2168 };
2169
2170 cf::get_slot 0.02;
1947 2171
1948 if ($uniq) { 2172 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2173 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1950 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2174 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1951 } else { 2175 } else {
1957 my ($self) = @_; 2181 my ($self) = @_;
1958 2182
1959 # save first because save cedes 2183 # save first because save cedes
1960 $self->save; 2184 $self->save;
1961 2185
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2186 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2187
1964 return if $self->players; 2188 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2189 return if $self->in_memory != cf::MAP_ACTIVE;
1966 return if $self->{deny_save}; 2190 return if $self->{deny_save};
1967 2191
2192 $self->in_memory (cf::MAP_SWAPPED);
2193
2194 $self->deactivate;
2195 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2196 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2197}
1971 2198
1972sub reset_at { 2199sub reset_at {
1973 my ($self) = @_; 2200 my ($self) = @_;
1974 2201
2006 if $uniq; 2233 if $uniq;
2007 } 2234 }
2008 2235
2009 delete $cf::MAP{$self->path}; 2236 delete $cf::MAP{$self->path};
2010 2237
2238 $self->deactivate;
2239 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2240 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2241
2015 $self->unlink_save; 2242 $self->unlink_save;
2016 $self->destroy; 2243 $self->destroy;
2017} 2244}
2018 2245
2019my $nuke_counter = "aaaa"; 2246my $nuke_counter = "aaaa";
2020 2247
2021sub nuke { 2248sub nuke {
2022 my ($self) = @_; 2249 my ($self) = @_;
2023 2250
2251 {
2252 my $lock = cf::lock_acquire "map_data:$self->{path}";
2253
2024 delete $cf::MAP{$self->path}; 2254 delete $cf::MAP{$self->path};
2025 2255
2026 $self->unlink_save; 2256 $self->unlink_save;
2027 2257
2028 bless $self, "cf::map"; 2258 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2259 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2260 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2261 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2262 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2263
2034 $cf::MAP{$self->path} = $self; 2264 $cf::MAP{$self->path} = $self;
2265 }
2035 2266
2036 $self->reset; # polite request, might not happen 2267 $self->reset; # polite request, might not happen
2037} 2268}
2038 2269
2039=item $maps = cf::map::tmp_maps 2270=item $maps = cf::map::tmp_maps
2081 2312
2082sub unique_maps() { 2313sub unique_maps() {
2083 [ 2314 [
2084 map { 2315 map {
2085 utf8::decode $_; 2316 utf8::decode $_;
2086 /\.map$/ 2317 s/\.map$//; # TODO future compatibility hack
2318 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2319 ? ()
2087 ? normalise $_ 2320 : normalise $_
2088 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] } 2321 } @{ aio_readdir $UNIQUEDIR or [] }
2090 ] 2322 ]
2091} 2323}
2092 2324
2093package cf;
2094
2095=back 2325=back
2096 2326
2097=head3 cf::object 2327=head3 cf::object
2098 2328
2099=cut 2329=cut
2102 2332
2103=over 4 2333=over 4
2104 2334
2105=item $ob->inv_recursive 2335=item $ob->inv_recursive
2106 2336
2107Returns the inventory of the object _and_ their inventories, recursively. 2337Returns the inventory of the object I<and> their inventories, recursively,
2338but I<not> the object itself.
2108 2339
2109=cut 2340=cut
2110 2341
2111sub inv_recursive_; 2342sub inv_recursive_;
2112sub inv_recursive_ { 2343sub inv_recursive_ {
2115 2346
2116sub inv_recursive { 2347sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2348 inv_recursive_ inv $_[0]
2118} 2349}
2119 2350
2351=item $ref = $ob->ref
2352
2353Creates and returns a persistent reference to an object that can be stored as a string.
2354
2355=item $ob = cf::object::deref ($refstring)
2356
2357returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2358even if the object actually exists. May block.
2359
2360=cut
2361
2362sub deref {
2363 my ($ref) = @_;
2364
2365 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2366 my ($uuid, $name) = ($1, $2);
2367 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2368 or return;
2369 $pl->ob->uuid eq $uuid
2370 or return;
2371
2372 $pl->ob
2373 } else {
2374 warn "$ref: cannot resolve object reference\n";
2375 undef
2376 }
2377}
2378
2120package cf; 2379package cf;
2121 2380
2122=back 2381=back
2123 2382
2124=head3 cf::object::player 2383=head3 cf::object::player
2130Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2389Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2131can be C<undef>. Does the right thing when the player is currently in a 2390can be C<undef>. Does the right thing when the player is currently in a
2132dialogue with the given NPC character. 2391dialogue with the given NPC character.
2133 2392
2134=cut 2393=cut
2394
2395our $SAY_CHANNEL = {
2396 id => "say",
2397 title => "Map",
2398 reply => "say ",
2399 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2400};
2401
2402our $CHAT_CHANNEL = {
2403 id => "chat",
2404 title => "Chat",
2405 reply => "chat ",
2406 tooltip => "Player chat and shouts, global to the server.",
2407};
2135 2408
2136# rough implementation of a future "reply" method that works 2409# rough implementation of a future "reply" method that works
2137# with dialog boxes. 2410# with dialog boxes.
2138#TODO: the first argument must go, split into a $npc->reply_to ( method 2411#TODO: the first argument must go, split into a $npc->reply_to ( method
2139sub cf::object::player::reply($$$;$) { 2412sub cf::object::player::reply($$$;$) {
2146 2419
2147 } else { 2420 } else {
2148 my $pl = $self->contr; 2421 my $pl = $self->contr;
2149 2422
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2423 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2424 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2425 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2426
2159 } else { 2427 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2428 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2429 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2162 } 2430 }
2163 } 2431 }
2432}
2433
2434=item $object->send_msg ($channel, $msg, $color, [extra...])
2435
2436=cut
2437
2438sub cf::object::send_msg {
2439 my $pl = shift->contr
2440 or return;
2441 $pl->send_msg (@_);
2164} 2442}
2165 2443
2166=item $player_object->may ("access") 2444=item $player_object->may ("access")
2167 2445
2168Returns wether the given player is authorized to access resource "access" 2446Returns wether the given player is authorized to access resource "access"
2181 2459
2182=item $player_object->enter_link 2460=item $player_object->enter_link
2183 2461
2184Freezes the player and moves him/her to a special map (C<{link}>). 2462Freezes the player and moves him/her to a special map (C<{link}>).
2185 2463
2186The player should be reasonably safe there for short amounts of time. You 2464The player should be reasonably safe there for short amounts of time (e.g.
2187I<MUST> call C<leave_link> as soon as possible, though. 2465for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2466though, as the palyer cannot control the character while it is on the link
2467map.
2188 2468
2189Will never block. 2469Will never block.
2190 2470
2191=item $player_object->leave_link ($map, $x, $y) 2471=item $player_object->leave_link ($map, $x, $y)
2192 2472
2247 # use -1 or undef as default coordinates, not 0, 0 2527 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2528 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2529 if $x <=0 && $y <= 0;
2250 2530
2251 $map->load; 2531 $map->load;
2252 $map->load_diag; 2532 $map->load_neighbours;
2253 2533
2254 return unless $self->contr->active; 2534 return unless $self->contr->active;
2535 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2255 $self->activate_recursive; 2536 $self->activate_recursive;
2256 2537
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2538 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2539 $self->enter_map ($map, $x, $y);
2259} 2540}
2264her, loading and preparing them map, calling the provided $check callback 2545her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2546that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. In either case, $done will 2547the new (success) or old (failed) map position. In either case, $done will
2267be called at the end of this process. 2548be called at the end of this process.
2268 2549
2550Note that $check will be called with a potentially non-loaded map, so if
2551it needs a loaded map it has to call C<< ->load >>.
2552
2269=cut 2553=cut
2270 2554
2271our $GOTOGEN; 2555our $GOTOGEN;
2272 2556
2273sub cf::object::player::goto { 2557sub cf::object::player::goto {
2277 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2278 2562
2279 $self->enter_link; 2563 $self->enter_link;
2280 2564
2281 (async { 2565 (async {
2566 $Coro::current->{desc} = "player::goto $path $x $y";
2567
2568 # *tag paths override both path and x|y
2569 if ($path =~ /^\*(.*)$/) {
2570 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2571 my $ob = $obs[rand @obs];
2572
2573 # see if we actually can go there
2574 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2575 $ob = $obs[rand @obs];
2576 } else {
2577 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2578 }
2579 # else put us there anyways for now #d#
2580
2581 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2582 } else {
2583 ($path, $x, $y) = (undef, undef, undef);
2584 }
2585 }
2586
2282 my $map = eval { 2587 my $map = eval {
2283 my $map = cf::map::find $path; 2588 my $map = defined $path ? cf::map::find $path : undef;
2284 2589
2285 if ($map) { 2590 if ($map) {
2286 $map = $map->customise_for ($self); 2591 $map = $map->customise_for ($self);
2287 $map = $check->($map) if $check && $map; 2592 $map = $check->($map) if $check && $map;
2288 } else { 2593 } else {
2289 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2594 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2290 } 2595 }
2291 2596
2292 $map 2597 $map
2293 }; 2598 };
2294 2599
2330} 2635}
2331 2636
2332sub prepare_random_map { 2637sub prepare_random_map {
2333 my ($exit) = @_; 2638 my ($exit) = @_;
2334 2639
2335 my $guard = cf::lock_acquire "exit_prepare:$exit";
2336
2337 # all this does is basically replace the /! path by 2640 # all this does is basically replace the /! path by
2338 # a new random map path (?random/...) with a seed 2641 # a new random map path (?random/...) with a seed
2339 # that depends on the exit object 2642 # that depends on the exit object
2340 2643
2341 my $rmp = parse_random_map_params $exit->msg; 2644 my $rmp = parse_random_map_params $exit->msg;
2343 if ($exit->map) { 2646 if ($exit->map) {
2344 $rmp->{region} = $exit->region->name; 2647 $rmp->{region} = $exit->region->name;
2345 $rmp->{origin_map} = $exit->map->path; 2648 $rmp->{origin_map} = $exit->map->path;
2346 $rmp->{origin_x} = $exit->x; 2649 $rmp->{origin_x} = $exit->x;
2347 $rmp->{origin_y} = $exit->y; 2650 $rmp->{origin_y} = $exit->y;
2651
2652 $exit->map->touch;
2348 } 2653 }
2349 2654
2350 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2351 2656
2352 my $data = cf::to_json $rmp; 2657 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2353 my $md5 = Digest::MD5::md5_hex $data; 2658 my $md5 = Digest::MD5::md5_hex $data;
2354 my $meta = "$RANDOMDIR/$md5.meta"; 2659 my $meta = "$RANDOMDIR/$md5.meta";
2355 2660
2356 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2357 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
2358 undef $fh; 2663 undef $fh;
2359 aio_rename "$meta~", $meta; 2664 aio_rename "$meta~", $meta;
2360 2665
2666 my $slaying = "?random/$md5";
2667
2668 if ($exit->valid) {
2361 $exit->slaying ("?random/$md5"); 2669 $exit->slaying ("?random/$md5");
2362 $exit->msg (undef); 2670 $exit->msg (undef);
2671 }
2363 } 2672 }
2364} 2673}
2365 2674
2366sub cf::object::player::enter_exit { 2675sub cf::object::player::enter_exit {
2367 my ($self, $exit) = @_; 2676 my ($self, $exit) = @_;
2368 2677
2369 return unless $self->type == cf::PLAYER; 2678 return unless $self->type == cf::PLAYER;
2370 2679
2371 if ($exit->slaying eq "/!") {
2372 #TODO: this should de-fi-ni-te-ly not be a sync-job
2373 # the problem is that $exit might not survive long enough
2374 # so it needs to be done right now, right here
2375 cf::sync_job { prepare_random_map $exit };
2376 }
2377
2378 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2379 my $hp = $exit->stats->hp;
2380 my $sp = $exit->stats->sp;
2381
2382 $self->enter_link; 2680 $self->enter_link;
2383 2681
2384 # if exit is damned, update players death & WoR home-position
2385 $self->contr->savebed ($slaying, $hp, $sp)
2386 if $exit->flag (FLAG_DAMNED);
2387
2388 (async { 2682 (async {
2389 $self->deactivate_recursive; # just to be sure 2683 $Coro::current->{desc} = "enter_exit";
2684
2390 unless (eval { 2685 unless (eval {
2686 $self->deactivate_recursive; # just to be sure
2687
2688 # random map handling
2689 {
2690 my $guard = cf::lock_acquire "exit_prepare:$exit";
2691
2692 prepare_random_map $exit
2693 if $exit->slaying eq "/!";
2694 }
2695
2696 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2697 my $x = $exit->stats->hp;
2698 my $y = $exit->stats->sp;
2699
2391 $self->goto ($slaying, $hp, $sp); 2700 $self->goto ($map, $x, $y);
2392 2701
2702 # if exit is damned, update players death & WoR home-position
2703 $self->contr->savebed ($map, $x, $y)
2704 if $exit->flag (cf::FLAG_DAMNED);
2705
2393 1; 2706 1
2394 }) { 2707 }) {
2395 $self->message ("Something went wrong deep within the crossfire server. " 2708 $self->message ("Something went wrong deep within the deliantra server. "
2396 . "I'll try to bring you back to the map you were before. " 2709 . "I'll try to bring you back to the map you were before. "
2397 . "Please report this to the dungeon master!", 2710 . "Please report this to the dungeon master!",
2398 cf::NDI_UNIQUE | cf::NDI_RED); 2711 cf::NDI_UNIQUE | cf::NDI_RED);
2399 2712
2400 warn "ERROR in enter_exit: $@"; 2713 warn "ERROR in enter_exit: $@";
2419 2732
2420 utf8::encode $text; 2733 utf8::encode $text;
2421 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2734 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2422} 2735}
2423 2736
2424=item $client->send_msg ($color, $type, $msg, [extra...]) 2737=item $client->send_msg ($channel, $msg, $color, [extra...])
2425 2738
2426Send a drawinfo or msg packet to the client, formatting the msg for the 2739Send a drawinfo or msg packet to the client, formatting the msg for the
2427client if neccessary. C<$type> should be a string identifying the type of 2740client if neccessary. C<$type> should be a string identifying the type of
2428the message, with C<log> being the default. If C<$color> is negative, suppress 2741the message, with C<log> being the default. If C<$color> is negative, suppress
2429the message unless the client supports the msg packet. 2742the message unless the client supports the msg packet.
2430 2743
2431=cut 2744=cut
2432 2745
2746# non-persistent channels (usually the info channel)
2747our %CHANNEL = (
2748 "c/identify" => {
2749 id => "infobox",
2750 title => "Identify",
2751 reply => undef,
2752 tooltip => "Items recently identified",
2753 },
2754 "c/examine" => {
2755 id => "infobox",
2756 title => "Examine",
2757 reply => undef,
2758 tooltip => "Signs and other items you examined",
2759 },
2760 "c/book" => {
2761 id => "infobox",
2762 title => "Book",
2763 reply => undef,
2764 tooltip => "The contents of a note or book",
2765 },
2766 "c/lookat" => {
2767 id => "infobox",
2768 title => "Look",
2769 reply => undef,
2770 tooltip => "What you saw there",
2771 },
2772 "c/who" => {
2773 id => "infobox",
2774 title => "Players",
2775 reply => undef,
2776 tooltip => "Shows players who are currently online",
2777 },
2778 "c/body" => {
2779 id => "infobox",
2780 title => "Body Parts",
2781 reply => undef,
2782 tooltip => "Shows which body parts you posess and are available",
2783 },
2784 "c/statistics" => {
2785 id => "infobox",
2786 title => "Statistics",
2787 reply => undef,
2788 tooltip => "Shows your primary statistics",
2789 },
2790 "c/skills" => {
2791 id => "infobox",
2792 title => "Skills",
2793 reply => undef,
2794 tooltip => "Shows your experience per skill and item power",
2795 },
2796 "c/shopitems" => {
2797 id => "infobox",
2798 title => "Shop Items",
2799 reply => undef,
2800 tooltip => "Shows the items currently for sale in this shop",
2801 },
2802 "c/resistances" => {
2803 id => "infobox",
2804 title => "Resistances",
2805 reply => undef,
2806 tooltip => "Shows your resistances",
2807 },
2808 "c/pets" => {
2809 id => "infobox",
2810 title => "Pets",
2811 reply => undef,
2812 tooltip => "Shows information abotu your pets/a specific pet",
2813 },
2814 "c/perceiveself" => {
2815 id => "infobox",
2816 title => "Perceive Self",
2817 reply => undef,
2818 tooltip => "You gained detailed knowledge about yourself",
2819 },
2820 "c/uptime" => {
2821 id => "infobox",
2822 title => "Uptime",
2823 reply => undef,
2824 tooltip => "How long the server has been running since last restart",
2825 },
2826 "c/mapinfo" => {
2827 id => "infobox",
2828 title => "Map Info",
2829 reply => undef,
2830 tooltip => "Information related to the maps",
2831 },
2832 "c/party" => {
2833 id => "party",
2834 title => "Party",
2835 reply => "gsay ",
2836 tooltip => "Messages and chat related to your party",
2837 },
2838 "c/death" => {
2839 id => "death",
2840 title => "Death",
2841 reply => undef,
2842 tooltip => "Reason for and more info about your most recent death",
2843 },
2844 "c/say" => $SAY_CHANNEL,
2845 "c/chat" => $CHAT_CHANNEL,
2846);
2847
2433sub cf::client::send_msg { 2848sub cf::client::send_msg {
2434 my ($self, $color, $type, $msg, @extra) = @_; 2849 my ($self, $channel, $msg, $color, @extra) = @_;
2435 2850
2436 $msg = $self->pl->expand_cfpod ($msg); 2851 $msg = $self->pl->expand_cfpod ($msg)
2852 unless $color & cf::NDI_VERBATIM;
2853
2854 $color &= cf::NDI_CLIENT_MASK; # just in case...
2855
2856 # check predefined channels, for the benefit of C
2857 if ($CHANNEL{$channel}) {
2858 $channel = $CHANNEL{$channel};
2859
2860 $self->ext_msg (channel_info => $channel);
2861 $channel = $channel->{id};
2862
2863 } elsif (ref $channel) {
2864 # send meta info to client, if not yet sent
2865 unless (exists $self->{channel}{$channel->{id}}) {
2866 $self->{channel}{$channel->{id}} = $channel;
2867 $self->ext_msg (channel_info => $channel);
2868 }
2869
2870 $channel = $channel->{id};
2871 }
2437 2872
2438 return unless @extra || length $msg; 2873 return unless @extra || length $msg;
2439 2874
2440 if ($self->can_msg) { 2875 # default colour, mask it out
2441 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2876 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2442 } else { 2877 if $color & cf::NDI_DEF;
2443 # replace some tags by gcfclient-compatible ones
2444 for ($msg) {
2445 1 while
2446 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451 }
2452 2878
2453 if ($color >= 0) { 2879 my $pkt = "msg "
2454 if (0 && $msg =~ /\[/) { 2880 . $self->{json_coder}->encode (
2455 $self->send_packet ("drawextinfo $color 4 0 $msg") 2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2456 } else { 2882 );
2457 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2458 $self->send_packet ("drawinfo $color $msg")
2459 }
2460 }
2461 }
2462}
2463 2883
2884 # try lzf for large packets
2885 $pkt = "lzf " . Compress::LZF::compress $pkt
2886 if 1024 <= length $pkt and $self->{can_lzf};
2887
2888 # split very large packets
2889 if (8192 < length $pkt and $self->{can_lzf}) {
2890 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2891 $pkt = "frag";
2892 }
2893
2894 $self->send_packet ($pkt);
2895}
2896
2464=item $client->ext_event ($type, %msg) 2897=item $client->ext_msg ($type, @msg)
2465 2898
2466Sends an ext event to the client. 2899Sends an ext event to the client.
2467 2900
2468=cut 2901=cut
2469 2902
2470sub cf::client::ext_event($$%) { 2903sub cf::client::ext_msg($$@) {
2471 my ($self, $type, %msg) = @_; 2904 my ($self, $type, @msg) = @_;
2472 2905
2473 return unless $self->extcmd; 2906 if ($self->extcmd == 2) {
2474 2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove
2475 $msg{msgtype} = "event_$type"; 2909 push @msg, msgtype => "event_$type";
2476 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 }
2912}
2913
2914=item $client->ext_reply ($msgid, @msg)
2915
2916Sends an ext reply to the client.
2917
2918=cut
2919
2920sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_;
2922
2923 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 }
2477} 2930}
2478 2931
2479=item $success = $client->query ($flags, "text", \&cb) 2932=item $success = $client->query ($flags, "text", \&cb)
2480 2933
2481Queues a query to the client, calling the given callback with 2934Queues a query to the client, calling the given callback with
2536 my ($ns, $buf) = @_; 2989 my ($ns, $buf) = @_;
2537 2990
2538 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2991 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539 2992
2540 if (ref $msg) { 2993 if (ref $msg) {
2994 my ($type, $reply, @payload) =
2995 "ARRAY" eq ref $msg
2996 ? @$msg
2997 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2998
2999 my @reply;
3000
2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3001 if (my $cb = $EXTICMD{$type}) {
2542 if (my %reply = $cb->($ns, $msg)) { 3002 @reply = $cb->($ns, @payload);
2543 $reply{msgid} = $msg->{msgid};
2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545 }
2546 } 3003 }
3004
3005 $ns->ext_reply ($reply, @reply)
3006 if $reply;
3007
2547 } else { 3008 } else {
2548 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3009 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2549 } 3010 }
2550 3011
2551 cf::override; 3012 cf::override;
2598our $safe = new Safe "safe"; 3059our $safe = new Safe "safe";
2599our $safe_hole = new Safe::Hole; 3060our $safe_hole = new Safe::Hole;
2600 3061
2601$SIG{FPE} = 'IGNORE'; 3062$SIG{FPE} = 'IGNORE';
2602 3063
2603$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3064$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math
3066 grepstart grepwhile mapstart mapwhile
3067 sort time
3068));
2604 3069
2605# here we export the classes and methods available to script code 3070# here we export the classes and methods available to script code
2606 3071
2607=pod 3072=pod
2608 3073
2609The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
2610 3075
2611 cf::object 3076 cf::object
2612 contr pay_amount pay_player map x y force_find force_add 3077 contr pay_amount pay_player map x y force_find force_add destroy
2613 insert remove 3078 insert remove name archname title slaying race decrease split
3079 value
2614 3080
2615 cf::object::player 3081 cf::object::player
2616 player 3082 player
2617 3083
2618 cf::player 3084 cf::player
2623 3089
2624=cut 3090=cut
2625 3091
2626for ( 3092for (
2627 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3093 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2628 insert remove)], 3094 insert remove inv nrof name archname title slaying race
3095 decrease split destroy change_exp value msg lore send_msg)],
2629 ["cf::object::player" => qw(player)], 3096 ["cf::object::player" => qw(player)],
2630 ["cf::player" => qw(peaceful)], 3097 ["cf::player" => qw(peaceful send_msg)],
2631 ["cf::map" => qw(trigger)], 3098 ["cf::map" => qw(trigger)],
2632) { 3099) {
2633 no strict 'refs'; 3100 no strict 'refs';
2634 my ($pkg, @funs) = @$_; 3101 my ($pkg, @funs) = @$_;
2635 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3102 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2652 my ($code, %vars) = @_; 3119 my ($code, %vars) = @_;
2653 3120
2654 my $qcode = $code; 3121 my $qcode = $code;
2655 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2656 $qcode =~ s/\n/\\n/g; 3123 $qcode =~ s/\n/\\n/g;
3124
3125 %vars = (_dummy => 0) unless %vars;
2657 3126
2658 local $_; 3127 local $_;
2659 local @safe::cf::_safe_eval_args = values %vars; 3128 local @safe::cf::_safe_eval_args = values %vars;
2660 3129
2661 my $eval = 3130 my $eval =
2709# the server's init and main functions 3178# the server's init and main functions
2710 3179
2711sub load_facedata($) { 3180sub load_facedata($) {
2712 my ($path) = @_; 3181 my ($path) = @_;
2713 3182
3183 # HACK to clear player env face cache, we need some signal framework
3184 # for this (global event?)
3185 %ext::player_env::MUSIC_FACE_CACHE = ();
3186
3187 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3188
2714 warn "loading facedata from $path\n"; 3189 warn "loading facedata from $path\n";
2715 3190
2716 my $facedata; 3191 my $facedata;
2717 0 < aio_load $path, $facedata 3192 0 < aio_load $path, $facedata
2718 or die "$path: $!"; 3193 or die "$path: $!";
2720 $facedata = Coro::Storable::thaw $facedata; 3195 $facedata = Coro::Storable::thaw $facedata;
2721 3196
2722 $facedata->{version} == 2 3197 $facedata->{version} == 2
2723 or cf::cleanup "$path: version mismatch, cannot proceed."; 3198 or cf::cleanup "$path: version mismatch, cannot proceed.";
2724 3199
3200 # patch in the exptable
3201 $facedata->{resource}{"res/exp_table"} = {
3202 type => FT_RSRC,
3203 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3204 };
3205 cf::cede_to_tick;
3206
2725 { 3207 {
2726 my $faces = $facedata->{faceinfo}; 3208 my $faces = $facedata->{faceinfo};
2727 3209
2728 while (my ($face, $info) = each %$faces) { 3210 while (my ($face, $info) = each %$faces) {
2729 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3211 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212
2730 cf::face::set_visibility $idx, $info->{visibility}; 3213 cf::face::set_visibility $idx, $info->{visibility};
2731 cf::face::set_magicmap $idx, $info->{magicmap}; 3214 cf::face::set_magicmap $idx, $info->{magicmap};
2732 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2733 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2734 3217
2735 cf::cede_to_tick; 3218 cf::cede_to_tick;
2736 } 3219 }
2737 3220
2738 while (my ($face, $info) = each %$faces) { 3221 while (my ($face, $info) = each %$faces) {
2739 next unless $info->{smooth}; 3222 next unless $info->{smooth};
3223
2740 my $idx = cf::face::find $face 3224 my $idx = cf::face::find $face
2741 or next; 3225 or next;
3226
2742 if (my $smooth = cf::face::find $info->{smooth}) { 3227 if (my $smooth = cf::face::find $info->{smooth}) {
2743 cf::face::set_smooth $idx, $smooth; 3228 cf::face::set_smooth $idx, $smooth;
2744 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2745 } else { 3230 } else {
2746 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3231 warn "smooth face '$info->{smooth}' not found for face '$face'";
2763 3248
2764 { 3249 {
2765 # TODO: for gcfclient pleasure, we should give resources 3250 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index. 3251 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource}; 3252 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical;
2769 3253
2770 while (my ($name, $info) = each %$res) { 3254 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({ 3255 if (defined $info->{type}) {
2772 name => $name,
2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO#
2775 });
2776
2777 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3256 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
2778 3258
2779 if ($name =~ /\.jpg$/) { 3259 if ($info->{type} & 1) {
2780 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3260 # prepend meta info
2781 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type};
2782 } else { 3274 } else {
2783 my $data = pack "(w/a*)*", $meta, $info->{data}; 3275 $RESOURCE{$name} = $info;
2784 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2785
2786 cf::face::set_type $idx, 1;
2787 cf::face::set_data $idx, 0, $data, $chk;
2788 } 3276 }
2789 3277
2790 cf::cede_to_tick; 3278 cf::cede_to_tick;
2791 } 3279 }
2792 } 3280 }
2793 3281
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3283
2794 1 3284 1
2795} 3285}
2796 3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3306
3307register_exticmd fx_want => sub {
3308 my ($ns, $want) = @_;
3309
3310 while (my ($k, $v) = each %$want) {
3311 $ns->fx_want ($k, $v);
3312 }
3313};
3314
3315sub load_resource_file($) {
3316 my $guard = lock_acquire "load_resource_file";
3317
3318 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100;
3320 cf::arch::commit_load;
3321
3322 $status
3323}
3324
2797sub reload_regions { 3325sub reload_regions {
3326 # HACK to clear player env face cache, we need some signal framework
3327 # for this (global event?)
3328 %ext::player_env::MUSIC_FACE_CACHE = ();
3329
2798 load_resource_file "$MAPDIR/regions" 3330 load_resource_file "$MAPDIR/regions"
2799 or die "unable to load regions file\n"; 3331 or die "unable to load regions file\n";
2800 3332
2801 for (cf::region::list) { 3333 for (cf::region::list) {
2802 $_->{match} = qr/$_->{match}/ 3334 $_->{match} = qr/$_->{match}/
2810} 3342}
2811 3343
2812sub reload_archetypes { 3344sub reload_archetypes {
2813 load_resource_file "$DATADIR/archetypes" 3345 load_resource_file "$DATADIR/archetypes"
2814 or die "unable to load archetypes\n"; 3346 or die "unable to load archetypes\n";
2815 #d# NEED to laod twice to resolve forward references
2816 # this really needs to be done in an extra post-pass
2817 # (which needs to be synchronous, so solve it differently)
2818 load_resource_file "$DATADIR/archetypes"
2819 or die "unable to load archetypes\n";
2820} 3347}
2821 3348
2822sub reload_treasures { 3349sub reload_treasures {
2823 load_resource_file "$DATADIR/treasures" 3350 load_resource_file "$DATADIR/treasures"
2824 or die "unable to load treasurelists\n"; 3351 or die "unable to load treasurelists\n";
2825} 3352}
2826 3353
2827sub reload_resources { 3354sub reload_resources {
2828 warn "reloading resource files...\n"; 3355 warn "reloading resource files...\n";
2829 3356
3357 reload_facedata;
3358 reload_archetypes;
2830 reload_regions; 3359 reload_regions;
2831 reload_facedata;
2832 #reload_archetypes;#d#
2833 reload_archetypes;
2834 reload_treasures; 3360 reload_treasures;
2835 3361
2836 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
2837} 3363}
2838 3364
2839sub init { 3365sub reload_config {
2840 reload_resources;
2841}
2842
2843sub cfg_load {
2844 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
2845 or return; 3367 or return;
2846 3368
2847 local $/; 3369 local $/;
2848 *CFG = YAML::Syck::Load <$fh>; 3370 *CFG = YAML::Load <$fh>;
2849 3371
2850 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2851 3373
2852 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2853 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2859 }; 3381 };
2860 warn $@ if $@; 3382 warn $@ if $@;
2861 } 3383 }
2862} 3384}
2863 3385
3386sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!";
3389 flock $fh, &Fcntl::LOCK_EX
3390 or die "$PIDFILE: flock: $!";
3391 $fh
3392}
3393
3394# make sure only one server instance is running at any one time
3395sub atomic {
3396 my $fh = pidfile;
3397
3398 my $pid = <$fh>;
3399 kill 9, $pid if $pid > 0;
3400
3401 seek $fh, 0, 0;
3402 print $fh $$;
3403}
3404
2864sub main { 3405sub main {
3406 cf::init_globals; # initialise logging
3407
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419
2865 # we must not ever block the main coroutine 3420 # we must not ever block the main coroutine
2866 local $Coro::idle = sub { 3421 local $Coro::idle = sub {
2867 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3422 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2868 (async { 3423 (async {
2869 Event::one_event; 3424 $Coro::current->{desc} = "IDLE BUG HANDLER";
3425 EV::loop EV::LOOP_ONESHOT;
2870 })->prio (Coro::PRIO_MAX); 3426 })->prio (Coro::PRIO_MAX);
2871 }; 3427 };
2872 3428
2873 cfg_load; 3429 evthread_start IO::AIO::poll_fileno;
3430
3431 cf::sync_job {
3432 reload_resources;
3433 reload_config;
2874 db_init; 3434 db_init;
3435
3436 cf::load_settings;
3437 cf::load_materials;
3438 cf::init_uuid;
3439 cf::init_signals;
3440 cf::init_commands;
3441 cf::init_skills;
3442
3443 cf::init_beforeplay;
3444
3445 atomic;
3446
2875 load_extensions; 3447 load_extensions;
2876 3448
2877 $TICK_WATCHER->start; 3449 utime time, time, $RUNTIMEFILE;
3450
3451 # no (long-running) fork's whatsoever before this point(!)
3452 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3453
3454 (pop @POST_INIT)->(0) while @POST_INIT;
3455 };
3456
2878 Event::loop; 3457 EV::loop;
2879} 3458}
2880 3459
2881############################################################################# 3460#############################################################################
2882# initialisation and cleanup 3461# initialisation and cleanup
2883 3462
2884# install some emergency cleanup handlers 3463# install some emergency cleanup handlers
2885BEGIN { 3464BEGIN {
3465 our %SIGWATCHER = ();
2886 for my $signal (qw(INT HUP TERM)) { 3466 for my $signal (qw(INT HUP TERM)) {
2887 Event->signal ( 3467 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2888 reentrant => 0,
2889 data => WF_AUTOCANCEL,
2890 signal => $signal,
2891 prio => 0,
2892 cb => sub {
2893 cf::cleanup "SIG$signal"; 3468 cf::cleanup "SIG$signal";
2894 },
2895 ); 3469 };
2896 } 3470 }
2897} 3471}
2898 3472
2899sub write_runtime { 3473sub write_runtime_sync {
2900 my $runtime = "$LOCALDIR/runtime";
2901
2902 # first touch the runtime file to show we are still running: 3474 # first touch the runtime file to show we are still running:
2903 # the fsync below can take a very very long time. 3475 # the fsync below can take a very very long time.
2904 3476
2905 IO::AIO::aio_utime $runtime, undef, undef; 3477 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2906 3478
2907 my $guard = cf::lock_acquire "write_runtime"; 3479 my $guard = cf::lock_acquire "write_runtime";
2908 3480
2909 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3481 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2910 or return; 3482 or return;
2911 3483
2912 my $value = $cf::RUNTIME + 90 + 10; 3484 my $value = $cf::RUNTIME + 90 + 10;
2913 # 10 is the runtime save interval, for a monotonic clock 3485 # 10 is the runtime save interval, for a monotonic clock
2914 # 60 allows for the watchdog to kill the server. 3486 # 60 allows for the watchdog to kill the server.
2924 aio_utime $fh, undef, undef; 3496 aio_utime $fh, undef, undef;
2925 3497
2926 close $fh 3498 close $fh
2927 or return; 3499 or return;
2928 3500
2929 aio_rename "$runtime~", $runtime 3501 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2930 and return; 3502 and return;
2931 3503
2932 warn "runtime file written.\n"; 3504 warn "runtime file written.\n";
2933 3505
2934 1 3506 1
3507}
3508
3509our $uuid_lock;
3510our $uuid_skip;
3511
3512sub write_uuid_sync($) {
3513 $uuid_skip ||= $_[0];
3514
3515 return if $uuid_lock;
3516 local $uuid_lock = 1;
3517
3518 my $uuid = "$LOCALDIR/uuid";
3519
3520 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3521 or return;
3522
3523 my $value = uuid_seq uuid_cur;
3524
3525 unless ($value) {
3526 warn "cowardly refusing to write zero uuid value!\n";
3527 return;
3528 }
3529
3530 my $value = uuid_str $value + $uuid_skip;
3531 $uuid_skip = 0;
3532
3533 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3534 and return;
3535
3536 # always fsync - this file is important
3537 aio_fsync $fh
3538 and return;
3539
3540 close $fh
3541 or return;
3542
3543 aio_rename "$uuid~", $uuid
3544 and return;
3545
3546 warn "uuid file written ($value).\n";
3547
3548 1
3549
3550}
3551
3552sub write_uuid($$) {
3553 my ($skip, $sync) = @_;
3554
3555 $sync ? write_uuid_sync $skip
3556 : async { write_uuid_sync $skip };
2935} 3557}
2936 3558
2937sub emergency_save() { 3559sub emergency_save() {
2938 my $freeze_guard = cf::freeze_mainloop; 3560 my $freeze_guard = cf::freeze_mainloop;
2939 3561
2940 warn "enter emergency perl save\n"; 3562 warn "emergency_perl_save: enter\n";
2941 3563
2942 cf::sync_job { 3564 cf::sync_job {
3565 # this is a trade-off: we want to be very quick here, so
3566 # save all maps without fsync, and later call a global sync
3567 # (which in turn might be very very slow)
3568 local $USE_FSYNC = 0;
3569
2943 # use a peculiar iteration method to avoid tripping on perl 3570 # use a peculiar iteration method to avoid tripping on perl
2944 # refcount bugs in for. also avoids problems with players 3571 # refcount bugs in for. also avoids problems with players
2945 # and maps saved/destroyed asynchronously. 3572 # and maps saved/destroyed asynchronously.
2946 warn "begin emergency player save\n"; 3573 warn "emergency_perl_save: begin player save\n";
2947 for my $login (keys %cf::PLAYER) { 3574 for my $login (keys %cf::PLAYER) {
2948 my $pl = $cf::PLAYER{$login} or next; 3575 my $pl = $cf::PLAYER{$login} or next;
2949 $pl->valid or next; 3576 $pl->valid or next;
3577 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2950 $pl->save; 3578 $pl->save;
2951 } 3579 }
2952 warn "end emergency player save\n"; 3580 warn "emergency_perl_save: end player save\n";
2953 3581
2954 warn "begin emergency map save\n"; 3582 warn "emergency_perl_save: begin map save\n";
2955 for my $path (keys %cf::MAP) { 3583 for my $path (keys %cf::MAP) {
2956 my $map = $cf::MAP{$path} or next; 3584 my $map = $cf::MAP{$path} or next;
2957 $map->valid or next; 3585 $map->valid or next;
2958 $map->save; 3586 $map->save;
2959 } 3587 }
2960 warn "end emergency map save\n"; 3588 warn "emergency_perl_save: end map save\n";
2961 3589
2962 warn "begin emergency database checkpoint\n"; 3590 warn "emergency_perl_save: begin database checkpoint\n";
2963 BDB::db_env_txn_checkpoint $DB_ENV; 3591 BDB::db_env_txn_checkpoint $DB_ENV;
2964 warn "end emergency database checkpoint\n"; 3592 warn "emergency_perl_save: end database checkpoint\n";
3593
3594 warn "emergency_perl_save: begin write uuid\n";
3595 write_uuid_sync 1;
3596 warn "emergency_perl_save: end write uuid\n";
2965 }; 3597 };
2966 3598
3599 warn "emergency_perl_save: starting sync()\n";
3600 IO::AIO::aio_sync sub {
3601 warn "emergency_perl_save: finished sync()\n";
3602 };
3603
2967 warn "leave emergency perl save\n"; 3604 warn "emergency_perl_save: leave\n";
2968} 3605}
2969 3606
2970sub post_cleanup { 3607sub post_cleanup {
2971 my ($make_core) = @_; 3608 my ($make_core) = @_;
2972 3609
2973 warn Carp::longmess "post_cleanup backtrace" 3610 warn Carp::longmess "post_cleanup backtrace"
2974 if $make_core; 3611 if $make_core;
3612
3613 my $fh = pidfile;
3614 unlink $PIDFILE if <$fh> == $$;
3615}
3616
3617# a safer delete_package, copied from Symbol
3618sub clear_package($) {
3619 my $pkg = shift;
3620
3621 # expand to full symbol table name if needed
3622 unless ($pkg =~ /^main::.*::$/) {
3623 $pkg = "main$pkg" if $pkg =~ /^::/;
3624 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3625 $pkg .= '::' unless $pkg =~ /::$/;
3626 }
3627
3628 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3629 my $stem_symtab = *{$stem}{HASH};
3630
3631 defined $stem_symtab and exists $stem_symtab->{$leaf}
3632 or return;
3633
3634 # clear all symbols
3635 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3636 for my $name (keys %$leaf_symtab) {
3637 _gv_clear *{"$pkg$name"};
3638# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3639 }
3640 warn "cleared package $pkg\n";#d#
2975} 3641}
2976 3642
2977sub do_reload_perl() { 3643sub do_reload_perl() {
2978 # can/must only be called in main 3644 # can/must only be called in main
2979 if ($Coro::current != $Coro::main) { 3645 if ($Coro::current != $Coro::main) {
2980 warn "can only reload from main coroutine"; 3646 warn "can only reload from main coroutine";
2981 return; 3647 return;
2982 } 3648 }
2983 3649
3650 return if $RELOAD++;
3651
3652 my $t1 = EV::time;
3653
3654 while ($RELOAD) {
2984 warn "reloading..."; 3655 warn "reloading...";
2985 3656
2986 warn "entering sync_job"; 3657 warn "entering sync_job";
2987 3658
2988 cf::sync_job { 3659 cf::sync_job {
2989 cf::write_runtime; # external watchdog should not bark 3660 cf::write_runtime_sync; # external watchdog should not bark
2990 cf::emergency_save; 3661 cf::emergency_save;
2991 cf::write_runtime; # external watchdog should not bark 3662 cf::write_runtime_sync; # external watchdog should not bark
2992 3663
2993 warn "syncing database to disk"; 3664 warn "syncing database to disk";
2994 BDB::db_env_txn_checkpoint $DB_ENV; 3665 BDB::db_env_txn_checkpoint $DB_ENV;
2995 3666
2996 # if anything goes wrong in here, we should simply crash as we already saved 3667 # if anything goes wrong in here, we should simply crash as we already saved
2997 3668
2998 warn "cancelling all WF_AUTOCANCEL watchers";
2999 for (Event::all_watchers) {
3000 $_->cancel if $_->data & WF_AUTOCANCEL;
3001 }
3002
3003 warn "flushing outstanding aio requests"; 3669 warn "flushing outstanding aio requests";
3004 for (;;) {
3005 BDB::flush;
3006 IO::AIO::flush;
3007 Coro::cede;
3008 last unless IO::AIO::nreqs || BDB::nreqs; 3670 while (IO::AIO::nreqs || BDB::nreqs) {
3009 warn "iterate..."; 3671 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3010 }
3011
3012 ++$RELOAD;
3013
3014 warn "cancelling all extension coros";
3015 $_->cancel for values %EXT_CORO;
3016 %EXT_CORO = ();
3017
3018 warn "removing commands";
3019 %COMMAND = ();
3020
3021 warn "removing ext/exti commands";
3022 %EXTCMD = ();
3023 %EXTICMD = ();
3024
3025 warn "unloading/nuking all extensions";
3026 for my $pkg (@EXTS) {
3027 warn "... unloading $pkg";
3028
3029 if (my $cb = $pkg->can ("unload")) {
3030 eval {
3031 $cb->($pkg);
3032 1
3033 } or warn "$pkg unloaded, but with errors: $@";
3034 } 3672 }
3035 3673
3036 warn "... nuking $pkg"; 3674 warn "cancelling all extension coros";
3037 Symbol::delete_package $pkg; 3675 $_->cancel for values %EXT_CORO;
3038 } 3676 %EXT_CORO = ();
3039 3677
3040 warn "unloading all perl modules loaded from $LIBDIR"; 3678 warn "removing commands";
3041 while (my ($k, $v) = each %INC) { 3679 %COMMAND = ();
3042 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3043 3680
3681 warn "removing ext/exti commands";
3682 %EXTCMD = ();
3683 %EXTICMD = ();
3684
3685 warn "unloading/nuking all extensions";
3686 for my $pkg (@EXTS) {
3044 warn "... unloading $k"; 3687 warn "... unloading $pkg";
3045 delete $INC{$k};
3046 3688
3047 $k =~ s/\.pm$//;
3048 $k =~ s/\//::/g;
3049
3050 if (my $cb = $k->can ("unload_module")) { 3689 if (my $cb = $pkg->can ("unload")) {
3690 eval {
3051 $cb->(); 3691 $cb->($pkg);
3692 1
3693 } or warn "$pkg unloaded, but with errors: $@";
3694 }
3695
3696 warn "... clearing $pkg";
3697 clear_package $pkg;
3052 } 3698 }
3053 3699
3054 Symbol::delete_package $k; 3700 warn "unloading all perl modules loaded from $LIBDIR";
3701 while (my ($k, $v) = each %INC) {
3702 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3703
3704 warn "... unloading $k";
3705 delete $INC{$k};
3706
3707 $k =~ s/\.pm$//;
3708 $k =~ s/\//::/g;
3709
3710 if (my $cb = $k->can ("unload_module")) {
3711 $cb->();
3712 }
3713
3714 clear_package $k;
3055 } 3715 }
3056 3716
3057 warn "getting rid of safe::, as good as possible"; 3717 warn "getting rid of safe::, as good as possible";
3058 Symbol::delete_package "safe::$_" 3718 clear_package "safe::$_"
3059 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3719 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3060 3720
3061 warn "unloading cf.pm \"a bit\""; 3721 warn "unloading cf.pm \"a bit\"";
3062 delete $INC{"cf.pm"}; 3722 delete $INC{"cf.pm"};
3063 delete $INC{"cf/pod.pm"}; 3723 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3064 3724
3065 # don't, removes xs symbols, too, 3725 # don't, removes xs symbols, too,
3066 # and global variables created in xs 3726 # and global variables created in xs
3067 #Symbol::delete_package __PACKAGE__; 3727 #clear_package __PACKAGE__;
3068 3728
3069 warn "unload completed, starting to reload now"; 3729 warn "unload completed, starting to reload now";
3070 3730
3071 warn "reloading cf.pm"; 3731 warn "reloading cf.pm";
3072 require cf; 3732 require cf;
3073 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3733 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3074 3734
3075 warn "loading config and database again"; 3735 warn "loading config and database again";
3076 cf::cfg_load; 3736 cf::reload_config;
3077 3737
3078 warn "loading extensions"; 3738 warn "loading extensions";
3079 cf::load_extensions; 3739 cf::load_extensions;
3080 3740
3741 if ($REATTACH_ON_RELOAD) {
3081 warn "reattaching attachments to objects/players"; 3742 warn "reattaching attachments to objects/players";
3082 _global_reattach; # objects, sockets 3743 _global_reattach; # objects, sockets
3083 warn "reattaching attachments to maps"; 3744 warn "reattaching attachments to maps";
3084 reattach $_ for values %MAP; 3745 reattach $_ for values %MAP;
3085 warn "reattaching attachments to players"; 3746 warn "reattaching attachments to players";
3086 reattach $_ for values %PLAYER; 3747 reattach $_ for values %PLAYER;
3748 }
3087 3749
3750 warn "running post_init jobs";
3751 (pop @POST_INIT)->(1) while @POST_INIT;
3752
3088 warn "leaving sync_job"; 3753 warn "leaving sync_job";
3089 3754
3090 1 3755 1
3091 } or do { 3756 } or do {
3092 warn $@; 3757 warn $@;
3093 warn "error while reloading, exiting."; 3758 cf::cleanup "error while reloading, exiting.";
3094 exit 1;
3095 }; 3759 };
3096 3760
3097 warn "reloaded"; 3761 warn "reloaded";
3762 --$RELOAD;
3763 }
3764
3765 $t1 = EV::time - $t1;
3766 warn "reload completed in ${t1}s\n";
3098}; 3767};
3099 3768
3100our $RELOAD_WATCHER; # used only during reload 3769our $RELOAD_WATCHER; # used only during reload
3101 3770
3102sub reload_perl() { 3771sub reload_perl() {
3103 # doing reload synchronously and two reloads happen back-to-back, 3772 # doing reload synchronously and two reloads happen back-to-back,
3104 # coro crashes during coro_state_free->destroy here. 3773 # coro crashes during coro_state_free->destroy here.
3105 3774
3106 $RELOAD_WATCHER ||= Event->timer ( 3775 $RELOAD_WATCHER ||= cf::async {
3107 reentrant => 0, 3776 Coro::AIO::aio_wait cache_extensions;
3108 after => 0, 3777
3109 data => WF_AUTOCANCEL, 3778 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3110 cb => sub {
3111 do_reload_perl; 3779 do_reload_perl;
3112 undef $RELOAD_WATCHER; 3780 undef $RELOAD_WATCHER;
3113 }, 3781 };
3114 ); 3782 };
3115} 3783}
3116 3784
3117register_command "reload" => sub { 3785register_command "reload" => sub {
3118 my ($who, $arg) = @_; 3786 my ($who, $arg) = @_;
3119 3787
3120 if ($who->flag (FLAG_WIZ)) { 3788 if ($who->flag (FLAG_WIZ)) {
3121 $who->message ("reloading server."); 3789 $who->message ("reloading server.");
3790 async {
3791 $Coro::current->{desc} = "perl_reload";
3122 async { reload_perl }; 3792 reload_perl;
3793 };
3123 } 3794 }
3124}; 3795};
3125 3796
3126unshift @INC, $LIBDIR; 3797unshift @INC, $LIBDIR;
3127 3798
3129 3800
3130our @WAIT_FOR_TICK; 3801our @WAIT_FOR_TICK;
3131our @WAIT_FOR_TICK_BEGIN; 3802our @WAIT_FOR_TICK_BEGIN;
3132 3803
3133sub wait_for_tick { 3804sub wait_for_tick {
3134 return unless $TICK_WATCHER->is_active;
3135 return if $Coro::current == $Coro::main; 3805 return if tick_inhibit || $Coro::current == $Coro::main;
3136 3806
3137 my $signal = new Coro::Signal; 3807 my $signal = new Coro::Signal;
3138 push @WAIT_FOR_TICK, $signal; 3808 push @WAIT_FOR_TICK, $signal;
3139 $signal->wait; 3809 $signal->wait;
3140} 3810}
3141 3811
3142sub wait_for_tick_begin { 3812sub wait_for_tick_begin {
3143 return unless $TICK_WATCHER->is_active;
3144 return if $Coro::current == $Coro::main; 3813 return if tick_inhibit || $Coro::current == $Coro::main;
3145 3814
3146 my $signal = new Coro::Signal; 3815 my $signal = new Coro::Signal;
3147 push @WAIT_FOR_TICK_BEGIN, $signal; 3816 push @WAIT_FOR_TICK_BEGIN, $signal;
3148 $signal->wait; 3817 $signal->wait;
3149} 3818}
3150 3819
3151 my $min = 1e6;#d# 3820sub tick {
3152 my $avg = 10;
3153$TICK_WATCHER = Event->timer (
3154 reentrant => 0,
3155 parked => 1,
3156 prio => 0,
3157 at => $NEXT_TICK || $TICK,
3158 data => WF_AUTOCANCEL,
3159 cb => sub {
3160 if ($Coro::current != $Coro::main) { 3821 if ($Coro::current != $Coro::main) {
3161 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3822 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3162 unless ++$bug_warning > 10; 3823 unless ++$bug_warning > 10;
3163 return; 3824 return;
3164 } 3825 }
3165 3826
3166 $NOW = $tick_start = Event::time;
3167
3168 cf::server_tick; # one server iteration 3827 cf::server_tick; # one server iteration
3169 3828
3170 0 && sync_job {#d# 3829 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3171 for(1..10) { 3830 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3172 my $t = Event::time; 3831 Coro::async_pool {
3173 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3832 $Coro::current->{desc} = "runtime saver";
3174 or die; 3833 write_runtime_sync
3175 3834 or warn "ERROR: unable to write runtime file: $!";
3176 $map->width (50);
3177 $map->height (50);
3178 $map->alloc;
3179 $map->_load_objects ("/tmp/x.map", 1);
3180 my $t = Event::time - $t;
3181
3182 #next unless $t < 0.0013;#d#
3183 if ($t < $min) {
3184 $min = $t;
3185 }
3186 $avg = $avg * 0.99 + $t * 0.01;
3187 }
3188 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3189 exit 0;
3190 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3191 }; 3835 };
3836 }
3192 3837
3193 $RUNTIME += $TICK;
3194 $NEXT_TICK += $TICK;
3195
3196 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3197 $NEXT_RUNTIME_WRITE = $NOW + 10;
3198 Coro::async_pool {
3199 write_runtime
3200 or warn "ERROR: unable to write runtime file: $!";
3201 };
3202 }
3203
3204# my $AFTER = Event::time;
3205# warn $AFTER - $NOW;#d#
3206
3207 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3838 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3208 $sig->send; 3839 $sig->send;
3209 } 3840 }
3210 while (my $sig = shift @WAIT_FOR_TICK) { 3841 while (my $sig = shift @WAIT_FOR_TICK) {
3211 $sig->send; 3842 $sig->send;
3212 } 3843 }
3213 3844
3214 $NOW = Event::time; 3845 $LOAD = ($NOW - $TICK_START) / $TICK;
3215
3216 # if we are delayed by four ticks or more, skip them all
3217 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3218
3219 $TICK_WATCHER->at ($NEXT_TICK);
3220 $TICK_WATCHER->start;
3221
3222 $LOAD = ($NOW - $tick_start) / $TICK;
3223 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3846 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3224 3847
3225 _post_tick; 3848 if (0) {
3226 3849 if ($NEXT_TICK) {
3227 3850 my $jitter = $TICK_START - $NEXT_TICK;
3851 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3852 warn "jitter $JITTER\n";#d#
3853 }
3228 }, 3854 }
3229); 3855}
3230 3856
3231{ 3857{
3232 BDB::max_poll_time $TICK * 0.1; 3858 # configure BDB
3233 $BDB_POLL_WATCHER = Event->io ( 3859
3234 reentrant => 0,
3235 fd => BDB::poll_fileno,
3236 poll => 'r',
3237 prio => 0,
3238 data => WF_AUTOCANCEL,
3239 cb => \&BDB::poll_cb,
3240 );
3241 BDB::min_parallel 8; 3860 BDB::min_parallel 8;
3242 3861 BDB::max_poll_reqs $TICK * 0.1;
3243 BDB::set_sync_prepare { 3862 $AnyEvent::BDB::WATCHER->priority (1);
3244 my $status;
3245 my $current = $Coro::current;
3246 (
3247 sub {
3248 $status = $!;
3249 $current->ready; undef $current;
3250 },
3251 sub {
3252 Coro::schedule while defined $current;
3253 $! = $status;
3254 },
3255 )
3256 };
3257 3863
3258 unless ($DB_ENV) { 3864 unless ($DB_ENV) {
3259 $DB_ENV = BDB::db_env_create; 3865 $DB_ENV = BDB::db_env_create;
3866 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3867 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3868 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3869 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3870 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3260 3871
3261 cf::sync_job { 3872 cf::sync_job {
3262 eval { 3873 eval {
3263 BDB::db_env_open 3874 BDB::db_env_open
3264 $DB_ENV, 3875 $DB_ENV,
3266 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3877 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3267 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3878 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3268 0666; 3879 0666;
3269 3880
3270 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3881 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3271
3272 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3273 $DB_ENV->set_lk_detect;
3274 }; 3882 };
3275 3883
3276 cf::cleanup "db_env_open(db): $@" if $@; 3884 cf::cleanup "db_env_open(db): $@" if $@;
3277 }; 3885 };
3278 } 3886 }
3887
3888 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3889 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3890 };
3891 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3892 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3893 };
3894 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3895 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3896 };
3279} 3897}
3280 3898
3281{ 3899{
3900 # configure IO::AIO
3901
3282 IO::AIO::min_parallel 8; 3902 IO::AIO::min_parallel 8;
3283
3284 undef $Coro::AIO::WATCHER;
3285 IO::AIO::max_poll_time $TICK * 0.1; 3903 IO::AIO::max_poll_time $TICK * 0.1;
3286 $AIO_POLL_WATCHER = Event->io ( 3904 undef $AnyEvent::AIO::WATCHER;
3287 reentrant => 0,
3288 data => WF_AUTOCANCEL,
3289 fd => IO::AIO::poll_fileno,
3290 poll => 'r',
3291 prio => 6,
3292 cb => \&IO::AIO::poll_cb,
3293 );
3294} 3905}
3295 3906
3296my $_log_backtrace; 3907my $_log_backtrace;
3297 3908
3298sub _log_backtrace { 3909sub _log_backtrace {
3301 $msg =~ s/\n//; 3912 $msg =~ s/\n//;
3302 3913
3303 # limit the # of concurrent backtraces 3914 # limit the # of concurrent backtraces
3304 if ($_log_backtrace < 2) { 3915 if ($_log_backtrace < 2) {
3305 ++$_log_backtrace; 3916 ++$_log_backtrace;
3917 my $perl_bt = Carp::longmess $msg;
3306 async { 3918 async {
3919 $Coro::current->{desc} = "abt $msg";
3920
3307 my @bt = fork_call { 3921 my @bt = fork_call {
3308 @addr = map { sprintf "%x", $_ } @addr; 3922 @addr = map { sprintf "%x", $_ } @addr;
3309 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3923 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3310 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3924 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3311 or die "addr2line: $!"; 3925 or die "addr2line: $!";
3319 } 3933 }
3320 3934
3321 @funcs 3935 @funcs
3322 }; 3936 };
3323 3937
3324 LOG llevInfo, "[ABT] $msg\n"; 3938 LOG llevInfo, "[ABT] $perl_bt\n";
3939 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3325 LOG llevInfo, "[ABT] $_\n" for @bt; 3940 LOG llevInfo, "[ABT] $_\n" for @bt;
3326 --$_log_backtrace; 3941 --$_log_backtrace;
3327 }; 3942 };
3328 } else { 3943 } else {
3329 LOG llevInfo, "[ABT] $msg\n"; 3944 LOG llevInfo, "[ABT] $msg\n";
3330 LOG llevInfo, "[ABT] [suppressed]\n"; 3945 LOG llevInfo, "[ABT] [suppressed]\n";
3331 } 3946 }
3332} 3947}
3333 3948
3334# load additional modules 3949# load additional modules
3335use cf::pod; 3950require "cf/$_.pm" for @EXTRA_MODULES;
3336 3951
3337END { cf::emergency_save } 3952END { cf::emergency_save }
3338 3953
33391 39541
3340 3955

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines