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.298 by root, Sun Jul 8 14:50:07 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;
62use Digest::MD5 ();
63
64AnyEvent::detect;
34 65
35# configure various modules to our taste 66# configure various modules to our taste
36# 67#
37$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
38Coro::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";
39Compress::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
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 76
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 78
50our %COMMAND = (); 79our %COMMAND = ();
51our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
… …
54our %EXTCMD = (); 83our %EXTCMD = ();
55our %EXTICMD = (); 84our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
58 87
59our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 89our @EVENT;
61 90
62our $CONFDIR = confdir; 91our $CONFDIR = confdir;
63our $DATADIR = datadir; 92our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
105our %RESOURCE;
73 106
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 109our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default on
81 111
112our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER;
82our $BDB_POLL_WATCHER; 114our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 115our $DB_ENV;
116
117our @EXTRA_MODULES = qw(pod mapscript);
84 118
85our %CFG; 119our %CFG;
86 120
87our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 122our $RUNTIME;
123our $NOW;
89 124
90our %PLAYER; # all users 125our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 126our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 127our $LINK_MAP; # the special {link} map, which is always available
93 128
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 130our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 131
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
134our $JITTER; # average jitter
99our $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)
100 140
101binmode STDOUT; 141binmode STDOUT;
102binmode STDERR; 142binmode STDERR;
103 143
104# read virtual server time, if available 144# read virtual server time, if available
105unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
106 open my $fh, "<", "$LOCALDIR/runtime" 146 open my $fh, "<", $RUNTIMEFILE
107 or die "unable to read runtime file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
108 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
109} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
110 152
111mkdir $_ 153mkdir $_
112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
113 155
114our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
… …
157 199
158The raw value load value from the last tick. 200The raw value load value from the last tick.
159 201
160=item %cf::CFG 202=item %cf::CFG
161 203
162Configuration for the server, loaded from C</etc/crossfire/config>, or 204Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 205from wherever your confdir points to.
164 206
165=item cf::wait_for_tick, cf::wait_for_tick_begin 207=item cf::wait_for_tick, cf::wait_for_tick_begin
166 208
167These 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
168returns 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
169per 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.
170 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
171=back 219=back
172 220
173=cut 221=cut
174 222
175BEGIN { 223BEGIN {
… …
179 $msg .= "\n" 227 $msg .= "\n"
180 unless $msg =~ /\n$/; 228 unless $msg =~ /\n$/;
181 229
182 $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;
183 231
184 utf8::encode $msg;
185 LOG llevError, $msg; 232 LOG llevError, $msg;
186 }; 233 };
187} 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#?
188 250
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
199for my $pkg (qw( 261for my $pkg (qw(
200 cf::global cf::attachable 262 cf::global cf::attachable
201 cf::object cf::object::player 263 cf::object cf::object::player
202 cf::client cf::player 264 cf::client cf::player
203 cf::arch cf::living 265 cf::arch cf::living
266 cf::map cf::mapspace
204 cf::map cf::party cf::region 267 cf::party cf::region
205)) { 268)) {
206 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 270}
209 271
210$Event::DIED = sub { 272$EV::DIED = sub {
211 warn "error in event callback: @_"; 273 warn "error in event callback: @_";
212}; 274};
213 275
214############################################################################# 276#############################################################################
215 277
… …
238 $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;
239 $d 301 $d
240 } || "[unable to dump $_[0]: '$@']"; 302 } || "[unable to dump $_[0]: '$@']";
241} 303}
242 304
243=item $ref = cf::from_json $json 305=item $ref = cf::decode_json $json
244 306
245Converts a JSON string into the corresponding perl data structure. 307Converts a JSON string into the corresponding perl data structure.
246 308
247=item $json = cf::to_json $ref 309=item $json = cf::encode_json $ref
248 310
249Converts a perl data structure into its JSON representation. 311Converts a perl data structure into its JSON representation.
250 312
251=cut 313=cut
252 314
253our $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
254 316
255sub to_json ($) { $json_coder->encode ($_[0]) } 317sub encode_json($) { $json_coder->encode ($_[0]) }
256sub 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}
257 333
258=item cf::lock_wait $string 334=item cf::lock_wait $string
259 335
260Wait until the given lock is available. See cf::lock_acquire. 336Wait until the given lock is available. See cf::lock_acquire.
261 337
262=item my $lock = cf::lock_acquire $string 338=item my $lock = cf::lock_acquire $string
263 339
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 342for example when the coroutine gets canceled), the lock is automatically
267returned. 343returned.
268 344
345Locks are *not* recursive, locking from the same coro twice results in a
346deadlocked coro.
347
269Lock 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
270uses map_find and cf::map::load uses map_load). 349uses map_find and cf::map::load uses map_load).
271 350
272=item $locked = cf::lock_active $string 351=item $locked = cf::lock_active $string
273 352
274Return 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.
275 354
276=cut 355=cut
277 356
278our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
279 358
280sub lock_wait($) { 359sub lock_wait($) {
281 my ($key) = @_; 360 $LOCKS->wait ($_[0]);
282
283 # wait for lock, if any
284 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule;
287 }
288} 361}
289 362
290sub lock_acquire($) { 363sub lock_acquire($) {
291 my ($key) = @_; 364 $LOCKS->guard ($_[0])
292
293 # wait, to be sure we are not locked
294 lock_wait $key;
295
296 $LOCK{$key} = [];
297
298 Coro::guard {
299 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} };
301 }
302} 365}
303 366
304sub lock_active($) { 367sub lock_active($) {
305 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
306
307 ! ! $LOCK{$key}
308} 369}
309 370
310sub freeze_mainloop { 371sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 372 tick_inhibit_inc;
312 373
313 my $guard = Coro::guard { 374 &Guard::guard (\&tick_inhibit_dec);
314 $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 }
315 }; 435 }
316 $TICK_WATCHER->stop; 436};
317 $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;
318} 450}
319 451
320=item cf::async { BLOCK } 452=item cf::async { BLOCK }
321 453
322Currently the same as Coro::async_pool, meaning you cannot use 454Currently the same as Coro::async_pool, meaning you cannot use
… …
327 459
328BEGIN { *async = \&Coro::async_pool } 460BEGIN { *async = \&Coro::async_pool }
329 461
330=item cf::sync_job { BLOCK } 462=item cf::sync_job { BLOCK }
331 463
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 464The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 465is always able to handle events or runnable, as Deliantra is only
334partly 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
335acceptable. 467acceptable.
336 468
337If 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
338the given BLOCK in another coroutine while waiting for the result. The 470the given BLOCK in another coroutine while waiting for the result. The
… …
343 475
344sub sync_job(&) { 476sub sync_job(&) {
345 my ($job) = @_; 477 my ($job) = @_;
346 478
347 if ($Coro::current == $Coro::main) { 479 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 480 my $time = EV::time;
349 481
350 # this is the main coro, too bad, we have to block 482 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 483 # till the operation succeeds, freezing the server :/
352 484
353 # TODO: use suspend/resume instead 485 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 486
355 my $freeze_guard = freeze_mainloop; 487 my $freeze_guard = freeze_mainloop;
356 488
357 my $busy = 1; 489 my $busy = 1;
358 my @res; 490 my @res;
359 491
360 (async { 492 (async {
493 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 494 @res = eval { $job->() };
362 warn $@ if $@; 495 warn $@ if $@;
363 undef $busy; 496 undef $busy;
364 })->prio (Coro::PRIO_MAX); 497 })->prio (Coro::PRIO_MAX);
365 498
366 while ($busy) { 499 while ($busy) {
367 Coro::cede or Event::one_event; 500 if (Coro::nready) {
501 Coro::cede_notself;
502 } else {
503 EV::loop EV::LOOP_ONESHOT;
368 } 504 }
505 }
369 506
370 $time = Event::time - $time; 507 my $time = EV::time - $time;
371 508
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 509 $TICK_START += $time; # do not account sync jobs to server load
376 510
377 wantarray ? @res : $res[0] 511 wantarray ? @res : $res[0]
378 } else { 512 } else {
379 # we are in another coroutine, how wonderful, everything just works 513 # we are in another coroutine, how wonderful, everything just works
380 514
… …
405=item fork_call { }, $args 539=item fork_call { }, $args
406 540
407Executes the given code block with the given arguments in a seperate 541Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 542process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 543Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 544never block itself or use any form of event handling.
411 545
412=cut 546=cut
413 547
414sub fork_call(&@) { 548sub fork_call(&@) {
415 my ($cb, @args) = @_; 549 my ($cb, @args) = @_;
416 550
417# 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,
418# or die "socketpair: $!"; 552 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 553 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 554
422 if (my $pid = fork) { 555 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 Carp::confess $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 556 reset_signals;
436 local $SIG{__WARN__}; 557 &$cb
437 local $SIG{__DIE__}; 558 }, @args;
438 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
440 eval {
441 close $fh1;
442 559
443 my @res = eval { $cb->(@args) }; 560 wantarray ? @res : $res[-1]
561}
444 562
445 open my $fh, ">", \my $buf 563=item $coin = coin_from_name $name
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449 564
450 warn "writing ", length $buf; 565=cut
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
455 };
456 566
457 warn $@ if $@; 567our %coin_alias = (
458 _exit 0; 568 "silver" => "silvercoin",
459 } 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
460} 588}
461 589
462=item $value = cf::db_get $family => $key 590=item $value = cf::db_get $family => $key
463 591
464Returns a single value from the environment database. 592Returns a single value from the environment database.
… …
466=item cf::db_put $family => $key => $value 594=item cf::db_put $family => $key => $value
467 595
468Stores 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
469data 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).
470 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
471=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}
472 622
473our $DB; 623our $DB;
474 624
475sub db_init { 625sub db_init {
476 unless ($DB) {
477 $DB = BDB::db_create $DB_ENV;
478
479 cf::sync_job { 626 cf::sync_job {
480 eval { 627 $DB ||= db_table "db";
481 $DB->set_flags (BDB::CHKSUM);
482
483 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
484 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
485 cf::cleanup "db_open(db): $!" if $!;
486 };
487 cf::cleanup "db_open(db): $@" if $@;
488 };
489 } 628 };
490} 629}
491 630
492sub db_get($$) { 631sub db_get($$) {
493 my $key = "$_[0]/$_[1]"; 632 my $key = "$_[0]/$_[1]";
494 633
… …
544 if (1) { 683 if (1) {
545 $md5 = 684 $md5 =
546 join "\x00", 685 join "\x00",
547 $processversion, 686 $processversion,
548 map { 687 map {
549 Coro::cede; 688 cf::cede_to_tick;
550 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 689 ($src->[$_], Digest::MD5::md5_hex $data[$_])
551 } 0.. $#$src; 690 } 0.. $#$src;
552 691
553 692
554 my $dbmd5 = db_get cache => "$id/md5"; 693 my $dbmd5 = db_get cache => "$id/md5";
… …
592 731
593############################################################################# 732#############################################################################
594 733
595=head2 ATTACHABLE OBJECTS 734=head2 ATTACHABLE OBJECTS
596 735
597Many 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
598attach callbacks/event handlers (a collection of which is called an "attachment") 737attach callbacks/event handlers (a collection of which is called an "attachment")
599to it. All such attachable objects support the following methods. 738to it. All such attachable objects support the following methods.
600 739
601In 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>
602C<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
603Crossfire TRT). 742Deliantra).
604 743
605=over 4 744=over 4
606 745
607=item $attachable->attach ($attachment, key => $value...) 746=item $attachable->attach ($attachment, key => $value...)
608 747
… …
652=item cf::CLASS::attachment $name, ... 791=item cf::CLASS::attachment $name, ...
653 792
654Register an attachment by C<$name> through which attachable objects of the 793Register an attachment by C<$name> through which attachable objects of the
655given CLASS can refer to this attachment. 794given CLASS can refer to this attachment.
656 795
657Some classes such as crossfire maps and objects can specify attachments 796Some classes such as deliantra maps and objects can specify attachments
658that 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.
659 798
660These calls expect any number of the following handler/hook descriptions: 799These calls expect any number of the following handler/hook descriptions:
661 800
662=over 4 801=over 4
… …
860 "; 999 ";
861 die if $@; 1000 die if $@;
862} 1001}
863 1002
864our $override; 1003our $override;
865our @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?
866 1005
867sub override { 1006sub override {
868 $override = 1; 1007 $override = 1;
869 @invoke_results = (); 1008 @INVOKE_RESULTS = (@_);
870} 1009}
871 1010
872sub do_invoke { 1011sub do_invoke {
873 my $event = shift; 1012 my $event = shift;
874 my $callbacks = shift; 1013 my $callbacks = shift;
875 1014
876 @invoke_results = (); 1015 @INVOKE_RESULTS = ();
877 1016
878 local $override; 1017 local $override;
879 1018
880 for (@$callbacks) { 1019 for (@$callbacks) {
881 eval { &{$_->[1]} }; 1020 eval { &{$_->[1]} };
… …
890 } 1029 }
891 1030
892 0 1031 0
893} 1032}
894 1033
895=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1034=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
896 1035
897=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1036=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
898 1037
899Generate an object-specific event with the given arguments. 1038Generate an object-specific event with the given arguments.
900 1039
901This 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
902removed 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
903results (if you must, access C<@cf::invoke_results> directly). 1042results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 1043
905=back 1044=back
906 1045
907=cut 1046=cut
908 1047
909############################################################################# 1048#############################################################################
910# 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}
911 1092
912sub reattach { 1093sub reattach {
913 # basically do the same as instantiate, without calling instantiate 1094 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 1095 my ($obj) = @_;
915 1096
1097 # no longer needed after getting rid of delete_package?
916 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
917 1099
918 my $registry = $obj->registry; 1100 my $registry = $obj->registry;
919 1101
920 @$registry = (); 1102 @$registry = ();
921 1103
… …
936cf::attachable->attach ( 1118cf::attachable->attach (
937 prio => -1000000, 1119 prio => -1000000,
938 on_instantiate => sub { 1120 on_instantiate => sub {
939 my ($obj, $data) = @_; 1121 my ($obj, $data) = @_;
940 1122
941 $data = from_json $data; 1123 $data = decode_json $data;
942 1124
943 for (@$data) { 1125 for (@$data) {
944 my ($name, $args) = @$_; 1126 my ($name, $args) = @$_;
945 1127
946 $obj->attach ($name, %{$args || {} }); 1128 $obj->attach ($name, %{$args || {} });
… …
962sub object_freezer_save { 1144sub object_freezer_save {
963 my ($filename, $rdata, $objs) = @_; 1145 my ($filename, $rdata, $objs) = @_;
964 1146
965 sync_job { 1147 sync_job {
966 if (length $$rdata) { 1148 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename);
967 warn sprintf "saving %s (%d,%d)\n", 1150 warn sprintf "saving %s (%d,%d)\n",
968 $filename, length $$rdata, scalar @$objs; 1151 $decname, length $$rdata, scalar @$objs;
969 1152
970 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
971 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
972 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
973 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 }
974 close $fh; 1160 aio_close $fh;
975 1161
976 if (@$objs) { 1162 if (@$objs) {
977 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) {
978 chmod SAVE_MODE, $fh; 1164 aio_chmod $fh, SAVE_MODE;
979 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
980 aio_write $fh, 0, (length $data), $data, 0; 1166 aio_write $fh, 0, (length $data), $data, 0;
981 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 }
982 close $fh; 1171 aio_close $fh;
983 aio_rename "$filename.pst~", "$filename.pst"; 1172 aio_rename "$filename.pst~", "$filename.pst";
984 } 1173 }
985 } else { 1174 } else {
986 aio_unlink "$filename.pst"; 1175 aio_unlink "$filename.pst";
987 } 1176 }
988 1177
989 aio_rename "$filename~", $filename; 1178 aio_rename "$filename~", $filename;
1179
1180 $filename =~ s%/[^/]+$%%;
1181 aio_pathsync $filename if $cf::USE_FSYNC;
990 } else { 1182 } else {
991 warn "FATAL: $filename~: $!\n"; 1183 warn "unable to save objects: $filename~: $!\n";
992 } 1184 }
993 } else { 1185 } else {
994 aio_unlink $filename; 1186 aio_unlink $filename;
995 aio_unlink "$filename.pst"; 1187 aio_unlink "$filename.pst";
996 } 1188 }
997 } 1189 };
998} 1190}
999 1191
1000sub object_freezer_as_string { 1192sub object_freezer_as_string {
1001 my ($rdata, $objs) = @_; 1193 my ($rdata, $objs) = @_;
1002 1194
… …
1014 or return; 1206 or return;
1015 1207
1016 unless (aio_stat "$filename.pst") { 1208 unless (aio_stat "$filename.pst") {
1017 (aio_load "$filename.pst", $av) >= 0 1209 (aio_load "$filename.pst", $av) >= 0
1018 or return; 1210 or return;
1211
1019 $av = eval { (Storable::thaw $av)->{objs} }; 1212 my $st = eval { Coro::Storable::thaw $av };
1213 $av = $st->{objs};
1020 } 1214 }
1021 1215
1216 utf8::decode (my $decname = $filename);
1022 warn sprintf "loading %s (%d)\n", 1217 warn sprintf "loading %s (%d,%d)\n",
1023 $filename, length $data, scalar @{$av || []}; 1218 $decname, length $data, scalar @{$av || []};
1219
1024 return ($data, $av); 1220 ($data, $av)
1025} 1221}
1026 1222
1027=head2 COMMAND CALLBACKS 1223=head2 COMMAND CALLBACKS
1028 1224
1029=over 4 1225=over 4
… …
1083 my ($name, $cb) = @_; 1279 my ($name, $cb) = @_;
1084 1280
1085 $EXTICMD{$name} = $cb; 1281 $EXTICMD{$name} = $cb;
1086} 1282}
1087 1283
1284use File::Glob ();
1285
1088cf::player->attach ( 1286cf::player->attach (
1089 on_command => sub { 1287 on_command => sub {
1090 my ($pl, $name, $params) = @_; 1288 my ($pl, $name, $params) = @_;
1091 1289
1092 my $cb = $COMMAND{$name} 1290 my $cb = $COMMAND{$name}
… …
1102 my ($pl, $buf) = @_; 1300 my ($pl, $buf) = @_;
1103 1301
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1302 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1303
1106 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
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1312 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1313 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1314 }
1315
1316 $pl->ext_reply ($reply, @reply)
1317 if $reply;
1318
1112 } else { 1319 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1320 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1321 }
1115 1322
1116 cf::override; 1323 cf::override;
1117 }, 1324 },
1118); 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}
1119 1339
1120sub load_extensions { 1340sub load_extensions {
1121 cf::sync_job { 1341 cf::sync_job {
1122 my %todo; 1342 my %todo;
1123 1343
… …
1143 1363
1144 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1364 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1145 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1365 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1146 1366
1147 $ext{source} = 1367 $ext{source} =
1148 "package $pkg; use strict; use utf8;\n" 1368 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1149 . "#line 1 \"$path\"\n{\n" 1369 . "#line 1 \"$path\"\n{\n"
1150 . $source 1370 . $source
1151 . "\n};\n1"; 1371 . "\n};\n1";
1152 1372
1153 $todo{$base} = \%ext; 1373 $todo{$base} = \%ext;
… …
1169 my $msg = $@ ? "$v->{path}: $@\n" 1389 my $msg = $@ ? "$v->{path}: $@\n"
1170 : "$v->{base}: extension inactive.\n"; 1390 : "$v->{base}: extension inactive.\n";
1171 1391
1172 if (exists $v->{meta}{mandatory}) { 1392 if (exists $v->{meta}{mandatory}) {
1173 warn $msg; 1393 warn $msg;
1174 warn "mandatory extension failed to load, exiting.\n"; 1394 cf::cleanup "mandatory extension failed to load, exiting.";
1175 exit 1;
1176 } 1395 }
1177 1396
1178 warn $msg; 1397 warn $msg;
1179 } 1398 }
1180 1399
… …
1194 1413
1195=back 1414=back
1196 1415
1197=head2 CORE EXTENSIONS 1416=head2 CORE EXTENSIONS
1198 1417
1199Functions and methods that extend core crossfire objects. 1418Functions and methods that extend core deliantra objects.
1200 1419
1201=cut 1420=cut
1202 1421
1203package cf::player; 1422package cf::player;
1204 1423
1205use Coro::AIO; 1424use Coro::AIO;
1206 1425
1207=head3 cf::player 1426=head3 cf::player
1208 1427
1209=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}
1210 1443
1211=item cf::player::find $login 1444=item cf::player::find $login
1212 1445
1213Returns the given player object, loading it if necessary (might block). 1446Returns the given player object, loading it if necessary (might block).
1214 1447
… …
1233 1466
1234sub exists($) { 1467sub exists($) {
1235 my ($login) = @_; 1468 my ($login) = @_;
1236 1469
1237 $cf::PLAYER{$login} 1470 $cf::PLAYER{$login}
1238 or cf::sync_job { !aio_stat path $login } 1471 or !aio_stat path $login
1239} 1472}
1240 1473
1241sub find($) { 1474sub find($) {
1242 return $cf::PLAYER{$_[0]} || do { 1475 return $cf::PLAYER{$_[0]} || do {
1243 my $login = $_[0]; 1476 my $login = $_[0];
… …
1250 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1483 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1484 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1485 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253 aio_unlink +(playerdir $login) . "/$login.pl"; 1486 aio_unlink +(playerdir $login) . "/$login.pl";
1254 1487
1255 my $pl = load_pl path $login 1488 my $f = new_from_file cf::object::thawer path $login
1256 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;
1257 $cf::PLAYER{$login} = $pl 1496 $cf::PLAYER{$login} = $pl
1258 } 1497 }
1259 } 1498 }
1260} 1499}
1261 1500
… …
1270 return if $pl->{deny_save}; 1509 return if $pl->{deny_save};
1271 1510
1272 aio_mkdir playerdir $pl, 0770; 1511 aio_mkdir playerdir $pl, 0770;
1273 $pl->{last_save} = $cf::RUNTIME; 1512 $pl->{last_save} = $cf::RUNTIME;
1274 1513
1514 cf::get_slot 0.01;
1515
1275 $pl->save_pl ($path); 1516 $pl->save_pl ($path);
1276 Coro::cede; 1517 cf::cede_to_tick;
1277} 1518}
1278 1519
1279sub new($) { 1520sub new($) {
1280 my ($login) = @_; 1521 my ($login) = @_;
1281 1522
… …
1287 $cf::PLAYER{$login} = $self; 1528 $cf::PLAYER{$login} = $self;
1288 1529
1289 $self 1530 $self
1290} 1531}
1291 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
1292=item $pl->quit_character 1543=item $pl->quit_character
1293 1544
1294Nukes the player without looking back. If logged in, the connection will 1545Nukes the player without looking back. If logged in, the connection will
1295be destroyed. May block for a long time. 1546be destroyed. May block for a long time.
1296 1547
… …
1300 my ($pl) = @_; 1551 my ($pl) = @_;
1301 1552
1302 my $name = $pl->ob->name; 1553 my $name = $pl->ob->name;
1303 1554
1304 $pl->{deny_save} = 1; 1555 $pl->{deny_save} = 1;
1305 $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
1306 1557
1307 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1558 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1308 $pl->deactivate; 1559 $pl->deactivate;
1560 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1561 $pl->ob->check_score;
1309 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1562 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1310 $pl->ns->destroy if $pl->ns; 1563 $pl->ns->destroy if $pl->ns;
1311 1564
1312 my $path = playerdir $pl; 1565 my $path = playerdir $pl;
1313 my $temp = "$path~$cf::RUNTIME~deleting~"; 1566 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1349 or return []; 1602 or return [];
1350 1603
1351 my @logins; 1604 my @logins;
1352 1605
1353 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") {
1354 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1612 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355 aio_read $fh, 0, 512, my $buf, 0 or next; 1613 aio_read $fh, 0, 512, my $buf, 0 or next;
1356 $buf !~ /^password -------------$/m or next; # official not-valid tag 1614 $buf !~ /^password -------------$/m or next; # official not-valid tag
1615 }
1357 1616
1358 utf8::decode $login; 1617 utf8::decode $login;
1359 push @logins, $login; 1618 push @logins, $login;
1360 } 1619 }
1361 1620
… …
1388 } 1647 }
1389 1648
1390 \@paths 1649 \@paths
1391} 1650}
1392 1651
1393=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1652=item $protocol_xml = $player->expand_cfpod ($cfpod)
1394 1653
1395Expand crossfire pod fragments into protocol xml. 1654Expand deliantra pod fragments into protocol xml.
1396 1655
1397=cut
1398
1399sub expand_cfpod {
1400 ((my $self), (local $_)) = @_;
1401
1402 # escape & and <
1403 s/&/&amp;/g;
1404 s/(?<![BIUGH])</&lt;/g;
1405
1406 # this is buggy, it needs to properly take care of nested <'s
1407
1408 1 while
1409 # replace B<>, I<>, U<> etc.
1410 s/B<([^\>]*)>/<b>$1<\/b>/
1411 || s/I<([^\>]*)>/<i>$1<\/i>/
1412 || s/U<([^\>]*)>/<u>$1<\/u>/
1413 # replace G<male|female> tags
1414 || s{G<([^>|]*)\|([^>]*)>}{
1415 $self->gender ? $2 : $1
1416 }ge
1417 # replace H<hint text>
1418 || s{H<([^\>]*)>}
1419 {
1420 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1421 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1422 "")
1423 [$self->{hintmode}]
1424 }ge;
1425
1426 # create single paragraphs (very hackish)
1427 s/(?<=\S)\n(?=\w)/ /g;
1428
1429 # compress some whitespace
1430 s/\s+\n/\n/g; # ws line-ends
1431 s/\n\n+/\n/g; # double lines
1432 s/^\n+//; # beginning lines
1433 s/\n+$//; # ending lines
1434
1435 $_
1436}
1437
1438sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode}
1441}
1442
1443=item $player->ext_reply ($msgid, %msg) 1656=item $player->ext_reply ($msgid, @msg)
1444 1657
1445Sends an ext reply to the player. 1658Sends an ext reply to the player.
1446 1659
1447=cut 1660=cut
1448 1661
1449sub ext_reply($$%) { 1662sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1663 my ($self, $id, @msg) = @_;
1451 1664
1452 $msg{msgid} = $id; 1665 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1666}
1455 1667
1456=item $player->ext_event ($type, %msg) 1668=item $player->ext_msg ($type, @msg)
1457 1669
1458Sends an ext event to the client. 1670Sends an ext event to the client.
1459 1671
1460=cut 1672=cut
1461 1673
1462sub ext_event($$%) { 1674sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1675 my ($self, $type, @msg) = @_;
1464 1676
1465 $self->ns->ext_event ($type, %msg); 1677 $self->ns->ext_msg ($type, @msg);
1466} 1678}
1467 1679
1468=head3 cf::region 1680=head3 cf::region
1469 1681
1470=over 4 1682=over 4
… …
1483 my ($path) = @_; 1695 my ($path) = @_;
1484 1696
1485 my ($match, $specificity); 1697 my ($match, $specificity);
1486 1698
1487 for my $region (list) { 1699 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1700 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1701 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1702 if $region->specificity > $specificity;
1491 } 1703 }
1492 } 1704 }
1493 1705
… …
1514our $MAX_RESET = 3600; 1726our $MAX_RESET = 3600;
1515our $DEFAULT_RESET = 3000; 1727our $DEFAULT_RESET = 3000;
1516 1728
1517sub generate_random_map { 1729sub generate_random_map {
1518 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
1519 # mit "rum" bekleckern, nicht 1734 # mit "rum" bekleckern, nicht
1520 $self->_create_random_map ( 1735 $self->_create_random_map (
1521 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1736 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1522 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1737 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1523 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1738 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1613 $self->init; # pass $1 etc. 1828 $self->init; # pass $1 etc.
1614 return $self; 1829 return $self;
1615 } 1830 }
1616 } 1831 }
1617 1832
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1833 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1834 ()
1620} 1835}
1621 1836
1622sub init { 1837sub init {
1623 my ($self) = @_; 1838 my ($self) = @_;
… …
1645 1860
1646# the temporary/swap location 1861# the temporary/swap location
1647sub save_path { 1862sub save_path {
1648 my ($self) = @_; 1863 my ($self) = @_;
1649 1864
1650 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1865 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1651 "$TMPDIR/$path.map" 1866 "$TMPDIR/$path.map"
1652} 1867}
1653 1868
1654# the unique path, undef == no special unique path 1869# the unique path, undef == no special unique path
1655sub uniq_path { 1870sub uniq_path {
1656 my ($self) = @_; 1871 my ($self) = @_;
1657 1872
1658 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1659 "$UNIQUEDIR/$path" 1874 "$UNIQUEDIR/$path"
1660}
1661
1662# and all this just because we cannot iterate over
1663# all maps in C++...
1664sub change_all_map_light {
1665 my ($change) = @_;
1666
1667 $_->change_map_light ($change)
1668 for grep $_->outdoor, values %cf::MAP;
1669} 1875}
1670 1876
1671sub decay_objects { 1877sub decay_objects {
1672 my ($self) = @_; 1878 my ($self) = @_;
1673 1879
… …
1686 1892
1687sub load_header_from($) { 1893sub load_header_from($) {
1688 my ($self, $path) = @_; 1894 my ($self, $path) = @_;
1689 1895
1690 utf8::encode $path; 1896 utf8::encode $path;
1691 #aio_open $path, O_RDONLY, 0 1897 my $f = new_from_file cf::object::thawer $path
1692 # or return;
1693
1694 $self->_load_header ($path)
1695 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;
1696 1905
1697 $self->{load_path} = $path; 1906 $self->{load_path} = $path;
1698 1907
1699 1 1908 1
1700} 1909}
… …
1754sub find { 1963sub find {
1755 my ($path, $origin) = @_; 1964 my ($path, $origin) = @_;
1756 1965
1757 $path = normalise $path, $origin && $origin->path; 1966 $path = normalise $path, $origin && $origin->path;
1758 1967
1968 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1759 cf::lock_wait "map_find:$path"; 1969 my $guard2 = cf::lock_acquire "map_find:$path";
1760 1970
1761 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
1762 my $guard = cf::lock_acquire "map_find:$path";
1763 my $map = new_from_path cf::map $path 1972 my $map = new_from_path cf::map $path
1764 or return; 1973 or return;
1765 1974
1766 $map->{last_save} = $cf::RUNTIME; 1975 $map->{last_save} = $cf::RUNTIME;
1767 1976
… …
1769 or return; 1978 or return;
1770 1979
1771 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1980 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772 # doing this can freeze the server in a sync job, obviously 1981 # doing this can freeze the server in a sync job, obviously
1773 #$cf::WAIT_FOR_TICK->wait; 1982 #$cf::WAIT_FOR_TICK->wait;
1983 undef $guard2;
1984 undef $guard1;
1774 $map->reset; 1985 $map->reset;
1775 undef $guard;
1776 return find $path; 1986 return find $path;
1777 } 1987 }
1778 1988
1779 $cf::MAP{$path} = $map 1989 $cf::MAP{$path} = $map
1780 } 1990 }
… …
1789 local $self->{deny_reset} = 1; # loading can take a long time 1999 local $self->{deny_reset} = 1; # loading can take a long time
1790 2000
1791 my $path = $self->{path}; 2001 my $path = $self->{path};
1792 2002
1793 { 2003 {
1794 my $guard = cf::lock_acquire "map_load:$path"; 2004 my $guard = cf::lock_acquire "map_data:$path";
1795 2005
2006 return unless $self->valid;
1796 return if $self->in_memory != cf::MAP_SWAPPED; 2007 return unless $self->in_memory == cf::MAP_SWAPPED;
1797 2008
1798 $self->in_memory (cf::MAP_LOADING); 2009 $self->in_memory (cf::MAP_LOADING);
1799 2010
1800 $self->alloc; 2011 $self->alloc;
1801 2012
1802 $self->pre_load; 2013 $self->pre_load;
1803 Coro::cede; 2014 cf::cede_to_tick;
1804 2015
2016 my $f = new_from_file cf::object::thawer $self->{load_path};
2017 $f->skip_block;
1805 $self->_load_objects ($self->{load_path}, 1) 2018 $self->_load_objects ($f)
1806 or return; 2019 or return;
1807 2020
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2021 $self->post_load_original
1809 if delete $self->{load_original}; 2022 if delete $self->{load_original};
1810 2023
1811 if (my $uniq = $self->uniq_path) { 2024 if (my $uniq = $self->uniq_path) {
1812 utf8::encode $uniq; 2025 utf8::encode $uniq;
1813 if (aio_open $uniq, O_RDONLY, 0) { 2026 unless (aio_stat $uniq) {
2027 if (my $f = new_from_file cf::object::thawer $uniq) {
1814 $self->clear_unique_items; 2028 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0); 2029 $self->_load_objects ($f);
2030 $f->resolve_delayed_derefs;
2031 }
1816 } 2032 }
1817 } 2033 }
1818 2034
1819 Coro::cede; 2035 $f->resolve_delayed_derefs;
2036
2037 cf::cede_to_tick;
1820 # now do the right thing for maps 2038 # now do the right thing for maps
1821 $self->link_multipart_objects; 2039 $self->link_multipart_objects;
1822 $self->difficulty ($self->estimate_difficulty) 2040 $self->difficulty ($self->estimate_difficulty)
1823 unless $self->difficulty; 2041 unless $self->difficulty;
1824 Coro::cede; 2042 cf::cede_to_tick;
1825 2043
1826 unless ($self->{deny_activate}) { 2044 unless ($self->{deny_activate}) {
1827 $self->decay_objects; 2045 $self->decay_objects;
1828 $self->fix_auto_apply; 2046 $self->fix_auto_apply;
1829 $self->update_buttons; 2047 $self->update_buttons;
1830 Coro::cede; 2048 cf::cede_to_tick;
1831 $self->set_darkness_map;
1832 Coro::cede;
1833 $self->activate; 2049 $self->activate;
1834 } 2050 }
1835 2051
2052 $self->{last_save} = $cf::RUNTIME;
2053 $self->last_access ($cf::RUNTIME);
2054
1836 $self->in_memory (cf::MAP_IN_MEMORY); 2055 $self->in_memory (cf::MAP_ACTIVE);
1837 } 2056 }
1838 2057
1839 $self->post_load; 2058 $self->post_load;
1840} 2059}
1841 2060
… …
1850 2069
1851 $self 2070 $self
1852} 2071}
1853 2072
1854# 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
1855sub load_diag { 2074sub load_neighbours {
1856 my ($map) = @_; 2075 my ($map) = @_;
1857 2076
1858 my @diag; # diagonal neighbours 2077 my @neigh; # diagonal neighbours
1859 2078
1860 for (0 .. 3) { 2079 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 2080 my $neigh = $map->tile_path ($_)
1862 or next; 2081 or next;
1863 $neigh = find $neigh, $map 2082 $neigh = find $neigh, $map
1864 or next; 2083 or next;
1865 $neigh->load; 2084 $neigh->load;
1866 2085
2086 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2087 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2088 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 2089 }
1870 2090
1871 for (@diag) { 2091 for (grep defined $_->[0], @neigh) {
2092 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 2093 my $neigh = find $path, $origin
1873 or next; 2094 or next;
1874 $neigh->load; 2095 $neigh->load;
1875 } 2096 }
1876} 2097}
1877 2098
… …
1882} 2103}
1883 2104
1884sub do_load_sync { 2105sub do_load_sync {
1885 my ($map) = @_; 2106 my ($map) = @_;
1886 2107
2108 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2109 if $Coro::current == $Coro::main;
2110
1887 cf::sync_job { $map->load }; 2111 cf::sync_job { $map->load };
1888} 2112}
1889 2113
1890our %MAP_PREFETCH; 2114our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 2115our $MAP_PREFETCHER = undef;
1892 2116
1893sub find_async { 2117sub find_async {
1894 my ($path, $origin) = @_; 2118 my ($path, $origin, $load) = @_;
1895 2119
1896 $path = normalise $path, $origin && $origin->{path}; 2120 $path = normalise $path, $origin && $origin->{path};
1897 2121
1898 if (my $map = $cf::MAP{$path}) { 2122 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2123 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1900 } 2124 }
1901 2125
1902 undef $MAP_PREFETCH{$path}; 2126 $MAP_PREFETCH{$path} |= $load;
2127
1903 $MAP_PREFETCHER ||= cf::async { 2128 $MAP_PREFETCHER ||= cf::async {
2129 $Coro::current->{desc} = "map prefetcher";
2130
1904 while (%MAP_PREFETCH) { 2131 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 2132 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 2133 if (my $map = find $k) {
1907 or next;
1908 $map->load; 2134 $map->load if $v;
2135 }
1909 2136
1910 delete $MAP_PREFETCH{$path}; 2137 delete $MAP_PREFETCH{$k};
1911 } 2138 }
1912 } 2139 }
1913 undef $MAP_PREFETCHER; 2140 undef $MAP_PREFETCHER;
1914 }; 2141 };
1915 $MAP_PREFETCHER->prio (6); 2142 $MAP_PREFETCHER->prio (6);
… …
1918} 2145}
1919 2146
1920sub save { 2147sub save {
1921 my ($self) = @_; 2148 my ($self) = @_;
1922 2149
1923 my $lock = cf::lock_acquire "map_data:" . $self->path; 2150 my $lock = cf::lock_acquire "map_data:$self->{path}";
1924 2151
1925 $self->{last_save} = $cf::RUNTIME; 2152 $self->{last_save} = $cf::RUNTIME;
1926 2153
1927 return unless $self->dirty; 2154 return unless $self->dirty;
1928 2155
… …
1934 return if $self->{deny_save}; 2161 return if $self->{deny_save};
1935 2162
1936 local $self->{last_access} = $self->last_access;#d# 2163 local $self->{last_access} = $self->last_access;#d#
1937 2164
1938 cf::async { 2165 cf::async {
2166 $Coro::current->{desc} = "map player save";
1939 $_->contr->save for $self->players; 2167 $_->contr->save for $self->players;
1940 }; 2168 };
2169
2170 cf::get_slot 0.02;
1941 2171
1942 if ($uniq) { 2172 if ($uniq) {
1943 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2173 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1944 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2174 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1945 } else { 2175 } else {
… …
1951 my ($self) = @_; 2181 my ($self) = @_;
1952 2182
1953 # save first because save cedes 2183 # save first because save cedes
1954 $self->save; 2184 $self->save;
1955 2185
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2186 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2187
1958 return if $self->players; 2188 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY; 2189 return if $self->in_memory != cf::MAP_ACTIVE;
1960 return if $self->{deny_save}; 2190 return if $self->{deny_save};
1961 2191
2192 $self->in_memory (cf::MAP_SWAPPED);
2193
2194 $self->deactivate;
2195 $_->clear_links_to ($self) for values %cf::MAP;
1962 $self->clear; 2196 $self->clear;
1963 $self->in_memory (cf::MAP_SWAPPED);
1964} 2197}
1965 2198
1966sub reset_at { 2199sub reset_at {
1967 my ($self) = @_; 2200 my ($self) = @_;
1968 2201
… …
2000 if $uniq; 2233 if $uniq;
2001 } 2234 }
2002 2235
2003 delete $cf::MAP{$self->path}; 2236 delete $cf::MAP{$self->path};
2004 2237
2238 $self->deactivate;
2239 $_->clear_links_to ($self) for values %cf::MAP;
2005 $self->clear; 2240 $self->clear;
2006
2007 $_->clear_links_to ($self) for values %cf::MAP;
2008 2241
2009 $self->unlink_save; 2242 $self->unlink_save;
2010 $self->destroy; 2243 $self->destroy;
2011} 2244}
2012 2245
2013my $nuke_counter = "aaaa"; 2246my $nuke_counter = "aaaa";
2014 2247
2015sub nuke { 2248sub nuke {
2016 my ($self) = @_; 2249 my ($self) = @_;
2017 2250
2251 {
2252 my $lock = cf::lock_acquire "map_data:$self->{path}";
2253
2018 delete $cf::MAP{$self->path}; 2254 delete $cf::MAP{$self->path};
2019 2255
2020 $self->unlink_save; 2256 $self->unlink_save;
2021 2257
2022 bless $self, "cf::map"; 2258 bless $self, "cf::map";
2023 delete $self->{deny_reset}; 2259 delete $self->{deny_reset};
2024 $self->{deny_save} = 1; 2260 $self->{deny_save} = 1;
2025 $self->reset_timeout (1); 2261 $self->reset_timeout (1);
2026 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2262 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027 2263
2028 $cf::MAP{$self->path} = $self; 2264 $cf::MAP{$self->path} = $self;
2265 }
2029 2266
2030 $self->reset; # polite request, might not happen 2267 $self->reset; # polite request, might not happen
2031} 2268}
2032 2269
2033=item $maps = cf::map::tmp_maps 2270=item $maps = cf::map::tmp_maps
… …
2075 2312
2076sub unique_maps() { 2313sub unique_maps() {
2077 [ 2314 [
2078 map { 2315 map {
2079 utf8::decode $_; 2316 utf8::decode $_;
2080 /\.map$/ 2317 s/\.map$//; # TODO future compatibility hack
2318 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2319 ? ()
2081 ? normalise $_ 2320 : normalise $_
2082 : ()
2083 } @{ aio_readdir $UNIQUEDIR or [] } 2321 } @{ aio_readdir $UNIQUEDIR or [] }
2084 ] 2322 ]
2085} 2323}
2086 2324
2087package cf;
2088
2089=back 2325=back
2090 2326
2091=head3 cf::object 2327=head3 cf::object
2092 2328
2093=cut 2329=cut
… …
2096 2332
2097=over 4 2333=over 4
2098 2334
2099=item $ob->inv_recursive 2335=item $ob->inv_recursive
2100 2336
2101Returns 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.
2102 2339
2103=cut 2340=cut
2104 2341
2105sub inv_recursive_; 2342sub inv_recursive_;
2106sub inv_recursive_ { 2343sub inv_recursive_ {
… …
2109 2346
2110sub inv_recursive { 2347sub inv_recursive {
2111 inv_recursive_ inv $_[0] 2348 inv_recursive_ inv $_[0]
2112} 2349}
2113 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
2114package cf; 2379package cf;
2115 2380
2116=back 2381=back
2117 2382
2118=head3 cf::object::player 2383=head3 cf::object::player
… …
2124Sends 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>
2125can 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
2126dialogue with the given NPC character. 2391dialogue with the given NPC character.
2127 2392
2128=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};
2129 2408
2130# rough implementation of a future "reply" method that works 2409# rough implementation of a future "reply" method that works
2131# with dialog boxes. 2410# with dialog boxes.
2132#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
2133sub cf::object::player::reply($$$;$) { 2412sub cf::object::player::reply($$$;$) {
… …
2140 2419
2141 } else { 2420 } else {
2142 my $pl = $self->contr; 2421 my $pl = $self->contr;
2143 2422
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2423 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2424 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2425 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2426
2153 } else { 2427 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2428 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2429 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2156 } 2430 }
2157 } 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 (@_);
2158} 2442}
2159 2443
2160=item $player_object->may ("access") 2444=item $player_object->may ("access")
2161 2445
2162Returns wether the given player is authorized to access resource "access" 2446Returns wether the given player is authorized to access resource "access"
… …
2175 2459
2176=item $player_object->enter_link 2460=item $player_object->enter_link
2177 2461
2178Freezes 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}>).
2179 2463
2180The 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.
2181I<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.
2182 2468
2183Will never block. 2469Will never block.
2184 2470
2185=item $player_object->leave_link ($map, $x, $y) 2471=item $player_object->leave_link ($map, $x, $y)
2186 2472
… …
2241 # use -1 or undef as default coordinates, not 0, 0 2527 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2528 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2529 if $x <=0 && $y <= 0;
2244 2530
2245 $map->load; 2531 $map->load;
2246 $map->load_diag; 2532 $map->load_neighbours;
2247 2533
2248 return unless $self->contr->active; 2534 return unless $self->contr->active;
2535 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2249 $self->activate_recursive; 2536 $self->activate_recursive;
2250 2537
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2538 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2539 $self->enter_map ($map, $x, $y);
2253} 2540}
2254 2541
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2542=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2543
2257Moves the player to the given map-path and coordinates by first freezing 2544Moves the player to the given map-path and coordinates by first freezing
2258her, loading and preparing them map, calling the provided $check callback 2545her, loading and preparing them map, calling the provided $check callback
2259that 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
2260the new (success) or old (failed) map position. 2547the new (success) or old (failed) map position. In either case, $done will
2548be called at the end of this process.
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 >>.
2261 2552
2262=cut 2553=cut
2263 2554
2264our $GOTOGEN; 2555our $GOTOGEN;
2265 2556
2266sub cf::object::player::goto { 2557sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2558 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2559
2269 # do generation counting so two concurrent goto's will be executed in-order 2560 # do generation counting so two concurrent goto's will be executed in-order
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2562
2272 $self->enter_link; 2563 $self->enter_link;
2273 2564
2274 (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
2275 my $map = eval { 2587 my $map = eval {
2276 my $map = cf::map::find $path; 2588 my $map = defined $path ? cf::map::find $path : undef;
2277 2589
2278 if ($map) { 2590 if ($map) {
2279 $map = $map->customise_for ($self); 2591 $map = $map->customise_for ($self);
2280 $map = $check->($map) if $check && $map; 2592 $map = $check->($map) if $check && $map;
2281 } else { 2593 } else {
2282 $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);
2283 } 2595 }
2284 2596
2285 $map 2597 $map
2286 }; 2598 };
2287 2599
… …
2292 2604
2293 if ($gen == $self->{_goto_generation}) { 2605 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2606 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2607 $self->leave_link ($map, $x, $y);
2296 } 2608 }
2609
2610 $done->() if $done;
2297 })->prio (1); 2611 })->prio (1);
2298} 2612}
2299 2613
2300=item $player_object->enter_exit ($exit_object) 2614=item $player_object->enter_exit ($exit_object)
2301 2615
… …
2321} 2635}
2322 2636
2323sub prepare_random_map { 2637sub prepare_random_map {
2324 my ($exit) = @_; 2638 my ($exit) = @_;
2325 2639
2326 my $guard = cf::lock_acquire "exit_prepare:$exit";
2327
2328 # all this does is basically replace the /! path by 2640 # all this does is basically replace the /! path by
2329 # a new random map path (?random/...) with a seed 2641 # a new random map path (?random/...) with a seed
2330 # that depends on the exit object 2642 # that depends on the exit object
2331 2643
2332 my $rmp = parse_random_map_params $exit->msg; 2644 my $rmp = parse_random_map_params $exit->msg;
… …
2334 if ($exit->map) { 2646 if ($exit->map) {
2335 $rmp->{region} = $exit->region->name; 2647 $rmp->{region} = $exit->region->name;
2336 $rmp->{origin_map} = $exit->map->path; 2648 $rmp->{origin_map} = $exit->map->path;
2337 $rmp->{origin_x} = $exit->x; 2649 $rmp->{origin_x} = $exit->x;
2338 $rmp->{origin_y} = $exit->y; 2650 $rmp->{origin_y} = $exit->y;
2651
2652 $exit->map->touch;
2339 } 2653 }
2340 2654
2341 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2342 2656
2343 my $data = cf::to_json $rmp; 2657 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2344 my $md5 = Digest::MD5::md5_hex $data; 2658 my $md5 = Digest::MD5::md5_hex $data;
2345 my $meta = "$RANDOMDIR/$md5.meta"; 2659 my $meta = "$RANDOMDIR/$md5.meta";
2346 2660
2347 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2348 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
2349 undef $fh; 2663 undef $fh;
2350 aio_rename "$meta~", $meta; 2664 aio_rename "$meta~", $meta;
2351 2665
2666 my $slaying = "?random/$md5";
2667
2668 if ($exit->valid) {
2352 $exit->slaying ("?random/$md5"); 2669 $exit->slaying ("?random/$md5");
2353 $exit->msg (undef); 2670 $exit->msg (undef);
2671 }
2354 } 2672 }
2355} 2673}
2356 2674
2357sub cf::object::player::enter_exit { 2675sub cf::object::player::enter_exit {
2358 my ($self, $exit) = @_; 2676 my ($self, $exit) = @_;
2359 2677
2360 return unless $self->type == cf::PLAYER; 2678 return unless $self->type == cf::PLAYER;
2361 2679
2362 if ($exit->slaying eq "/!") {
2363 #TODO: this should de-fi-ni-te-ly not be a sync-job
2364 # the problem is that $exit might not survive long enough
2365 # so it needs to be done right now, right here
2366 cf::sync_job { prepare_random_map $exit };
2367 }
2368
2369 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2370 my $hp = $exit->stats->hp;
2371 my $sp = $exit->stats->sp;
2372
2373 $self->enter_link; 2680 $self->enter_link;
2374 2681
2375 # if exit is damned, update players death & WoR home-position
2376 $self->contr->savebed ($slaying, $hp, $sp)
2377 if $exit->flag (FLAG_DAMNED);
2378
2379 (async { 2682 (async {
2380 $self->deactivate_recursive; # just to be sure 2683 $Coro::current->{desc} = "enter_exit";
2684
2381 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
2382 $self->goto ($slaying, $hp, $sp); 2700 $self->goto ($map, $x, $y);
2383 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
2384 1; 2706 1
2385 }) { 2707 }) {
2386 $self->message ("Something went wrong deep within the crossfire server. " 2708 $self->message ("Something went wrong deep within the deliantra server. "
2387 . "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. "
2388 . "Please report this to the dungeon master!", 2710 . "Please report this to the dungeon master!",
2389 cf::NDI_UNIQUE | cf::NDI_RED); 2711 cf::NDI_UNIQUE | cf::NDI_RED);
2390 2712
2391 warn "ERROR in enter_exit: $@"; 2713 warn "ERROR in enter_exit: $@";
… …
2410 2732
2411 utf8::encode $text; 2733 utf8::encode $text;
2412 $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);
2413} 2735}
2414 2736
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2737=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2738
2417Send 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
2418client 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
2419the 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
2420the message unless the client supports the msg packet. 2742the message unless the client supports the msg packet.
2421 2743
2422=cut 2744=cut
2423 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
2424sub cf::client::send_msg { 2848sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2849 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2850
2427 $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 }
2428 2872
2429 return unless @extra || length $msg; 2873 return unless @extra || length $msg;
2430 2874
2431 if ($self->can_msg) { 2875 # default colour, mask it out
2432 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2876 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2433 } else { 2877 if $color & cf::NDI_DEF;
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443 2878
2444 if ($color >= 0) { 2879 my $pkt = "msg "
2445 if (0 && $msg =~ /\[/) { 2880 . $self->{json_coder}->encode (
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2447 } else { 2882 );
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg")
2450 }
2451 }
2452 }
2453}
2454 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
2455=item $client->ext_event ($type, %msg) 2897=item $client->ext_msg ($type, @msg)
2456 2898
2457Sends an ext event to the client. 2899Sends an ext event to the client.
2458 2900
2459=cut 2901=cut
2460 2902
2461sub cf::client::ext_event($$%) { 2903sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2904 my ($self, $type, @msg) = @_;
2463 2905
2906 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2909 push @msg, msgtype => "event_$type";
2465 $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 }
2466} 2930}
2467 2931
2468=item $success = $client->query ($flags, "text", \&cb) 2932=item $success = $client->query ($flags, "text", \&cb)
2469 2933
2470Queues a query to the client, calling the given callback with 2934Queues a query to the client, calling the given callback with
… …
2525 my ($ns, $buf) = @_; 2989 my ($ns, $buf) = @_;
2526 2990
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2991 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 2992
2529 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
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3001 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 3002 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 3003 }
3004
3005 $ns->ext_reply ($reply, @reply)
3006 if $reply;
3007
2536 } else { 3008 } else {
2537 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";
2538 } 3010 }
2539 3011
2540 cf::override; 3012 cf::override;
… …
2587our $safe = new Safe "safe"; 3059our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 3060our $safe_hole = new Safe::Hole;
2589 3061
2590$SIG{FPE} = 'IGNORE'; 3062$SIG{FPE} = 'IGNORE';
2591 3063
2592$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));
2593 3069
2594# here we export the classes and methods available to script code 3070# here we export the classes and methods available to script code
2595 3071
2596=pod 3072=pod
2597 3073
2598The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
2599 3075
2600 cf::object 3076 cf::object
2601 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
2602 insert remove 3078 insert remove name archname title slaying race decrease split
3079 value
2603 3080
2604 cf::object::player 3081 cf::object::player
2605 player 3082 player
2606 3083
2607 cf::player 3084 cf::player
… …
2612 3089
2613=cut 3090=cut
2614 3091
2615for ( 3092for (
2616 ["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
2617 insert remove)], 3094 insert remove inv nrof name archname title slaying race
3095 decrease split destroy change_exp value msg lore send_msg)],
2618 ["cf::object::player" => qw(player)], 3096 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 3097 ["cf::player" => qw(peaceful send_msg)],
2620 ["cf::map" => qw(trigger)], 3098 ["cf::map" => qw(trigger)],
2621) { 3099) {
2622 no strict 'refs'; 3100 no strict 'refs';
2623 my ($pkg, @funs) = @$_; 3101 my ($pkg, @funs) = @$_;
2624 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3102 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2641 my ($code, %vars) = @_; 3119 my ($code, %vars) = @_;
2642 3120
2643 my $qcode = $code; 3121 my $qcode = $code;
2644 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2645 $qcode =~ s/\n/\\n/g; 3123 $qcode =~ s/\n/\\n/g;
3124
3125 %vars = (_dummy => 0) unless %vars;
2646 3126
2647 local $_; 3127 local $_;
2648 local @safe::cf::_safe_eval_args = values %vars; 3128 local @safe::cf::_safe_eval_args = values %vars;
2649 3129
2650 my $eval = 3130 my $eval =
… …
2698# the server's init and main functions 3178# the server's init and main functions
2699 3179
2700sub load_facedata($) { 3180sub load_facedata($) {
2701 my ($path) = @_; 3181 my ($path) = @_;
2702 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
2703 warn "loading facedata from $path\n"; 3189 warn "loading facedata from $path\n";
2704 3190
2705 my $facedata; 3191 my $facedata;
2706 0 < aio_load $path, $facedata 3192 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 3193 or die "$path: $!";
… …
2709 $facedata = Coro::Storable::thaw $facedata; 3195 $facedata = Coro::Storable::thaw $facedata;
2710 3196
2711 $facedata->{version} == 2 3197 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 3198 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 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
2714 { 3207 {
2715 my $faces = $facedata->{faceinfo}; 3208 my $faces = $facedata->{faceinfo};
2716 3209
2717 while (my ($face, $info) = each %$faces) { 3210 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3211 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3213 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 3217
3218 cf::cede_to_tick;
2723 } 3219 }
2724 3220
2725 while (my ($face, $info) = each %$faces) { 3221 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 3222 next unless $info->{smooth};
3223
2727 my $idx = cf::face::find $face 3224 my $idx = cf::face::find $face
2728 or next; 3225 or next;
3226
2729 if (my $smooth = cf::face::find $info->{smooth}) { 3227 if (my $smooth = cf::face::find $info->{smooth}) {
3228 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 3230 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3231 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 3232 }
2734 Coro::cede; 3233
3234 cf::cede_to_tick;
2735 } 3235 }
2736 } 3236 }
2737 3237
2738 { 3238 {
2739 my $anims = $facedata->{animinfo}; 3239 my $anims = $facedata->{animinfo};
2740 3240
2741 while (my ($anim, $info) = each %$anims) { 3241 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3242 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 3243 cf::cede_to_tick;
2744 } 3244 }
2745 3245
2746 cf::anim::invalidate_all; # d'oh 3246 cf::anim::invalidate_all; # d'oh
2747 } 3247 }
2748 3248
3249 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource};
3253
3254 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) {
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258
3259 if ($info->{type} & 1) {
3260 # prepend meta info
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};
3274 } else {
3275 $RESOURCE{$name} = $info;
3276 }
3277
3278 cf::cede_to_tick;
3279 }
3280 }
3281
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3283
2749 1 3284 1
2750} 3285}
2751 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
2752sub 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
2753 load_resource_file "$MAPDIR/regions" 3330 load_resource_file "$MAPDIR/regions"
2754 or die "unable to load regions file\n"; 3331 or die "unable to load regions file\n";
3332
3333 for (cf::region::list) {
3334 $_->{match} = qr/$_->{match}/
3335 if exists $_->{match};
3336 }
2755} 3337}
2756 3338
2757sub reload_facedata { 3339sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 3340 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 3341 or die "unable to load facedata\n";
2760} 3342}
2761 3343
2762sub reload_archetypes { 3344sub reload_archetypes {
2763 load_resource_file "$DATADIR/archetypes" 3345 load_resource_file "$DATADIR/archetypes"
2764 or die "unable to load archetypes\n"; 3346 or die "unable to load archetypes\n";
2765 #d# NEED to laod twice to resolve forward references
2766 # this really needs to be done in an extra post-pass
2767 # (which needs to be synchronous, so solve it differently)
2768 load_resource_file "$DATADIR/archetypes"
2769 or die "unable to load archetypes\n";
2770} 3347}
2771 3348
2772sub reload_treasures { 3349sub reload_treasures {
2773 load_resource_file "$DATADIR/treasures" 3350 load_resource_file "$DATADIR/treasures"
2774 or die "unable to load treasurelists\n"; 3351 or die "unable to load treasurelists\n";
2775} 3352}
2776 3353
2777sub reload_resources { 3354sub reload_resources {
2778 warn "reloading resource files...\n"; 3355 warn "reloading resource files...\n";
2779 3356
3357 reload_facedata;
3358 reload_archetypes;
2780 reload_regions; 3359 reload_regions;
2781 reload_facedata;
2782 #reload_archetypes;#d#
2783 reload_archetypes;
2784 reload_treasures; 3360 reload_treasures;
2785 3361
2786 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
2787} 3363}
2788 3364
2789sub init { 3365sub reload_config {
2790 reload_resources;
2791}
2792
2793sub cfg_load {
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
2795 or return; 3367 or return;
2796 3368
2797 local $/; 3369 local $/;
2798 *CFG = YAML::Syck::Load <$fh>; 3370 *CFG = YAML::Load <$fh>;
2799 3371
2800 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2801 3373
2802 $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};
2803 $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};
… …
2809 }; 3381 };
2810 warn $@ if $@; 3382 warn $@ if $@;
2811 } 3383 }
2812} 3384}
2813 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
2814sub 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
2815 # we must not ever block the main coroutine 3420 # we must not ever block the main coroutine
2816 local $Coro::idle = sub { 3421 local $Coro::idle = sub {
2817 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#
2818 (async { 3423 (async {
2819 Event::one_event; 3424 $Coro::current->{desc} = "IDLE BUG HANDLER";
3425 EV::loop EV::LOOP_ONESHOT;
2820 })->prio (Coro::PRIO_MAX); 3426 })->prio (Coro::PRIO_MAX);
2821 }; 3427 };
2822 3428
2823 cfg_load; 3429 evthread_start IO::AIO::poll_fileno;
3430
3431 cf::sync_job {
3432 reload_resources;
3433 reload_config;
2824 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
2825 load_extensions; 3447 load_extensions;
2826 3448
2827 $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
2828 Event::loop; 3457 EV::loop;
2829} 3458}
2830 3459
2831############################################################################# 3460#############################################################################
2832# initialisation and cleanup 3461# initialisation and cleanup
2833 3462
2834# install some emergency cleanup handlers 3463# install some emergency cleanup handlers
2835BEGIN { 3464BEGIN {
3465 our %SIGWATCHER = ();
2836 for my $signal (qw(INT HUP TERM)) { 3466 for my $signal (qw(INT HUP TERM)) {
2837 Event->signal ( 3467 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2838 reentrant => 0,
2839 data => WF_AUTOCANCEL,
2840 signal => $signal,
2841 prio => 0,
2842 cb => sub {
2843 cf::cleanup "SIG$signal"; 3468 cf::cleanup "SIG$signal";
2844 },
2845 ); 3469 };
2846 } 3470 }
2847} 3471}
2848 3472
2849sub write_runtime { 3473sub write_runtime_sync {
2850 my $runtime = "$LOCALDIR/runtime";
2851
2852 # first touch the runtime file to show we are still running: 3474 # first touch the runtime file to show we are still running:
2853 # the fsync below can take a very very long time. 3475 # the fsync below can take a very very long time.
2854 3476
2855 IO::AIO::aio_utime $runtime, undef, undef; 3477 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2856 3478
2857 my $guard = cf::lock_acquire "write_runtime"; 3479 my $guard = cf::lock_acquire "write_runtime";
2858 3480
2859 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3481 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2860 or return; 3482 or return;
2861 3483
2862 my $value = $cf::RUNTIME + 90 + 10; 3484 my $value = $cf::RUNTIME + 90 + 10;
2863 # 10 is the runtime save interval, for a monotonic clock 3485 # 10 is the runtime save interval, for a monotonic clock
2864 # 60 allows for the watchdog to kill the server. 3486 # 60 allows for the watchdog to kill the server.
… …
2874 aio_utime $fh, undef, undef; 3496 aio_utime $fh, undef, undef;
2875 3497
2876 close $fh 3498 close $fh
2877 or return; 3499 or return;
2878 3500
2879 aio_rename "$runtime~", $runtime 3501 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2880 and return; 3502 and return;
2881 3503
2882 warn "runtime file written.\n"; 3504 warn "runtime file written.\n";
2883 3505
2884 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 };
2885} 3557}
2886 3558
2887sub emergency_save() { 3559sub emergency_save() {
2888 my $freeze_guard = cf::freeze_mainloop; 3560 my $freeze_guard = cf::freeze_mainloop;
2889 3561
2890 warn "enter emergency perl save\n"; 3562 warn "emergency_perl_save: enter\n";
2891 3563
2892 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
2893 # use a peculiar iteration method to avoid tripping on perl 3570 # use a peculiar iteration method to avoid tripping on perl
2894 # refcount bugs in for. also avoids problems with players 3571 # refcount bugs in for. also avoids problems with players
2895 # and maps saved/destroyed asynchronously. 3572 # and maps saved/destroyed asynchronously.
2896 warn "begin emergency player save\n"; 3573 warn "emergency_perl_save: begin player save\n";
2897 for my $login (keys %cf::PLAYER) { 3574 for my $login (keys %cf::PLAYER) {
2898 my $pl = $cf::PLAYER{$login} or next; 3575 my $pl = $cf::PLAYER{$login} or next;
2899 $pl->valid or next; 3576 $pl->valid or next;
3577 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2900 $pl->save; 3578 $pl->save;
2901 } 3579 }
2902 warn "end emergency player save\n"; 3580 warn "emergency_perl_save: end player save\n";
2903 3581
2904 warn "begin emergency map save\n"; 3582 warn "emergency_perl_save: begin map save\n";
2905 for my $path (keys %cf::MAP) { 3583 for my $path (keys %cf::MAP) {
2906 my $map = $cf::MAP{$path} or next; 3584 my $map = $cf::MAP{$path} or next;
2907 $map->valid or next; 3585 $map->valid or next;
2908 $map->save; 3586 $map->save;
2909 } 3587 }
2910 warn "end emergency map save\n"; 3588 warn "emergency_perl_save: end map save\n";
2911 3589
2912 warn "begin emergency database checkpoint\n"; 3590 warn "emergency_perl_save: begin database checkpoint\n";
2913 BDB::db_env_txn_checkpoint $DB_ENV; 3591 BDB::db_env_txn_checkpoint $DB_ENV;
2914 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";
2915 }; 3597 };
2916 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
2917 warn "leave emergency perl save\n"; 3604 warn "emergency_perl_save: leave\n";
2918} 3605}
2919 3606
2920sub post_cleanup { 3607sub post_cleanup {
2921 my ($make_core) = @_; 3608 my ($make_core) = @_;
2922 3609
2923 warn Carp::longmess "post_cleanup backtrace" 3610 warn Carp::longmess "post_cleanup backtrace"
2924 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#
2925} 3641}
2926 3642
2927sub do_reload_perl() { 3643sub do_reload_perl() {
2928 # can/must only be called in main 3644 # can/must only be called in main
2929 if ($Coro::current != $Coro::main) { 3645 if ($Coro::current != $Coro::main) {
2930 warn "can only reload from main coroutine"; 3646 warn "can only reload from main coroutine";
2931 return; 3647 return;
2932 } 3648 }
2933 3649
3650 return if $RELOAD++;
3651
3652 my $t1 = EV::time;
3653
3654 while ($RELOAD) {
2934 warn "reloading..."; 3655 warn "reloading...";
2935 3656
2936 warn "entering sync_job"; 3657 warn "entering sync_job";
2937 3658
2938 cf::sync_job { 3659 cf::sync_job {
2939 cf::write_runtime; # external watchdog should not bark 3660 cf::write_runtime_sync; # external watchdog should not bark
2940 cf::emergency_save; 3661 cf::emergency_save;
2941 cf::write_runtime; # external watchdog should not bark 3662 cf::write_runtime_sync; # external watchdog should not bark
2942 3663
2943 warn "syncing database to disk"; 3664 warn "syncing database to disk";
2944 BDB::db_env_txn_checkpoint $DB_ENV; 3665 BDB::db_env_txn_checkpoint $DB_ENV;
2945 3666
2946 # 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
2947 3668
2948 warn "cancelling all WF_AUTOCANCEL watchers";
2949 for (Event::all_watchers) {
2950 $_->cancel if $_->data & WF_AUTOCANCEL;
2951 }
2952
2953 warn "flushing outstanding aio requests"; 3669 warn "flushing outstanding aio requests";
2954 for (;;) {
2955 BDB::flush;
2956 IO::AIO::flush;
2957 Coro::cede;
2958 last unless IO::AIO::nreqs || BDB::nreqs; 3670 while (IO::AIO::nreqs || BDB::nreqs) {
2959 warn "iterate..."; 3671 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2960 }
2961
2962 ++$RELOAD;
2963
2964 warn "cancelling all extension coros";
2965 $_->cancel for values %EXT_CORO;
2966 %EXT_CORO = ();
2967
2968 warn "removing commands";
2969 %COMMAND = ();
2970
2971 warn "removing ext/exti commands";
2972 %EXTCMD = ();
2973 %EXTICMD = ();
2974
2975 warn "unloading/nuking all extensions";
2976 for my $pkg (@EXTS) {
2977 warn "... unloading $pkg";
2978
2979 if (my $cb = $pkg->can ("unload")) {
2980 eval {
2981 $cb->($pkg);
2982 1
2983 } or warn "$pkg unloaded, but with errors: $@";
2984 } 3672 }
2985 3673
2986 warn "... nuking $pkg"; 3674 warn "cancelling all extension coros";
2987 Symbol::delete_package $pkg; 3675 $_->cancel for values %EXT_CORO;
2988 } 3676 %EXT_CORO = ();
2989 3677
2990 warn "unloading all perl modules loaded from $LIBDIR"; 3678 warn "removing commands";
2991 while (my ($k, $v) = each %INC) { 3679 %COMMAND = ();
2992 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2993 3680
3681 warn "removing ext/exti commands";
3682 %EXTCMD = ();
3683 %EXTICMD = ();
3684
3685 warn "unloading/nuking all extensions";
3686 for my $pkg (@EXTS) {
2994 warn "... unloading $k"; 3687 warn "... unloading $pkg";
2995 delete $INC{$k};
2996 3688
2997 $k =~ s/\.pm$//;
2998 $k =~ s/\//::/g;
2999
3000 if (my $cb = $k->can ("unload_module")) { 3689 if (my $cb = $pkg->can ("unload")) {
3690 eval {
3001 $cb->(); 3691 $cb->($pkg);
3692 1
3693 } or warn "$pkg unloaded, but with errors: $@";
3694 }
3695
3696 warn "... clearing $pkg";
3697 clear_package $pkg;
3002 } 3698 }
3003 3699
3004 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;
3005 } 3715 }
3006 3716
3007 warn "getting rid of safe::, as good as possible"; 3717 warn "getting rid of safe::, as good as possible";
3008 Symbol::delete_package "safe::$_" 3718 clear_package "safe::$_"
3009 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);
3010 3720
3011 warn "unloading cf.pm \"a bit\""; 3721 warn "unloading cf.pm \"a bit\"";
3012 delete $INC{"cf.pm"}; 3722 delete $INC{"cf.pm"};
3013 delete $INC{"cf/pod.pm"}; 3723 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3014 3724
3015 # don't, removes xs symbols, too, 3725 # don't, removes xs symbols, too,
3016 # and global variables created in xs 3726 # and global variables created in xs
3017 #Symbol::delete_package __PACKAGE__; 3727 #clear_package __PACKAGE__;
3018 3728
3019 warn "unload completed, starting to reload now"; 3729 warn "unload completed, starting to reload now";
3020 3730
3021 warn "reloading cf.pm"; 3731 warn "reloading cf.pm";
3022 require cf; 3732 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3733 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024 3734
3025 warn "loading config and database again"; 3735 warn "loading config and database again";
3026 cf::cfg_load; 3736 cf::reload_config;
3027 3737
3028 warn "loading extensions"; 3738 warn "loading extensions";
3029 cf::load_extensions; 3739 cf::load_extensions;
3030 3740
3741 if ($REATTACH_ON_RELOAD) {
3031 warn "reattaching attachments to objects/players"; 3742 warn "reattaching attachments to objects/players";
3032 _global_reattach; # objects, sockets 3743 _global_reattach; # objects, sockets
3033 warn "reattaching attachments to maps"; 3744 warn "reattaching attachments to maps";
3034 reattach $_ for values %MAP; 3745 reattach $_ for values %MAP;
3035 warn "reattaching attachments to players"; 3746 warn "reattaching attachments to players";
3036 reattach $_ for values %PLAYER; 3747 reattach $_ for values %PLAYER;
3748 }
3037 3749
3750 warn "running post_init jobs";
3751 (pop @POST_INIT)->(1) while @POST_INIT;
3752
3038 warn "leaving sync_job"; 3753 warn "leaving sync_job";
3039 3754
3040 1 3755 1
3041 } or do { 3756 } or do {
3042 warn $@; 3757 warn $@;
3043 warn "error while reloading, exiting."; 3758 cf::cleanup "error while reloading, exiting.";
3044 exit 1;
3045 }; 3759 };
3046 3760
3047 warn "reloaded"; 3761 warn "reloaded";
3762 --$RELOAD;
3763 }
3764
3765 $t1 = EV::time - $t1;
3766 warn "reload completed in ${t1}s\n";
3048}; 3767};
3049 3768
3050our $RELOAD_WATCHER; # used only during reload 3769our $RELOAD_WATCHER; # used only during reload
3051 3770
3052sub reload_perl() { 3771sub reload_perl() {
3053 # doing reload synchronously and two reloads happen back-to-back, 3772 # doing reload synchronously and two reloads happen back-to-back,
3054 # coro crashes during coro_state_free->destroy here. 3773 # coro crashes during coro_state_free->destroy here.
3055 3774
3056 $RELOAD_WATCHER ||= Event->timer ( 3775 $RELOAD_WATCHER ||= cf::async {
3057 reentrant => 0, 3776 Coro::AIO::aio_wait cache_extensions;
3058 after => 0, 3777
3059 data => WF_AUTOCANCEL, 3778 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3060 cb => sub {
3061 do_reload_perl; 3779 do_reload_perl;
3062 undef $RELOAD_WATCHER; 3780 undef $RELOAD_WATCHER;
3063 }, 3781 };
3064 ); 3782 };
3065} 3783}
3066 3784
3067register_command "reload" => sub { 3785register_command "reload" => sub {
3068 my ($who, $arg) = @_; 3786 my ($who, $arg) = @_;
3069 3787
3070 if ($who->flag (FLAG_WIZ)) { 3788 if ($who->flag (FLAG_WIZ)) {
3071 $who->message ("reloading server."); 3789 $who->message ("reloading server.");
3790 async {
3791 $Coro::current->{desc} = "perl_reload";
3072 async { reload_perl }; 3792 reload_perl;
3793 };
3073 } 3794 }
3074}; 3795};
3075 3796
3076unshift @INC, $LIBDIR; 3797unshift @INC, $LIBDIR;
3077 3798
… …
3079 3800
3080our @WAIT_FOR_TICK; 3801our @WAIT_FOR_TICK;
3081our @WAIT_FOR_TICK_BEGIN; 3802our @WAIT_FOR_TICK_BEGIN;
3082 3803
3083sub wait_for_tick { 3804sub wait_for_tick {
3084 return unless $TICK_WATCHER->is_active;
3085 return if $Coro::current == $Coro::main; 3805 return if tick_inhibit || $Coro::current == $Coro::main;
3086 3806
3087 my $signal = new Coro::Signal; 3807 my $signal = new Coro::Signal;
3088 push @WAIT_FOR_TICK, $signal; 3808 push @WAIT_FOR_TICK, $signal;
3089 $signal->wait; 3809 $signal->wait;
3090} 3810}
3091 3811
3092sub wait_for_tick_begin { 3812sub wait_for_tick_begin {
3093 return unless $TICK_WATCHER->is_active;
3094 return if $Coro::current == $Coro::main; 3813 return if tick_inhibit || $Coro::current == $Coro::main;
3095 3814
3096 my $signal = new Coro::Signal; 3815 my $signal = new Coro::Signal;
3097 push @WAIT_FOR_TICK_BEGIN, $signal; 3816 push @WAIT_FOR_TICK_BEGIN, $signal;
3098 $signal->wait; 3817 $signal->wait;
3099} 3818}
3100 3819
3101 my $min = 1e6;#d# 3820sub tick {
3102 my $avg = 10;
3103$TICK_WATCHER = Event->timer (
3104 reentrant => 0,
3105 parked => 1,
3106 prio => 0,
3107 at => $NEXT_TICK || $TICK,
3108 data => WF_AUTOCANCEL,
3109 cb => sub {
3110 if ($Coro::current != $Coro::main) { 3821 if ($Coro::current != $Coro::main) {
3111 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"
3112 unless ++$bug_warning > 10; 3823 unless ++$bug_warning > 10;
3113 return; 3824 return;
3114 } 3825 }
3115 3826
3116 $NOW = $tick_start = Event::time;
3117
3118 cf::server_tick; # one server iteration 3827 cf::server_tick; # one server iteration
3119 3828
3120 0 && sync_job {#d# 3829 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3121 for(1..10) { 3830 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3122 my $t = Event::time; 3831 Coro::async_pool {
3123 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3832 $Coro::current->{desc} = "runtime saver";
3124 or die; 3833 write_runtime_sync
3125 3834 or warn "ERROR: unable to write runtime file: $!";
3126 $map->width (50);
3127 $map->height (50);
3128 $map->alloc;
3129 $map->_load_objects ("/tmp/x.map", 1);
3130 my $t = Event::time - $t;
3131
3132 #next unless $t < 0.0013;#d#
3133 if ($t < $min) {
3134 $min = $t;
3135 }
3136 $avg = $avg * 0.99 + $t * 0.01;
3137 }
3138 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3139 exit 0;
3140 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3141 }; 3835 };
3836 }
3142 3837
3143 $RUNTIME += $TICK;
3144 $NEXT_TICK += $TICK;
3145
3146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3147 $NEXT_RUNTIME_WRITE = $NOW + 10;
3148 Coro::async_pool {
3149 write_runtime
3150 or warn "ERROR: unable to write runtime file: $!";
3151 };
3152 }
3153
3154# my $AFTER = Event::time;
3155# warn $AFTER - $NOW;#d#
3156
3157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3838 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3158 $sig->send; 3839 $sig->send;
3159 } 3840 }
3160 while (my $sig = shift @WAIT_FOR_TICK) { 3841 while (my $sig = shift @WAIT_FOR_TICK) {
3161 $sig->send; 3842 $sig->send;
3162 } 3843 }
3163 3844
3164 $NOW = Event::time; 3845 $LOAD = ($NOW - $TICK_START) / $TICK;
3165
3166 # if we are delayed by four ticks or more, skip them all
3167 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3168
3169 $TICK_WATCHER->at ($NEXT_TICK);
3170 $TICK_WATCHER->start;
3171
3172 $LOAD = ($NOW - $tick_start) / $TICK;
3173 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3846 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174 3847
3175 _post_tick; 3848 if (0) {
3176 3849 if ($NEXT_TICK) {
3177 3850 my $jitter = $TICK_START - $NEXT_TICK;
3851 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3852 warn "jitter $JITTER\n";#d#
3853 }
3178 }, 3854 }
3179); 3855}
3180 3856
3181{ 3857{
3182 BDB::max_poll_time $TICK * 0.1; 3858 # configure BDB
3183 $BDB_POLL_WATCHER = Event->io ( 3859
3184 reentrant => 0,
3185 fd => BDB::poll_fileno,
3186 poll => 'r',
3187 prio => 0,
3188 data => WF_AUTOCANCEL,
3189 cb => \&BDB::poll_cb,
3190 );
3191 BDB::min_parallel 8; 3860 BDB::min_parallel 8;
3192 3861 BDB::max_poll_reqs $TICK * 0.1;
3193 BDB::set_sync_prepare { 3862 $AnyEvent::BDB::WATCHER->priority (1);
3194 my $status;
3195 my $current = $Coro::current;
3196 (
3197 sub {
3198 $status = $!;
3199 $current->ready; undef $current;
3200 },
3201 sub {
3202 Coro::schedule while defined $current;
3203 $! = $status;
3204 },
3205 )
3206 };
3207 3863
3208 unless ($DB_ENV) { 3864 unless ($DB_ENV) {
3209 $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);
3210 3871
3211 cf::sync_job { 3872 cf::sync_job {
3212 eval { 3873 eval {
3213 BDB::db_env_open 3874 BDB::db_env_open
3214 $DB_ENV, 3875 $DB_ENV,
… …
3216 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
3217 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3878 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3218 0666; 3879 0666;
3219 3880
3220 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3881 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3221
3222 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3223 $DB_ENV->set_lk_detect;
3224 }; 3882 };
3225 3883
3226 cf::cleanup "db_env_open(db): $@" if $@; 3884 cf::cleanup "db_env_open(db): $@" if $@;
3227 }; 3885 };
3228 } 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 };
3229} 3897}
3230 3898
3231{ 3899{
3900 # configure IO::AIO
3901
3232 IO::AIO::min_parallel 8; 3902 IO::AIO::min_parallel 8;
3233
3234 undef $Coro::AIO::WATCHER;
3235 IO::AIO::max_poll_time $TICK * 0.1; 3903 IO::AIO::max_poll_time $TICK * 0.1;
3236 $AIO_POLL_WATCHER = Event->io ( 3904 undef $AnyEvent::AIO::WATCHER;
3237 reentrant => 0,
3238 data => WF_AUTOCANCEL,
3239 fd => IO::AIO::poll_fileno,
3240 poll => 'r',
3241 prio => 6,
3242 cb => \&IO::AIO::poll_cb,
3243 );
3244} 3905}
3245 3906
3246my $_log_backtrace; 3907my $_log_backtrace;
3247 3908
3248sub _log_backtrace { 3909sub _log_backtrace {
… …
3251 $msg =~ s/\n//; 3912 $msg =~ s/\n//;
3252 3913
3253 # limit the # of concurrent backtraces 3914 # limit the # of concurrent backtraces
3254 if ($_log_backtrace < 2) { 3915 if ($_log_backtrace < 2) {
3255 ++$_log_backtrace; 3916 ++$_log_backtrace;
3917 my $perl_bt = Carp::longmess $msg;
3256 async { 3918 async {
3919 $Coro::current->{desc} = "abt $msg";
3920
3257 my @bt = fork_call { 3921 my @bt = fork_call {
3258 @addr = map { sprintf "%x", $_ } @addr; 3922 @addr = map { sprintf "%x", $_ } @addr;
3259 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3923 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3260 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 |"
3261 or die "addr2line: $!"; 3925 or die "addr2line: $!";
… …
3269 } 3933 }
3270 3934
3271 @funcs 3935 @funcs
3272 }; 3936 };
3273 3937
3274 LOG llevInfo, "[ABT] $msg\n"; 3938 LOG llevInfo, "[ABT] $perl_bt\n";
3939 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3275 LOG llevInfo, "[ABT] $_\n" for @bt; 3940 LOG llevInfo, "[ABT] $_\n" for @bt;
3276 --$_log_backtrace; 3941 --$_log_backtrace;
3277 }; 3942 };
3278 } else { 3943 } else {
3279 LOG llevInfo, "[ABT] $msg\n"; 3944 LOG llevInfo, "[ABT] $msg\n";
3280 LOG llevInfo, "[ABT] [suppressed]\n"; 3945 LOG llevInfo, "[ABT] [suppressed]\n";
3281 } 3946 }
3282} 3947}
3283 3948
3284# load additional modules 3949# load additional modules
3285use cf::pod; 3950require "cf/$_.pm" for @EXTRA_MODULES;
3286 3951
3287END { cf::emergency_save } 3952END { cf::emergency_save }
3288 3953
32891 39541
3290 3955

Diff Legend

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