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.292 by root, Tue Jul 3 00:54:57 2007 UTC vs.
Revision 1.468 by root, Thu Jan 8 19:23:44 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 off
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 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 556 reset_signals;
435 local $SIG{__WARN__}; 557 &$cb
436 local $SIG{__DIE__}; 558 }, @args;
437 eval {
438 close $fh1;
439 559
440 my @res = eval { $cb->(@args) }; 560 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 561}
442 };
443 562
444 warn $@ if $@; 563=item $coin = coin_from_name $name
445 _exit 0; 564
446 } 565=cut
566
567our %coin_alias = (
568 "silver" => "silvercoin",
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
447} 588}
448 589
449=item $value = cf::db_get $family => $key 590=item $value = cf::db_get $family => $key
450 591
451Returns a single value from the environment database. 592Returns a single value from the environment database.
… …
453=item cf::db_put $family => $key => $value 594=item cf::db_put $family => $key => $value
454 595
455Stores 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
456data 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).
457 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
458=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}
459 622
460our $DB; 623our $DB;
461 624
462sub db_init { 625sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 626 cf::sync_job {
467 eval { 627 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 628 };
477} 629}
478 630
479sub db_get($$) { 631sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 632 my $key = "$_[0]/$_[1]";
481 633
… …
531 if (1) { 683 if (1) {
532 $md5 = 684 $md5 =
533 join "\x00", 685 join "\x00",
534 $processversion, 686 $processversion,
535 map { 687 map {
536 Coro::cede; 688 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 689 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 690 } 0.. $#$src;
539 691
540 692
541 my $dbmd5 = db_get cache => "$id/md5"; 693 my $dbmd5 = db_get cache => "$id/md5";
… …
579 731
580############################################################################# 732#############################################################################
581 733
582=head2 ATTACHABLE OBJECTS 734=head2 ATTACHABLE OBJECTS
583 735
584Many 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
585attach callbacks/event handlers (a collection of which is called an "attachment") 737attach callbacks/event handlers (a collection of which is called an "attachment")
586to it. All such attachable objects support the following methods. 738to it. All such attachable objects support the following methods.
587 739
588In 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>
589C<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
590Crossfire TRT). 742Deliantra).
591 743
592=over 4 744=over 4
593 745
594=item $attachable->attach ($attachment, key => $value...) 746=item $attachable->attach ($attachment, key => $value...)
595 747
… …
639=item cf::CLASS::attachment $name, ... 791=item cf::CLASS::attachment $name, ...
640 792
641Register an attachment by C<$name> through which attachable objects of the 793Register an attachment by C<$name> through which attachable objects of the
642given CLASS can refer to this attachment. 794given CLASS can refer to this attachment.
643 795
644Some classes such as crossfire maps and objects can specify attachments 796Some classes such as deliantra maps and objects can specify attachments
645that 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.
646 798
647These calls expect any number of the following handler/hook descriptions: 799These calls expect any number of the following handler/hook descriptions:
648 800
649=over 4 801=over 4
… …
847 "; 999 ";
848 die if $@; 1000 die if $@;
849} 1001}
850 1002
851our $override; 1003our $override;
852our @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?
853 1005
854sub override { 1006sub override {
855 $override = 1; 1007 $override = 1;
856 @invoke_results = (); 1008 @INVOKE_RESULTS = (@_);
857} 1009}
858 1010
859sub do_invoke { 1011sub do_invoke {
860 my $event = shift; 1012 my $event = shift;
861 my $callbacks = shift; 1013 my $callbacks = shift;
862 1014
863 @invoke_results = (); 1015 @INVOKE_RESULTS = ();
864 1016
865 local $override; 1017 local $override;
866 1018
867 for (@$callbacks) { 1019 for (@$callbacks) {
868 eval { &{$_->[1]} }; 1020 eval { &{$_->[1]} };
… …
877 } 1029 }
878 1030
879 0 1031 0
880} 1032}
881 1033
882=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1034=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
883 1035
884=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1036=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
885 1037
886Generate an object-specific event with the given arguments. 1038Generate an object-specific event with the given arguments.
887 1039
888This 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
889removed 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
890results (if you must, access C<@cf::invoke_results> directly). 1042results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 1043
892=back 1044=back
893 1045
894=cut 1046=cut
895 1047
896############################################################################# 1048#############################################################################
897# 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}
898 1092
899sub reattach { 1093sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1094 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1095 my ($obj) = @_;
902 1096
1097 # no longer needed after getting rid of delete_package?
903 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
904 1099
905 my $registry = $obj->registry; 1100 my $registry = $obj->registry;
906 1101
907 @$registry = (); 1102 @$registry = ();
908 1103
… …
923cf::attachable->attach ( 1118cf::attachable->attach (
924 prio => -1000000, 1119 prio => -1000000,
925 on_instantiate => sub { 1120 on_instantiate => sub {
926 my ($obj, $data) = @_; 1121 my ($obj, $data) = @_;
927 1122
928 $data = from_json $data; 1123 $data = decode_json $data;
929 1124
930 for (@$data) { 1125 for (@$data) {
931 my ($name, $args) = @$_; 1126 my ($name, $args) = @$_;
932 1127
933 $obj->attach ($name, %{$args || {} }); 1128 $obj->attach ($name, %{$args || {} });
… …
949sub object_freezer_save { 1144sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1145 my ($filename, $rdata, $objs) = @_;
951 1146
952 sync_job { 1147 sync_job {
953 if (length $$rdata) { 1148 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1150 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1151 $decname, length $$rdata, scalar @$objs;
956 1152
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
961 close $fh; 1157 aio_close $fh;
962 1158
963 if (@$objs) { 1159 if (@$objs) {
964 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
965 chmod SAVE_MODE, $fh; 1161 aio_chmod $fh, SAVE_MODE;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1163 aio_write $fh, 0, (length $data), $data, 0;
968 aio_fsync $fh if $cf::USE_FSYNC; 1164 aio_fsync $fh if $cf::USE_FSYNC;
969 close $fh; 1165 aio_close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1166 aio_rename "$filename.pst~", "$filename.pst";
971 } 1167 }
972 } else { 1168 } else {
973 aio_unlink "$filename.pst"; 1169 aio_unlink "$filename.pst";
974 } 1170 }
975 1171
976 aio_rename "$filename~", $filename; 1172 aio_rename "$filename~", $filename;
1173
1174 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC;
977 } else { 1176 } else {
978 warn "FATAL: $filename~: $!\n"; 1177 warn "unable to save objects: $filename~: $!\n";
979 } 1178 }
980 } else { 1179 } else {
981 aio_unlink $filename; 1180 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
983 } 1182 }
984 } 1183 };
985} 1184}
986 1185
987sub object_freezer_as_string { 1186sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1187 my ($rdata, $objs) = @_;
989 1188
… …
1001 or return; 1200 or return;
1002 1201
1003 unless (aio_stat "$filename.pst") { 1202 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1203 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1204 or return;
1205
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1206 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs};
1007 } 1208 }
1008 1209
1210 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1211 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1212 $decname, length $data, scalar @{$av || []};
1213
1011 return ($data, $av); 1214 ($data, $av)
1012} 1215}
1013 1216
1014=head2 COMMAND CALLBACKS 1217=head2 COMMAND CALLBACKS
1015 1218
1016=over 4 1219=over 4
… …
1070 my ($name, $cb) = @_; 1273 my ($name, $cb) = @_;
1071 1274
1072 $EXTICMD{$name} = $cb; 1275 $EXTICMD{$name} = $cb;
1073} 1276}
1074 1277
1278use File::Glob ();
1279
1075cf::player->attach ( 1280cf::player->attach (
1076 on_command => sub { 1281 on_command => sub {
1077 my ($pl, $name, $params) = @_; 1282 my ($pl, $name, $params) = @_;
1078 1283
1079 my $cb = $COMMAND{$name} 1284 my $cb = $COMMAND{$name}
… …
1089 my ($pl, $buf) = @_; 1294 my ($pl, $buf) = @_;
1090 1295
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1296 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1297
1093 if (ref $msg) { 1298 if (ref $msg) {
1299 my ($type, $reply, @payload) =
1300 "ARRAY" eq ref $msg
1301 ? @$msg
1302 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1303
1304 my @reply;
1305
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1306 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1307 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1308 }
1309
1310 $pl->ext_reply ($reply, @reply)
1311 if $reply;
1312
1099 } else { 1313 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1314 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1315 }
1102 1316
1103 cf::override; 1317 cf::override;
1104 }, 1318 },
1105); 1319);
1320
1321# "readahead" all extensions
1322sub cache_extensions {
1323 my $grp = IO::AIO::aio_group;
1324
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1326 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 }
1329 };
1330
1331 $grp
1332}
1106 1333
1107sub load_extensions { 1334sub load_extensions {
1108 cf::sync_job { 1335 cf::sync_job {
1109 my %todo; 1336 my %todo;
1110 1337
… …
1130 1357
1131 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1132 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1133 1360
1134 $ext{source} = 1361 $ext{source} =
1135 "package $pkg; use strict; use utf8;\n" 1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1136 . "#line 1 \"$path\"\n{\n" 1363 . "#line 1 \"$path\"\n{\n"
1137 . $source 1364 . $source
1138 . "\n};\n1"; 1365 . "\n};\n1";
1139 1366
1140 $todo{$base} = \%ext; 1367 $todo{$base} = \%ext;
… …
1156 my $msg = $@ ? "$v->{path}: $@\n" 1383 my $msg = $@ ? "$v->{path}: $@\n"
1157 : "$v->{base}: extension inactive.\n"; 1384 : "$v->{base}: extension inactive.\n";
1158 1385
1159 if (exists $v->{meta}{mandatory}) { 1386 if (exists $v->{meta}{mandatory}) {
1160 warn $msg; 1387 warn $msg;
1161 warn "mandatory extension failed to load, exiting.\n"; 1388 cf::cleanup "mandatory extension failed to load, exiting.";
1162 exit 1;
1163 } 1389 }
1164 1390
1165 warn $msg; 1391 warn $msg;
1166 } 1392 }
1167 1393
… …
1181 1407
1182=back 1408=back
1183 1409
1184=head2 CORE EXTENSIONS 1410=head2 CORE EXTENSIONS
1185 1411
1186Functions and methods that extend core crossfire objects. 1412Functions and methods that extend core deliantra objects.
1187 1413
1188=cut 1414=cut
1189 1415
1190package cf::player; 1416package cf::player;
1191 1417
1192use Coro::AIO; 1418use Coro::AIO;
1193 1419
1194=head3 cf::player 1420=head3 cf::player
1195 1421
1196=over 4 1422=over 4
1423
1424=item cf::player::num_playing
1425
1426Returns the official number of playing players, as per the Crossfire metaserver rules.
1427
1428=cut
1429
1430sub num_playing {
1431 scalar grep
1432 $_->ob->map
1433 && !$_->hidden
1434 && !$_->ob->flag (cf::FLAG_WIZ),
1435 cf::player::list
1436}
1197 1437
1198=item cf::player::find $login 1438=item cf::player::find $login
1199 1439
1200Returns the given player object, loading it if necessary (might block). 1440Returns the given player object, loading it if necessary (might block).
1201 1441
… …
1220 1460
1221sub exists($) { 1461sub exists($) {
1222 my ($login) = @_; 1462 my ($login) = @_;
1223 1463
1224 $cf::PLAYER{$login} 1464 $cf::PLAYER{$login}
1225 or cf::sync_job { !aio_stat path $login } 1465 or !aio_stat path $login
1226} 1466}
1227 1467
1228sub find($) { 1468sub find($) {
1229 return $cf::PLAYER{$_[0]} || do { 1469 return $cf::PLAYER{$_[0]} || do {
1230 my $login = $_[0]; 1470 my $login = $_[0];
… …
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1477 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1478 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1479 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1480 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1481
1242 my $pl = load_pl path $login 1482 my $f = new_from_file cf::object::thawer path $login
1243 or return; 1483 or return;
1484
1485 my $pl = cf::player::load_pl $f
1486 or return;
1487
1488 local $cf::PLAYER_LOADING{$login} = $pl;
1489 $f->resolve_delayed_derefs;
1244 $cf::PLAYER{$login} = $pl 1490 $cf::PLAYER{$login} = $pl
1245 } 1491 }
1246 } 1492 }
1247} 1493}
1248 1494
… …
1257 return if $pl->{deny_save}; 1503 return if $pl->{deny_save};
1258 1504
1259 aio_mkdir playerdir $pl, 0770; 1505 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1506 $pl->{last_save} = $cf::RUNTIME;
1261 1507
1508 cf::get_slot 0.01;
1509
1262 $pl->save_pl ($path); 1510 $pl->save_pl ($path);
1263 Coro::cede; 1511 cf::cede_to_tick;
1264} 1512}
1265 1513
1266sub new($) { 1514sub new($) {
1267 my ($login) = @_; 1515 my ($login) = @_;
1268 1516
… …
1274 $cf::PLAYER{$login} = $self; 1522 $cf::PLAYER{$login} = $self;
1275 1523
1276 $self 1524 $self
1277} 1525}
1278 1526
1527=item $player->send_msg ($channel, $msg, $color, [extra...])
1528
1529=cut
1530
1531sub send_msg {
1532 my $ns = shift->ns
1533 or return;
1534 $ns->send_msg (@_);
1535}
1536
1279=item $pl->quit_character 1537=item $pl->quit_character
1280 1538
1281Nukes the player without looking back. If logged in, the connection will 1539Nukes the player without looking back. If logged in, the connection will
1282be destroyed. May block for a long time. 1540be destroyed. May block for a long time.
1283 1541
… …
1287 my ($pl) = @_; 1545 my ($pl) = @_;
1288 1546
1289 my $name = $pl->ob->name; 1547 my $name = $pl->ob->name;
1290 1548
1291 $pl->{deny_save} = 1; 1549 $pl->{deny_save} = 1;
1292 $pl->password ("*"); # this should lock out the player until we nuked the dir 1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1293 1551
1294 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1295 $pl->deactivate; 1553 $pl->deactivate;
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1296 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1556 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1297 $pl->ns->destroy if $pl->ns; 1557 $pl->ns->destroy if $pl->ns;
1298 1558
1299 my $path = playerdir $pl; 1559 my $path = playerdir $pl;
1300 my $temp = "$path~$cf::RUNTIME~deleting~"; 1560 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1336 or return []; 1596 or return [];
1337 1597
1338 my @logins; 1598 my @logins;
1339 1599
1340 for my $login (@$dirs) { 1600 for my $login (@$dirs) {
1601 my $path = path $login;
1602
1603 # a .pst is a dead give-away for a valid player
1604 # if no pst file found, open and chekc for blocked users
1605 if (aio_stat "$path.pst") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1606 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1607 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1608 $buf !~ /^password -------------$/m or next; # official not-valid tag
1609 }
1344 1610
1345 utf8::decode $login; 1611 utf8::decode $login;
1346 push @logins, $login; 1612 push @logins, $login;
1347 } 1613 }
1348 1614
… …
1375 } 1641 }
1376 1642
1377 \@paths 1643 \@paths
1378} 1644}
1379 1645
1380=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1646=item $protocol_xml = $player->expand_cfpod ($cfpod)
1381 1647
1382Expand crossfire pod fragments into protocol xml. 1648Expand deliantra pod fragments into protocol xml.
1383 1649
1384=cut
1385
1386sub expand_cfpod {
1387 ((my $self), (local $_)) = @_;
1388
1389 # escape & and <
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392
1393 # this is buggy, it needs to properly take care of nested <'s
1394
1395 1 while
1396 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/
1400 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1
1403 }ge
1404 # replace H<hint text>
1405 || s{H<([^\>]*)>}
1406 {
1407 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1408 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1409 "")
1410 [$self->{hintmode}]
1411 }ge;
1412
1413 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g;
1415
1416 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/;
1418
1419 $_
1420}
1421
1422sub hintmode {
1423 $_[0]{hintmode} = $_[1] if @_ > 1;
1424 $_[0]{hintmode}
1425}
1426
1427=item $player->ext_reply ($msgid, %msg) 1650=item $player->ext_reply ($msgid, @msg)
1428 1651
1429Sends an ext reply to the player. 1652Sends an ext reply to the player.
1430 1653
1431=cut 1654=cut
1432 1655
1433sub ext_reply($$%) { 1656sub ext_reply($$@) {
1434 my ($self, $id, %msg) = @_; 1657 my ($self, $id, @msg) = @_;
1435 1658
1436 $msg{msgid} = $id; 1659 $self->ns->ext_reply ($id, @msg)
1437 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1438} 1660}
1439 1661
1440=item $player->ext_event ($type, %msg) 1662=item $player->ext_msg ($type, @msg)
1441 1663
1442Sends an ext event to the client. 1664Sends an ext event to the client.
1443 1665
1444=cut 1666=cut
1445 1667
1446sub ext_event($$%) { 1668sub ext_msg($$@) {
1447 my ($self, $type, %msg) = @_; 1669 my ($self, $type, @msg) = @_;
1448 1670
1449 $self->ns->ext_event ($type, %msg); 1671 $self->ns->ext_msg ($type, @msg);
1450} 1672}
1451 1673
1452=head3 cf::region 1674=head3 cf::region
1453 1675
1454=over 4 1676=over 4
… …
1467 my ($path) = @_; 1689 my ($path) = @_;
1468 1690
1469 my ($match, $specificity); 1691 my ($match, $specificity);
1470 1692
1471 for my $region (list) { 1693 for my $region (list) {
1472 if ($region->match && $path =~ $region->match) { 1694 if ($region->{match} && $path =~ $region->{match}) {
1473 ($match, $specificity) = ($region, $region->specificity) 1695 ($match, $specificity) = ($region, $region->specificity)
1474 if $region->specificity > $specificity; 1696 if $region->specificity > $specificity;
1475 } 1697 }
1476 } 1698 }
1477 1699
… …
1498our $MAX_RESET = 3600; 1720our $MAX_RESET = 3600;
1499our $DEFAULT_RESET = 3000; 1721our $DEFAULT_RESET = 3000;
1500 1722
1501sub generate_random_map { 1723sub generate_random_map {
1502 my ($self, $rmp) = @_; 1724 my ($self, $rmp) = @_;
1725
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727
1503 # mit "rum" bekleckern, nicht 1728 # mit "rum" bekleckern, nicht
1504 $self->_create_random_map ( 1729 $self->_create_random_map (
1505 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1506 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1507 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1597 $self->init; # pass $1 etc. 1822 $self->init; # pass $1 etc.
1598 return $self; 1823 return $self;
1599 } 1824 }
1600 } 1825 }
1601 1826
1602 Carp::carp "unable to resolve path '$path' (base '$base')."; 1827 Carp::cluck "unable to resolve path '$path' (base '$base').";
1603 () 1828 ()
1604} 1829}
1605 1830
1606sub init { 1831sub init {
1607 my ($self) = @_; 1832 my ($self) = @_;
… …
1629 1854
1630# the temporary/swap location 1855# the temporary/swap location
1631sub save_path { 1856sub save_path {
1632 my ($self) = @_; 1857 my ($self) = @_;
1633 1858
1634 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1635 "$TMPDIR/$path.map" 1860 "$TMPDIR/$path.map"
1636} 1861}
1637 1862
1638# the unique path, undef == no special unique path 1863# the unique path, undef == no special unique path
1639sub uniq_path { 1864sub uniq_path {
1640 my ($self) = @_; 1865 my ($self) = @_;
1641 1866
1642 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1643 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1644}
1645
1646# and all this just because we cannot iterate over
1647# all maps in C++...
1648sub change_all_map_light {
1649 my ($change) = @_;
1650
1651 $_->change_map_light ($change)
1652 for grep $_->outdoor, values %cf::MAP;
1653} 1869}
1654 1870
1655sub decay_objects { 1871sub decay_objects {
1656 my ($self) = @_; 1872 my ($self) = @_;
1657 1873
… …
1670 1886
1671sub load_header_from($) { 1887sub load_header_from($) {
1672 my ($self, $path) = @_; 1888 my ($self, $path) = @_;
1673 1889
1674 utf8::encode $path; 1890 utf8::encode $path;
1675 #aio_open $path, O_RDONLY, 0 1891 my $f = new_from_file cf::object::thawer $path
1676 # or return;
1677
1678 $self->_load_header ($path)
1679 or return; 1892 or return;
1893
1894 $self->_load_header ($f)
1895 or return;
1896
1897 local $MAP_LOADING{$self->{path}} = $self;
1898 $f->resolve_delayed_derefs;
1680 1899
1681 $self->{load_path} = $path; 1900 $self->{load_path} = $path;
1682 1901
1683 1 1902 1
1684} 1903}
… …
1738sub find { 1957sub find {
1739 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
1740 1959
1741 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
1742 1961
1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1743 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
1744 1964
1745 $cf::MAP{$path} || do { 1965 $cf::MAP{$path} || do {
1746 my $guard = cf::lock_acquire "map_find:$path";
1747 my $map = new_from_path cf::map $path 1966 my $map = new_from_path cf::map $path
1748 or return; 1967 or return;
1749 1968
1750 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
1751 1970
… …
1753 or return; 1972 or return;
1754 1973
1755 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1974 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1756 # doing this can freeze the server in a sync job, obviously 1975 # doing this can freeze the server in a sync job, obviously
1757 #$cf::WAIT_FOR_TICK->wait; 1976 #$cf::WAIT_FOR_TICK->wait;
1977 undef $guard2;
1978 undef $guard1;
1758 $map->reset; 1979 $map->reset;
1759 undef $guard;
1760 return find $path; 1980 return find $path;
1761 } 1981 }
1762 1982
1763 $cf::MAP{$path} = $map 1983 $cf::MAP{$path} = $map
1764 } 1984 }
… …
1773 local $self->{deny_reset} = 1; # loading can take a long time 1993 local $self->{deny_reset} = 1; # loading can take a long time
1774 1994
1775 my $path = $self->{path}; 1995 my $path = $self->{path};
1776 1996
1777 { 1997 {
1778 my $guard = cf::lock_acquire "map_load:$path"; 1998 my $guard = cf::lock_acquire "map_data:$path";
1779 1999
2000 return unless $self->valid;
1780 return if $self->in_memory != cf::MAP_SWAPPED; 2001 return unless $self->in_memory == cf::MAP_SWAPPED;
1781 2002
1782 $self->in_memory (cf::MAP_LOADING); 2003 $self->in_memory (cf::MAP_LOADING);
1783 2004
1784 $self->alloc; 2005 $self->alloc;
1785 2006
1786 $self->pre_load; 2007 $self->pre_load;
1787 Coro::cede; 2008 cf::cede_to_tick;
1788 2009
2010 my $f = new_from_file cf::object::thawer $self->{load_path};
2011 $f->skip_block;
1789 $self->_load_objects ($self->{load_path}, 1) 2012 $self->_load_objects ($f)
1790 or return; 2013 or return;
1791 2014
1792 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2015 $self->post_load_original
1793 if delete $self->{load_original}; 2016 if delete $self->{load_original};
1794 2017
1795 if (my $uniq = $self->uniq_path) { 2018 if (my $uniq = $self->uniq_path) {
1796 utf8::encode $uniq; 2019 utf8::encode $uniq;
1797 if (aio_open $uniq, O_RDONLY, 0) { 2020 unless (aio_stat $uniq) {
2021 if (my $f = new_from_file cf::object::thawer $uniq) {
1798 $self->clear_unique_items; 2022 $self->clear_unique_items;
1799 $self->_load_objects ($uniq, 0); 2023 $self->_load_objects ($f);
2024 $f->resolve_delayed_derefs;
2025 }
1800 } 2026 }
1801 } 2027 }
1802 2028
1803 Coro::cede; 2029 $f->resolve_delayed_derefs;
2030
2031 cf::cede_to_tick;
1804 # now do the right thing for maps 2032 # now do the right thing for maps
1805 $self->link_multipart_objects; 2033 $self->link_multipart_objects;
1806 $self->difficulty ($self->estimate_difficulty) 2034 $self->difficulty ($self->estimate_difficulty)
1807 unless $self->difficulty; 2035 unless $self->difficulty;
1808 Coro::cede; 2036 cf::cede_to_tick;
1809 2037
1810 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
1811 $self->decay_objects; 2039 $self->decay_objects;
1812 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
1813 $self->update_buttons; 2041 $self->update_buttons;
1814 Coro::cede; 2042 cf::cede_to_tick;
1815 $self->set_darkness_map;
1816 Coro::cede;
1817 $self->activate; 2043 $self->activate;
1818 } 2044 }
1819 2045
2046 $self->{last_save} = $cf::RUNTIME;
2047 $self->last_access ($cf::RUNTIME);
2048
1820 $self->in_memory (cf::MAP_IN_MEMORY); 2049 $self->in_memory (cf::MAP_ACTIVE);
1821 } 2050 }
1822 2051
1823 $self->post_load; 2052 $self->post_load;
1824} 2053}
1825 2054
… …
1834 2063
1835 $self 2064 $self
1836} 2065}
1837 2066
1838# find and load all maps in the 3x3 area around a map 2067# find and load all maps in the 3x3 area around a map
1839sub load_diag { 2068sub load_neighbours {
1840 my ($map) = @_; 2069 my ($map) = @_;
1841 2070
1842 my @diag; # diagonal neighbours 2071 my @neigh; # diagonal neighbours
1843 2072
1844 for (0 .. 3) { 2073 for (0 .. 3) {
1845 my $neigh = $map->tile_path ($_) 2074 my $neigh = $map->tile_path ($_)
1846 or next; 2075 or next;
1847 $neigh = find $neigh, $map 2076 $neigh = find $neigh, $map
1848 or next; 2077 or next;
1849 $neigh->load; 2078 $neigh->load;
1850 2079
2080 push @neigh,
1851 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2081 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1852 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2082 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1853 } 2083 }
1854 2084
1855 for (@diag) { 2085 for (grep defined $_->[0], @neigh) {
2086 my ($path, $origin) = @$_;
1856 my $neigh = find @$_ 2087 my $neigh = find $path, $origin
1857 or next; 2088 or next;
1858 $neigh->load; 2089 $neigh->load;
1859 } 2090 }
1860} 2091}
1861 2092
… …
1866} 2097}
1867 2098
1868sub do_load_sync { 2099sub do_load_sync {
1869 my ($map) = @_; 2100 my ($map) = @_;
1870 2101
2102 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2103 if $Coro::current == $Coro::main;
2104
1871 cf::sync_job { $map->load }; 2105 cf::sync_job { $map->load };
1872} 2106}
1873 2107
1874our %MAP_PREFETCH; 2108our %MAP_PREFETCH;
1875our $MAP_PREFETCHER = undef; 2109our $MAP_PREFETCHER = undef;
1876 2110
1877sub find_async { 2111sub find_async {
1878 my ($path, $origin) = @_; 2112 my ($path, $origin, $load) = @_;
1879 2113
1880 $path = normalise $path, $origin && $origin->{path}; 2114 $path = normalise $path, $origin && $origin->{path};
1881 2115
1882 if (my $map = $cf::MAP{$path}) { 2116 if (my $map = $cf::MAP{$path}) {
1883 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2117 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1884 } 2118 }
1885 2119
1886 undef $MAP_PREFETCH{$path}; 2120 $MAP_PREFETCH{$path} |= $load;
2121
1887 $MAP_PREFETCHER ||= cf::async { 2122 $MAP_PREFETCHER ||= cf::async {
2123 $Coro::current->{desc} = "map prefetcher";
2124
1888 while (%MAP_PREFETCH) { 2125 while (%MAP_PREFETCH) {
1889 for my $path (keys %MAP_PREFETCH) { 2126 while (my ($k, $v) = each %MAP_PREFETCH) {
1890 my $map = find $path 2127 if (my $map = find $k) {
1891 or next;
1892 $map->load; 2128 $map->load if $v;
2129 }
1893 2130
1894 delete $MAP_PREFETCH{$path}; 2131 delete $MAP_PREFETCH{$k};
1895 } 2132 }
1896 } 2133 }
1897 undef $MAP_PREFETCHER; 2134 undef $MAP_PREFETCHER;
1898 }; 2135 };
1899 $MAP_PREFETCHER->prio (6); 2136 $MAP_PREFETCHER->prio (6);
… …
1902} 2139}
1903 2140
1904sub save { 2141sub save {
1905 my ($self) = @_; 2142 my ($self) = @_;
1906 2143
1907 my $lock = cf::lock_acquire "map_data:" . $self->path; 2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
1908 2145
1909 $self->{last_save} = $cf::RUNTIME; 2146 $self->{last_save} = $cf::RUNTIME;
1910 2147
1911 return unless $self->dirty; 2148 return unless $self->dirty;
1912 2149
… …
1918 return if $self->{deny_save}; 2155 return if $self->{deny_save};
1919 2156
1920 local $self->{last_access} = $self->last_access;#d# 2157 local $self->{last_access} = $self->last_access;#d#
1921 2158
1922 cf::async { 2159 cf::async {
2160 $Coro::current->{desc} = "map player save";
1923 $_->contr->save for $self->players; 2161 $_->contr->save for $self->players;
1924 }; 2162 };
2163
2164 cf::get_slot 0.02;
1925 2165
1926 if ($uniq) { 2166 if ($uniq) {
1927 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2167 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1928 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2168 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1929 } else { 2169 } else {
… …
1935 my ($self) = @_; 2175 my ($self) = @_;
1936 2176
1937 # save first because save cedes 2177 # save first because save cedes
1938 $self->save; 2178 $self->save;
1939 2179
1940 my $lock = cf::lock_acquire "map_data:" . $self->path; 2180 my $lock = cf::lock_acquire "map_data:$self->{path}";
1941 2181
1942 return if $self->players; 2182 return if $self->players;
1943 return if $self->in_memory != cf::MAP_IN_MEMORY; 2183 return if $self->in_memory != cf::MAP_ACTIVE;
1944 return if $self->{deny_save}; 2184 return if $self->{deny_save};
1945 2185
2186 $self->in_memory (cf::MAP_SWAPPED);
2187
2188 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP;
1946 $self->clear; 2190 $self->clear;
1947 $self->in_memory (cf::MAP_SWAPPED);
1948} 2191}
1949 2192
1950sub reset_at { 2193sub reset_at {
1951 my ($self) = @_; 2194 my ($self) = @_;
1952 2195
… …
1984 if $uniq; 2227 if $uniq;
1985 } 2228 }
1986 2229
1987 delete $cf::MAP{$self->path}; 2230 delete $cf::MAP{$self->path};
1988 2231
2232 $self->deactivate;
2233 $_->clear_links_to ($self) for values %cf::MAP;
1989 $self->clear; 2234 $self->clear;
1990
1991 $_->clear_links_to ($self) for values %cf::MAP;
1992 2235
1993 $self->unlink_save; 2236 $self->unlink_save;
1994 $self->destroy; 2237 $self->destroy;
1995} 2238}
1996 2239
1997my $nuke_counter = "aaaa"; 2240my $nuke_counter = "aaaa";
1998 2241
1999sub nuke { 2242sub nuke {
2000 my ($self) = @_; 2243 my ($self) = @_;
2001 2244
2245 {
2246 my $lock = cf::lock_acquire "map_data:$self->{path}";
2247
2002 delete $cf::MAP{$self->path}; 2248 delete $cf::MAP{$self->path};
2003 2249
2004 $self->unlink_save; 2250 $self->unlink_save;
2005 2251
2006 bless $self, "cf::map"; 2252 bless $self, "cf::map";
2007 delete $self->{deny_reset}; 2253 delete $self->{deny_reset};
2008 $self->{deny_save} = 1; 2254 $self->{deny_save} = 1;
2009 $self->reset_timeout (1); 2255 $self->reset_timeout (1);
2010 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2011 2257
2012 $cf::MAP{$self->path} = $self; 2258 $cf::MAP{$self->path} = $self;
2259 }
2013 2260
2014 $self->reset; # polite request, might not happen 2261 $self->reset; # polite request, might not happen
2015} 2262}
2016 2263
2017=item $maps = cf::map::tmp_maps 2264=item $maps = cf::map::tmp_maps
… …
2059 2306
2060sub unique_maps() { 2307sub unique_maps() {
2061 [ 2308 [
2062 map { 2309 map {
2063 utf8::decode $_; 2310 utf8::decode $_;
2064 /\.map$/ 2311 s/\.map$//; # TODO future compatibility hack
2312 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2313 ? ()
2065 ? normalise $_ 2314 : normalise $_
2066 : ()
2067 } @{ aio_readdir $UNIQUEDIR or [] } 2315 } @{ aio_readdir $UNIQUEDIR or [] }
2068 ] 2316 ]
2069} 2317}
2070 2318
2071package cf;
2072
2073=back 2319=back
2074 2320
2075=head3 cf::object 2321=head3 cf::object
2076 2322
2077=cut 2323=cut
… …
2080 2326
2081=over 4 2327=over 4
2082 2328
2083=item $ob->inv_recursive 2329=item $ob->inv_recursive
2084 2330
2085Returns the inventory of the object _and_ their inventories, recursively. 2331Returns the inventory of the object I<and> their inventories, recursively,
2332but I<not> the object itself.
2086 2333
2087=cut 2334=cut
2088 2335
2089sub inv_recursive_; 2336sub inv_recursive_;
2090sub inv_recursive_ { 2337sub inv_recursive_ {
… …
2093 2340
2094sub inv_recursive { 2341sub inv_recursive {
2095 inv_recursive_ inv $_[0] 2342 inv_recursive_ inv $_[0]
2096} 2343}
2097 2344
2345=item $ref = $ob->ref
2346
2347Creates and returns a persistent reference to an object that can be stored as a string.
2348
2349=item $ob = cf::object::deref ($refstring)
2350
2351returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2352even if the object actually exists. May block.
2353
2354=cut
2355
2356sub deref {
2357 my ($ref) = @_;
2358
2359 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2360 my ($uuid, $name) = ($1, $2);
2361 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2362 or return;
2363 $pl->ob->uuid eq $uuid
2364 or return;
2365
2366 $pl->ob
2367 } else {
2368 warn "$ref: cannot resolve object reference\n";
2369 undef
2370 }
2371}
2372
2098package cf; 2373package cf;
2099 2374
2100=back 2375=back
2101 2376
2102=head3 cf::object::player 2377=head3 cf::object::player
… …
2108Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2383Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2109can be C<undef>. Does the right thing when the player is currently in a 2384can be C<undef>. Does the right thing when the player is currently in a
2110dialogue with the given NPC character. 2385dialogue with the given NPC character.
2111 2386
2112=cut 2387=cut
2388
2389our $SAY_CHANNEL = {
2390 id => "say",
2391 title => "Map",
2392 reply => "say ",
2393 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2394};
2395
2396our $CHAT_CHANNEL = {
2397 id => "chat",
2398 title => "Chat",
2399 reply => "chat ",
2400 tooltip => "Player chat and shouts, global to the server.",
2401};
2113 2402
2114# rough implementation of a future "reply" method that works 2403# rough implementation of a future "reply" method that works
2115# with dialog boxes. 2404# with dialog boxes.
2116#TODO: the first argument must go, split into a $npc->reply_to ( method 2405#TODO: the first argument must go, split into a $npc->reply_to ( method
2117sub cf::object::player::reply($$$;$) { 2406sub cf::object::player::reply($$$;$) {
… …
2124 2413
2125 } else { 2414 } else {
2126 my $pl = $self->contr; 2415 my $pl = $self->contr;
2127 2416
2128 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2417 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2129 my $diag = $pl->{npc_dialog}; 2418 my $dialog = $pl->{npc_dialog};
2130 $diag->{pl}->ext_reply ( 2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2131 $diag->{id},
2132 msgtype => "reply",
2133 msg => $diag->{pl}->expand_cfpod ($msg),
2134 add_topics => []
2135 );
2136 2420
2137 } else { 2421 } else {
2138 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
2139 $self->message ($msg, $flags); 2423 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2140 } 2424 }
2141 } 2425 }
2426}
2427
2428=item $object->send_msg ($channel, $msg, $color, [extra...])
2429
2430=cut
2431
2432sub cf::object::send_msg {
2433 my $pl = shift->contr
2434 or return;
2435 $pl->send_msg (@_);
2142} 2436}
2143 2437
2144=item $player_object->may ("access") 2438=item $player_object->may ("access")
2145 2439
2146Returns wether the given player is authorized to access resource "access" 2440Returns wether the given player is authorized to access resource "access"
… …
2159 2453
2160=item $player_object->enter_link 2454=item $player_object->enter_link
2161 2455
2162Freezes the player and moves him/her to a special map (C<{link}>). 2456Freezes the player and moves him/her to a special map (C<{link}>).
2163 2457
2164The player should be reasonably safe there for short amounts of time. You 2458The player should be reasonably safe there for short amounts of time (e.g.
2165I<MUST> call C<leave_link> as soon as possible, though. 2459for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460though, as the palyer cannot control the character while it is on the link
2461map.
2166 2462
2167Will never block. 2463Will never block.
2168 2464
2169=item $player_object->leave_link ($map, $x, $y) 2465=item $player_object->leave_link ($map, $x, $y)
2170 2466
… …
2225 # use -1 or undef as default coordinates, not 0, 0 2521 # use -1 or undef as default coordinates, not 0, 0
2226 ($x, $y) = ($map->enter_x, $map->enter_y) 2522 ($x, $y) = ($map->enter_x, $map->enter_y)
2227 if $x <=0 && $y <= 0; 2523 if $x <=0 && $y <= 0;
2228 2524
2229 $map->load; 2525 $map->load;
2230 $map->load_diag; 2526 $map->load_neighbours;
2231 2527
2232 return unless $self->contr->active; 2528 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2233 $self->activate_recursive; 2530 $self->activate_recursive;
2234 2531
2235 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2236 $self->enter_map ($map, $x, $y); 2533 $self->enter_map ($map, $x, $y);
2237} 2534}
2238 2535
2239=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2240 2537
2241Moves the player to the given map-path and coordinates by first freezing 2538Moves the player to the given map-path and coordinates by first freezing
2242her, loading and preparing them map, calling the provided $check callback 2539her, loading and preparing them map, calling the provided $check callback
2243that has to return the map if sucecssful, and then unfreezes the player on 2540that has to return the map if sucecssful, and then unfreezes the player on
2244the new (success) or old (failed) map position. 2541the new (success) or old (failed) map position. In either case, $done will
2542be called at the end of this process.
2543
2544Note that $check will be called with a potentially non-loaded map, so if
2545it needs a loaded map it has to call C<< ->load >>.
2245 2546
2246=cut 2547=cut
2247 2548
2248our $GOTOGEN; 2549our $GOTOGEN;
2249 2550
2250sub cf::object::player::goto { 2551sub cf::object::player::goto {
2251 my ($self, $path, $x, $y, $check) = @_; 2552 my ($self, $path, $x, $y, $check, $done) = @_;
2252 2553
2253 # do generation counting so two concurrent goto's will be executed in-order 2554 # do generation counting so two concurrent goto's will be executed in-order
2254 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2255 2556
2256 $self->enter_link; 2557 $self->enter_link;
2257 2558
2258 (async { 2559 (async {
2560 $Coro::current->{desc} = "player::goto $path $x $y";
2561
2562 # *tag paths override both path and x|y
2563 if ($path =~ /^\*(.*)$/) {
2564 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2565 my $ob = $obs[rand @obs];
2566
2567 # see if we actually can go there
2568 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2569 $ob = $obs[rand @obs];
2570 } else {
2571 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2572 }
2573 # else put us there anyways for now #d#
2574
2575 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2576 } else {
2577 ($path, $x, $y) = (undef, undef, undef);
2578 }
2579 }
2580
2259 my $map = eval { 2581 my $map = eval {
2260 my $map = cf::map::find $path; 2582 my $map = defined $path ? cf::map::find $path : undef;
2261 2583
2262 if ($map) { 2584 if ($map) {
2263 $map = $map->customise_for ($self); 2585 $map = $map->customise_for ($self);
2264 $map = $check->($map) if $check && $map; 2586 $map = $check->($map) if $check && $map;
2265 } else { 2587 } else {
2266 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2588 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2267 } 2589 }
2268 2590
2269 $map 2591 $map
2270 }; 2592 };
2271 2593
… …
2276 2598
2277 if ($gen == $self->{_goto_generation}) { 2599 if ($gen == $self->{_goto_generation}) {
2278 delete $self->{_goto_generation}; 2600 delete $self->{_goto_generation};
2279 $self->leave_link ($map, $x, $y); 2601 $self->leave_link ($map, $x, $y);
2280 } 2602 }
2603
2604 $done->() if $done;
2281 })->prio (1); 2605 })->prio (1);
2282} 2606}
2283 2607
2284=item $player_object->enter_exit ($exit_object) 2608=item $player_object->enter_exit ($exit_object)
2285 2609
… …
2305} 2629}
2306 2630
2307sub prepare_random_map { 2631sub prepare_random_map {
2308 my ($exit) = @_; 2632 my ($exit) = @_;
2309 2633
2310 my $guard = cf::lock_acquire "exit_prepare:$exit";
2311
2312 # all this does is basically replace the /! path by 2634 # all this does is basically replace the /! path by
2313 # a new random map path (?random/...) with a seed 2635 # a new random map path (?random/...) with a seed
2314 # that depends on the exit object 2636 # that depends on the exit object
2315 2637
2316 my $rmp = parse_random_map_params $exit->msg; 2638 my $rmp = parse_random_map_params $exit->msg;
… …
2318 if ($exit->map) { 2640 if ($exit->map) {
2319 $rmp->{region} = $exit->region->name; 2641 $rmp->{region} = $exit->region->name;
2320 $rmp->{origin_map} = $exit->map->path; 2642 $rmp->{origin_map} = $exit->map->path;
2321 $rmp->{origin_x} = $exit->x; 2643 $rmp->{origin_x} = $exit->x;
2322 $rmp->{origin_y} = $exit->y; 2644 $rmp->{origin_y} = $exit->y;
2645
2646 $exit->map->touch;
2323 } 2647 }
2324 2648
2325 $rmp->{random_seed} ||= $exit->random_seed; 2649 $rmp->{random_seed} ||= $exit->random_seed;
2326 2650
2327 my $data = cf::to_json $rmp; 2651 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2328 my $md5 = Digest::MD5::md5_hex $data; 2652 my $md5 = Digest::MD5::md5_hex $data;
2329 my $meta = "$RANDOMDIR/$md5.meta"; 2653 my $meta = "$RANDOMDIR/$md5.meta";
2330 2654
2331 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2655 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2332 aio_write $fh, 0, (length $data), $data, 0; 2656 aio_write $fh, 0, (length $data), $data, 0;
2333 undef $fh; 2657 undef $fh;
2334 aio_rename "$meta~", $meta; 2658 aio_rename "$meta~", $meta;
2335 2659
2660 my $slaying = "?random/$md5";
2661
2662 if ($exit->valid) {
2336 $exit->slaying ("?random/$md5"); 2663 $exit->slaying ("?random/$md5");
2337 $exit->msg (undef); 2664 $exit->msg (undef);
2665 }
2338 } 2666 }
2339} 2667}
2340 2668
2341sub cf::object::player::enter_exit { 2669sub cf::object::player::enter_exit {
2342 my ($self, $exit) = @_; 2670 my ($self, $exit) = @_;
2343 2671
2344 return unless $self->type == cf::PLAYER; 2672 return unless $self->type == cf::PLAYER;
2345 2673
2346 if ($exit->slaying eq "/!") {
2347 #TODO: this should de-fi-ni-te-ly not be a sync-job
2348 # the problem is that $exit might not survive long enough
2349 # so it needs to be done right now, right here
2350 cf::sync_job { prepare_random_map $exit };
2351 }
2352
2353 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2354 my $hp = $exit->stats->hp;
2355 my $sp = $exit->stats->sp;
2356
2357 $self->enter_link; 2674 $self->enter_link;
2358 2675
2359 (async { 2676 (async {
2360 $self->deactivate_recursive; # just to be sure 2677 $Coro::current->{desc} = "enter_exit";
2678
2361 unless (eval { 2679 unless (eval {
2680 $self->deactivate_recursive; # just to be sure
2681
2682 # random map handling
2683 {
2684 my $guard = cf::lock_acquire "exit_prepare:$exit";
2685
2686 prepare_random_map $exit
2687 if $exit->slaying eq "/!";
2688 }
2689
2690 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2691 my $x = $exit->stats->hp;
2692 my $y = $exit->stats->sp;
2693
2362 $self->goto ($slaying, $hp, $sp); 2694 $self->goto ($map, $x, $y);
2363 2695
2696 # if exit is damned, update players death & WoR home-position
2697 $self->contr->savebed ($map, $x, $y)
2698 if $exit->flag (cf::FLAG_DAMNED);
2699
2364 1; 2700 1
2365 }) { 2701 }) {
2366 $self->message ("Something went wrong deep within the crossfire server. " 2702 $self->message ("Something went wrong deep within the deliantra server. "
2367 . "I'll try to bring you back to the map you were before. " 2703 . "I'll try to bring you back to the map you were before. "
2368 . "Please report this to the dungeon master!", 2704 . "Please report this to the dungeon master!",
2369 cf::NDI_UNIQUE | cf::NDI_RED); 2705 cf::NDI_UNIQUE | cf::NDI_RED);
2370 2706
2371 warn "ERROR in enter_exit: $@"; 2707 warn "ERROR in enter_exit: $@";
… …
2390 2726
2391 utf8::encode $text; 2727 utf8::encode $text;
2392 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2393} 2729}
2394 2730
2395=item $client->send_msg ($color, $type, $msg, [extra...]) 2731=item $client->send_msg ($channel, $msg, $color, [extra...])
2396 2732
2397Send a drawinfo or msg packet to the client, formatting the msg for the 2733Send a drawinfo or msg packet to the client, formatting the msg for the
2398client if neccessary. C<$type> should be a string identifying the type of 2734client if neccessary. C<$type> should be a string identifying the type of
2399the message, with C<log> being the default. If C<$color> is negative, suppress 2735the message, with C<log> being the default. If C<$color> is negative, suppress
2400the message unless the client supports the msg packet. 2736the message unless the client supports the msg packet.
2401 2737
2402=cut 2738=cut
2403 2739
2740# non-persistent channels (usually the info channel)
2741our %CHANNEL = (
2742 "c/identify" => {
2743 id => "infobox",
2744 title => "Identify",
2745 reply => undef,
2746 tooltip => "Items recently identified",
2747 },
2748 "c/examine" => {
2749 id => "infobox",
2750 title => "Examine",
2751 reply => undef,
2752 tooltip => "Signs and other items you examined",
2753 },
2754 "c/book" => {
2755 id => "infobox",
2756 title => "Book",
2757 reply => undef,
2758 tooltip => "The contents of a note or book",
2759 },
2760 "c/lookat" => {
2761 id => "infobox",
2762 title => "Look",
2763 reply => undef,
2764 tooltip => "What you saw there",
2765 },
2766 "c/who" => {
2767 id => "infobox",
2768 title => "Players",
2769 reply => undef,
2770 tooltip => "Shows players who are currently online",
2771 },
2772 "c/body" => {
2773 id => "infobox",
2774 title => "Body Parts",
2775 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available",
2777 },
2778 "c/statistics" => {
2779 id => "infobox",
2780 title => "Statistics",
2781 reply => undef,
2782 tooltip => "Shows your primary statistics",
2783 },
2784 "c/skills" => {
2785 id => "infobox",
2786 title => "Skills",
2787 reply => undef,
2788 tooltip => "Shows your experience per skill and item power",
2789 },
2790 "c/resistances" => {
2791 id => "infobox",
2792 title => "Resistances",
2793 reply => undef,
2794 tooltip => "Shows your resistances",
2795 },
2796 "c/pets" => {
2797 id => "infobox",
2798 title => "Pets",
2799 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet",
2801 },
2802 "c/uptime" => {
2803 id => "infobox",
2804 title => "Uptime",
2805 reply => undef,
2806 tooltip => "How long the server has been running since last restart",
2807 },
2808 "c/mapinfo" => {
2809 id => "infobox",
2810 title => "Map Info",
2811 reply => undef,
2812 tooltip => "Information related to the maps",
2813 },
2814 "c/party" => {
2815 id => "party",
2816 title => "Party",
2817 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party",
2819 },
2820 "c/death" => {
2821 id => "death",
2822 title => "Death",
2823 reply => undef,
2824 tooltip => "Reason for and more info about your most recent death",
2825 },
2826 "c/say" => $SAY_CHANNEL,
2827 "c/chat" => $CHAT_CHANNEL,
2828);
2829
2404sub cf::client::send_msg { 2830sub cf::client::send_msg {
2405 my ($self, $color, $type, $msg, @extra) = @_; 2831 my ($self, $channel, $msg, $color, @extra) = @_;
2406 2832
2407 $msg = $self->pl->expand_cfpod ($msg); 2833 $msg = $self->pl->expand_cfpod ($msg)
2834 unless $color & cf::NDI_VERBATIM;
2408 2835
2409 if ($self->can_msg) { 2836 $color &= cf::NDI_CLIENT_MASK; # just in case...
2410 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2411 } else {
2412 # replace some tags by gcfclient-compatible ones
2413 for ($msg) {
2414 1 while
2415 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2416 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2417 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2418 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2419 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2420 }
2421 2837
2422 if ($color >= 0) { 2838 # check predefined channels, for the benefit of C
2423 if (0 && $msg =~ /\[/) { 2839 if ($CHANNEL{$channel}) {
2424 $self->send_packet ("drawextinfo $color 4 0 $msg") 2840 $channel = $CHANNEL{$channel};
2425 } else { 2841
2426 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2842 $self->ext_msg (channel_info => $channel);
2427 $self->send_packet ("drawinfo $color $msg") 2843 $channel = $channel->{id};
2844
2845 } elsif (ref $channel) {
2846 # send meta info to client, if not yet sent
2847 unless (exists $self->{channel}{$channel->{id}}) {
2848 $self->{channel}{$channel->{id}} = $channel;
2849 $self->ext_msg (channel_info => $channel);
2428 } 2850 }
2429 }
2430 }
2431}
2432 2851
2852 $channel = $channel->{id};
2853 }
2854
2855 return unless @extra || length $msg;
2856
2857 # default colour, mask it out
2858 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2859 if $color & cf::NDI_DEF;
2860
2861 my $pkt = "msg "
2862 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 );
2865
2866 # try lzf for large packets
2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2868 if 1024 <= length $pkt and $self->{can_lzf};
2869
2870 # split very large packets
2871 if (8192 < length $pkt and $self->{can_lzf}) {
2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2873 $pkt = "frag";
2874 }
2875
2876 $self->send_packet ($pkt);
2877}
2878
2433=item $client->ext_event ($type, %msg) 2879=item $client->ext_msg ($type, @msg)
2434 2880
2435Sends an ext event to the client. 2881Sends an ext event to the client.
2436 2882
2437=cut 2883=cut
2438 2884
2439sub cf::client::ext_event($$%) { 2885sub cf::client::ext_msg($$@) {
2440 my ($self, $type, %msg) = @_; 2886 my ($self, $type, @msg) = @_;
2441 2887
2888 if ($self->extcmd == 2) {
2889 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2890 } elsif ($self->extcmd == 1) { # TODO: remove
2442 $msg{msgtype} = "event_$type"; 2891 push @msg, msgtype => "event_$type";
2443 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2892 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2893 }
2894}
2895
2896=item $client->ext_reply ($msgid, @msg)
2897
2898Sends an ext reply to the client.
2899
2900=cut
2901
2902sub cf::client::ext_reply($$@) {
2903 my ($self, $id, @msg) = @_;
2904
2905 if ($self->extcmd == 2) {
2906 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2907 } elsif ($self->extcmd == 1) {
2908 #TODO: version 1, remove
2909 unshift @msg, msgtype => "reply", msgid => $id;
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 }
2444} 2912}
2445 2913
2446=item $success = $client->query ($flags, "text", \&cb) 2914=item $success = $client->query ($flags, "text", \&cb)
2447 2915
2448Queues a query to the client, calling the given callback with 2916Queues a query to the client, calling the given callback with
… …
2503 my ($ns, $buf) = @_; 2971 my ($ns, $buf) = @_;
2504 2972
2505 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2973 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2506 2974
2507 if (ref $msg) { 2975 if (ref $msg) {
2976 my ($type, $reply, @payload) =
2977 "ARRAY" eq ref $msg
2978 ? @$msg
2979 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2980
2981 my @reply;
2982
2508 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2983 if (my $cb = $EXTICMD{$type}) {
2509 if (my %reply = $cb->($ns, $msg)) { 2984 @reply = $cb->($ns, @payload);
2510 $reply{msgid} = $msg->{msgid};
2511 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2512 }
2513 } 2985 }
2986
2987 $ns->ext_reply ($reply, @reply)
2988 if $reply;
2989
2514 } else { 2990 } else {
2515 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2991 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2516 } 2992 }
2517 2993
2518 cf::override; 2994 cf::override;
… …
2565our $safe = new Safe "safe"; 3041our $safe = new Safe "safe";
2566our $safe_hole = new Safe::Hole; 3042our $safe_hole = new Safe::Hole;
2567 3043
2568$SIG{FPE} = 'IGNORE'; 3044$SIG{FPE} = 'IGNORE';
2569 3045
2570$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3046$safe->permit_only (Opcode::opset qw(
3047 :base_core :base_mem :base_orig :base_math
3048 grepstart grepwhile mapstart mapwhile
3049 sort time
3050));
2571 3051
2572# here we export the classes and methods available to script code 3052# here we export the classes and methods available to script code
2573 3053
2574=pod 3054=pod
2575 3055
2576The following functions and methods are available within a safe environment: 3056The following functions and methods are available within a safe environment:
2577 3057
2578 cf::object contr pay_amount pay_player map 3058 cf::object
3059 contr pay_amount pay_player map x y force_find force_add destroy
3060 insert remove name archname title slaying race decrease split
3061 value
3062
2579 cf::object::player player 3063 cf::object::player
2580 cf::player peaceful 3064 player
2581 cf::map trigger 3065
3066 cf::player
3067 peaceful
3068
3069 cf::map
3070 trigger
2582 3071
2583=cut 3072=cut
2584 3073
2585for ( 3074for (
2586 ["cf::object" => qw(contr pay_amount pay_player map)], 3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3076 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp value msg lore send_msg)],
2587 ["cf::object::player" => qw(player)], 3078 ["cf::object::player" => qw(player)],
2588 ["cf::player" => qw(peaceful)], 3079 ["cf::player" => qw(peaceful send_msg)],
2589 ["cf::map" => qw(trigger)], 3080 ["cf::map" => qw(trigger)],
2590) { 3081) {
2591 no strict 'refs'; 3082 no strict 'refs';
2592 my ($pkg, @funs) = @$_; 3083 my ($pkg, @funs) = @$_;
2593 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2610 my ($code, %vars) = @_; 3101 my ($code, %vars) = @_;
2611 3102
2612 my $qcode = $code; 3103 my $qcode = $code;
2613 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2614 $qcode =~ s/\n/\\n/g; 3105 $qcode =~ s/\n/\\n/g;
3106
3107 %vars = (_dummy => 0) unless %vars;
2615 3108
2616 local $_; 3109 local $_;
2617 local @safe::cf::_safe_eval_args = values %vars; 3110 local @safe::cf::_safe_eval_args = values %vars;
2618 3111
2619 my $eval = 3112 my $eval =
… …
2667# the server's init and main functions 3160# the server's init and main functions
2668 3161
2669sub load_facedata($) { 3162sub load_facedata($) {
2670 my ($path) = @_; 3163 my ($path) = @_;
2671 3164
3165 # HACK to clear player env face cache, we need some signal framework
3166 # for this (global event?)
3167 %ext::player_env::MUSIC_FACE_CACHE = ();
3168
3169 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3170
2672 warn "loading facedata from $path\n"; 3171 warn "loading facedata from $path\n";
2673 3172
2674 my $facedata; 3173 my $facedata;
2675 0 < aio_load $path, $facedata 3174 0 < aio_load $path, $facedata
2676 or die "$path: $!"; 3175 or die "$path: $!";
… …
2678 $facedata = Coro::Storable::thaw $facedata; 3177 $facedata = Coro::Storable::thaw $facedata;
2679 3178
2680 $facedata->{version} == 2 3179 $facedata->{version} == 2
2681 or cf::cleanup "$path: version mismatch, cannot proceed."; 3180 or cf::cleanup "$path: version mismatch, cannot proceed.";
2682 3181
3182 # patch in the exptable
3183 $facedata->{resource}{"res/exp_table"} = {
3184 type => FT_RSRC,
3185 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3186 };
3187 cf::cede_to_tick;
3188
2683 { 3189 {
2684 my $faces = $facedata->{faceinfo}; 3190 my $faces = $facedata->{faceinfo};
2685 3191
2686 while (my ($face, $info) = each %$faces) { 3192 while (my ($face, $info) = each %$faces) {
2687 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3193 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3194
2688 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3195 cf::face::set_visibility $idx, $info->{visibility};
3196 cf::face::set_magicmap $idx, $info->{magicmap};
2689 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3197 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2690 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3198 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2691 Coro::cede; 3199
3200 cf::cede_to_tick;
2692 } 3201 }
2693 3202
2694 while (my ($face, $info) = each %$faces) { 3203 while (my ($face, $info) = each %$faces) {
2695 next unless $info->{smooth}; 3204 next unless $info->{smooth};
3205
2696 my $idx = cf::face::find $face 3206 my $idx = cf::face::find $face
2697 or next; 3207 or next;
3208
2698 if (my $smooth = cf::face::find $info->{smooth}) { 3209 if (my $smooth = cf::face::find $info->{smooth}) {
3210 cf::face::set_smooth $idx, $smooth;
2699 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3211 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2700 } else { 3212 } else {
2701 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3213 warn "smooth face '$info->{smooth}' not found for face '$face'";
2702 } 3214 }
2703 Coro::cede; 3215
3216 cf::cede_to_tick;
2704 } 3217 }
2705 } 3218 }
2706 3219
2707 { 3220 {
2708 my $anims = $facedata->{animinfo}; 3221 my $anims = $facedata->{animinfo};
2709 3222
2710 while (my ($anim, $info) = each %$anims) { 3223 while (my ($anim, $info) = each %$anims) {
2711 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3224 cf::anim::set $anim, $info->{frames}, $info->{facings};
2712 Coro::cede; 3225 cf::cede_to_tick;
2713 } 3226 }
2714 3227
2715 cf::anim::invalidate_all; # d'oh 3228 cf::anim::invalidate_all; # d'oh
2716 } 3229 }
2717 3230
3231 {
3232 # TODO: for gcfclient pleasure, we should give resources
3233 # that gcfclient doesn't grok a >10000 face index.
3234 my $res = $facedata->{resource};
3235
3236 while (my ($name, $info) = each %$res) {
3237 if (defined $info->{type}) {
3238 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3239 my $data;
3240
3241 if ($info->{type} & 1) {
3242 # prepend meta info
3243
3244 my $meta = $enc->encode ({
3245 name => $name,
3246 %{ $info->{meta} || {} },
3247 });
3248
3249 $data = pack "(w/a*)*", $meta, $info->{data};
3250 } else {
3251 $data = $info->{data};
3252 }
3253
3254 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3255 cf::face::set_type $idx, $info->{type};
3256 } else {
3257 $RESOURCE{$name} = $info;
3258 }
3259
3260 cf::cede_to_tick;
3261 }
3262 }
3263
3264 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3265
2718 1 3266 1
2719} 3267}
2720 3268
3269cf::global->attach (on_resource_update => sub {
3270 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3271 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3272
3273 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3274 my $sound = $soundconf->{compat}[$_]
3275 or next;
3276
3277 my $face = cf::face::find "sound/$sound->[1]";
3278 cf::sound::set $sound->[0] => $face;
3279 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3280 }
3281
3282 while (my ($k, $v) = each %{$soundconf->{event}}) {
3283 my $face = cf::face::find "sound/$v";
3284 cf::sound::set $k => $face;
3285 }
3286 }
3287});
3288
3289register_exticmd fx_want => sub {
3290 my ($ns, $want) = @_;
3291
3292 while (my ($k, $v) = each %$want) {
3293 $ns->fx_want ($k, $v);
3294 }
3295};
3296
3297sub load_resource_file($) {
3298 my $guard = lock_acquire "load_resource_file";
3299
3300 my $status = load_resource_file_ $_[0];
3301 get_slot 0.1, 100;
3302 cf::arch::commit_load;
3303
3304 $status
3305}
3306
2721sub reload_regions { 3307sub reload_regions {
3308 # HACK to clear player env face cache, we need some signal framework
3309 # for this (global event?)
3310 %ext::player_env::MUSIC_FACE_CACHE = ();
3311
2722 load_resource_file "$MAPDIR/regions" 3312 load_resource_file "$MAPDIR/regions"
2723 or die "unable to load regions file\n"; 3313 or die "unable to load regions file\n";
3314
3315 for (cf::region::list) {
3316 $_->{match} = qr/$_->{match}/
3317 if exists $_->{match};
3318 }
2724} 3319}
2725 3320
2726sub reload_facedata { 3321sub reload_facedata {
2727 load_facedata "$DATADIR/facedata" 3322 load_facedata "$DATADIR/facedata"
2728 or die "unable to load facedata\n"; 3323 or die "unable to load facedata\n";
2729} 3324}
2730 3325
2731sub reload_archetypes { 3326sub reload_archetypes {
2732 load_resource_file "$DATADIR/archetypes" 3327 load_resource_file "$DATADIR/archetypes"
2733 or die "unable to load archetypes\n"; 3328 or die "unable to load archetypes\n";
2734 #d# NEED to laod twice to resolve forward references
2735 # this really needs to be done in an extra post-pass
2736 # (which needs to be synchronous, so solve it differently)
2737 load_resource_file "$DATADIR/archetypes"
2738 or die "unable to load archetypes\n";
2739} 3329}
2740 3330
2741sub reload_treasures { 3331sub reload_treasures {
2742 load_resource_file "$DATADIR/treasures" 3332 load_resource_file "$DATADIR/treasures"
2743 or die "unable to load treasurelists\n"; 3333 or die "unable to load treasurelists\n";
2744} 3334}
2745 3335
2746sub reload_resources { 3336sub reload_resources {
2747 warn "reloading resource files...\n"; 3337 warn "reloading resource files...\n";
2748 3338
3339 reload_facedata;
3340 reload_archetypes;
2749 reload_regions; 3341 reload_regions;
2750 reload_facedata;
2751 #reload_archetypes;#d#
2752 reload_archetypes;
2753 reload_treasures; 3342 reload_treasures;
2754 3343
2755 warn "finished reloading resource files\n"; 3344 warn "finished reloading resource files\n";
2756} 3345}
2757 3346
2758sub init { 3347sub reload_config {
2759 reload_resources;
2760}
2761
2762sub cfg_load {
2763 open my $fh, "<:utf8", "$CONFDIR/config" 3348 open my $fh, "<:utf8", "$CONFDIR/config"
2764 or return; 3349 or return;
2765 3350
2766 local $/; 3351 local $/;
2767 *CFG = YAML::Syck::Load <$fh>; 3352 *CFG = YAML::Load <$fh>;
2768 3353
2769 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2770 3355
2771 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3356 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2772 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3357 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2778 }; 3363 };
2779 warn $@ if $@; 3364 warn $@ if $@;
2780 } 3365 }
2781} 3366}
2782 3367
3368sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!";
3371 flock $fh, &Fcntl::LOCK_EX
3372 or die "$PIDFILE: flock: $!";
3373 $fh
3374}
3375
3376# make sure only one server instance is running at any one time
3377sub atomic {
3378 my $fh = pidfile;
3379
3380 my $pid = <$fh>;
3381 kill 9, $pid if $pid > 0;
3382
3383 seek $fh, 0, 0;
3384 print $fh $$;
3385}
3386
2783sub main { 3387sub main {
3388 cf::init_globals; # initialise logging
3389
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3394
3395 cf::init_experience;
3396 cf::init_anim;
3397 cf::init_attackmess;
3398 cf::init_dynamic;
3399
3400 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3401
2784 # we must not ever block the main coroutine 3402 # we must not ever block the main coroutine
2785 local $Coro::idle = sub { 3403 local $Coro::idle = sub {
2786 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3404 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2787 (async { 3405 (async {
2788 Event::one_event; 3406 $Coro::current->{desc} = "IDLE BUG HANDLER";
3407 EV::loop EV::LOOP_ONESHOT;
2789 })->prio (Coro::PRIO_MAX); 3408 })->prio (Coro::PRIO_MAX);
2790 }; 3409 };
2791 3410
2792 cfg_load; 3411 evthread_start IO::AIO::poll_fileno;
3412
3413 cf::sync_job {
3414 reload_resources;
3415 reload_config;
2793 db_init; 3416 db_init;
3417
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid;
3421 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills;
3424
3425 cf::init_beforeplay;
3426
3427 atomic;
3428
2794 load_extensions; 3429 load_extensions;
2795 3430
2796 $TICK_WATCHER->start; 3431 utime time, time, $RUNTIMEFILE;
3432
3433 # no (long-running) fork's whatsoever before this point(!)
3434 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3435
3436 (pop @POST_INIT)->(0) while @POST_INIT;
3437 };
3438
2797 Event::loop; 3439 EV::loop;
2798} 3440}
2799 3441
2800############################################################################# 3442#############################################################################
2801# initialisation and cleanup 3443# initialisation and cleanup
2802 3444
2803# install some emergency cleanup handlers 3445# install some emergency cleanup handlers
2804BEGIN { 3446BEGIN {
3447 our %SIGWATCHER = ();
2805 for my $signal (qw(INT HUP TERM)) { 3448 for my $signal (qw(INT HUP TERM)) {
2806 Event->signal ( 3449 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2807 reentrant => 0,
2808 data => WF_AUTOCANCEL,
2809 signal => $signal,
2810 prio => 0,
2811 cb => sub {
2812 cf::cleanup "SIG$signal"; 3450 cf::cleanup "SIG$signal";
2813 },
2814 ); 3451 };
2815 } 3452 }
2816} 3453}
2817 3454
2818sub write_runtime { 3455sub write_runtime_sync {
2819 my $runtime = "$LOCALDIR/runtime";
2820
2821 # first touch the runtime file to show we are still running: 3456 # first touch the runtime file to show we are still running:
2822 # the fsync below can take a very very long time. 3457 # the fsync below can take a very very long time.
2823 3458
2824 IO::AIO::aio_utime $runtime, undef, undef; 3459 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2825 3460
2826 my $guard = cf::lock_acquire "write_runtime"; 3461 my $guard = cf::lock_acquire "write_runtime";
2827 3462
2828 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3463 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2829 or return; 3464 or return;
2830 3465
2831 my $value = $cf::RUNTIME + 90 + 10; 3466 my $value = $cf::RUNTIME + 90 + 10;
2832 # 10 is the runtime save interval, for a monotonic clock 3467 # 10 is the runtime save interval, for a monotonic clock
2833 # 60 allows for the watchdog to kill the server. 3468 # 60 allows for the watchdog to kill the server.
… …
2843 aio_utime $fh, undef, undef; 3478 aio_utime $fh, undef, undef;
2844 3479
2845 close $fh 3480 close $fh
2846 or return; 3481 or return;
2847 3482
2848 aio_rename "$runtime~", $runtime 3483 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2849 and return; 3484 and return;
2850 3485
2851 warn "runtime file written.\n"; 3486 warn "runtime file written.\n";
2852 3487
2853 1 3488 1
3489}
3490
3491our $uuid_lock;
3492our $uuid_skip;
3493
3494sub write_uuid_sync($) {
3495 $uuid_skip ||= $_[0];
3496
3497 return if $uuid_lock;
3498 local $uuid_lock = 1;
3499
3500 my $uuid = "$LOCALDIR/uuid";
3501
3502 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3503 or return;
3504
3505 my $value = uuid_seq uuid_cur;
3506
3507 unless ($value) {
3508 warn "cowardly refusing to write zero uuid value!\n";
3509 return;
3510 }
3511
3512 my $value = uuid_str $value + $uuid_skip;
3513 $uuid_skip = 0;
3514
3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3516 and return;
3517
3518 # always fsync - this file is important
3519 aio_fsync $fh
3520 and return;
3521
3522 close $fh
3523 or return;
3524
3525 aio_rename "$uuid~", $uuid
3526 and return;
3527
3528 warn "uuid file written ($value).\n";
3529
3530 1
3531
3532}
3533
3534sub write_uuid($$) {
3535 my ($skip, $sync) = @_;
3536
3537 $sync ? write_uuid_sync $skip
3538 : async { write_uuid_sync $skip };
2854} 3539}
2855 3540
2856sub emergency_save() { 3541sub emergency_save() {
2857 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
2858 3543
2859 warn "enter emergency perl save\n"; 3544 warn "emergency_perl_save: enter\n";
2860 3545
2861 cf::sync_job { 3546 cf::sync_job {
3547 # this is a trade-off: we want to be very quick here, so
3548 # save all maps without fsync, and later call a global sync
3549 # (which in turn might be very very slow)
3550 local $USE_FSYNC = 0;
3551
2862 # use a peculiar iteration method to avoid tripping on perl 3552 # use a peculiar iteration method to avoid tripping on perl
2863 # refcount bugs in for. also avoids problems with players 3553 # refcount bugs in for. also avoids problems with players
2864 # and maps saved/destroyed asynchronously. 3554 # and maps saved/destroyed asynchronously.
2865 warn "begin emergency player save\n"; 3555 warn "emergency_perl_save: begin player save\n";
2866 for my $login (keys %cf::PLAYER) { 3556 for my $login (keys %cf::PLAYER) {
2867 my $pl = $cf::PLAYER{$login} or next; 3557 my $pl = $cf::PLAYER{$login} or next;
2868 $pl->valid or next; 3558 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2869 $pl->save; 3560 $pl->save;
2870 } 3561 }
2871 warn "end emergency player save\n"; 3562 warn "emergency_perl_save: end player save\n";
2872 3563
2873 warn "begin emergency map save\n"; 3564 warn "emergency_perl_save: begin map save\n";
2874 for my $path (keys %cf::MAP) { 3565 for my $path (keys %cf::MAP) {
2875 my $map = $cf::MAP{$path} or next; 3566 my $map = $cf::MAP{$path} or next;
2876 $map->valid or next; 3567 $map->valid or next;
2877 $map->save; 3568 $map->save;
2878 } 3569 }
2879 warn "end emergency map save\n"; 3570 warn "emergency_perl_save: end map save\n";
2880 3571
2881 warn "begin emergency database checkpoint\n"; 3572 warn "emergency_perl_save: begin database checkpoint\n";
2882 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
2883 warn "end emergency database checkpoint\n"; 3574 warn "emergency_perl_save: end database checkpoint\n";
3575
3576 warn "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1;
3578 warn "emergency_perl_save: end write uuid\n";
2884 }; 3579 };
2885 3580
3581 warn "emergency_perl_save: starting sync()\n";
3582 IO::AIO::aio_sync sub {
3583 warn "emergency_perl_save: finished sync()\n";
3584 };
3585
2886 warn "leave emergency perl save\n"; 3586 warn "emergency_perl_save: leave\n";
2887} 3587}
2888 3588
2889sub post_cleanup { 3589sub post_cleanup {
2890 my ($make_core) = @_; 3590 my ($make_core) = @_;
2891 3591
2892 warn Carp::longmess "post_cleanup backtrace" 3592 warn Carp::longmess "post_cleanup backtrace"
2893 if $make_core; 3593 if $make_core;
3594
3595 my $fh = pidfile;
3596 unlink $PIDFILE if <$fh> == $$;
3597}
3598
3599# a safer delete_package, copied from Symbol
3600sub clear_package($) {
3601 my $pkg = shift;
3602
3603 # expand to full symbol table name if needed
3604 unless ($pkg =~ /^main::.*::$/) {
3605 $pkg = "main$pkg" if $pkg =~ /^::/;
3606 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3607 $pkg .= '::' unless $pkg =~ /::$/;
3608 }
3609
3610 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3611 my $stem_symtab = *{$stem}{HASH};
3612
3613 defined $stem_symtab and exists $stem_symtab->{$leaf}
3614 or return;
3615
3616 # clear all symbols
3617 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3618 for my $name (keys %$leaf_symtab) {
3619 _gv_clear *{"$pkg$name"};
3620# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3621 }
3622 warn "cleared package $pkg\n";#d#
2894} 3623}
2895 3624
2896sub do_reload_perl() { 3625sub do_reload_perl() {
2897 # can/must only be called in main 3626 # can/must only be called in main
2898 if ($Coro::current != $Coro::main) { 3627 if ($Coro::current != $Coro::main) {
2899 warn "can only reload from main coroutine"; 3628 warn "can only reload from main coroutine";
2900 return; 3629 return;
2901 } 3630 }
2902 3631
3632 return if $RELOAD++;
3633
3634 my $t1 = EV::time;
3635
3636 while ($RELOAD) {
2903 warn "reloading..."; 3637 warn "reloading...";
2904 3638
2905 warn "entering sync_job"; 3639 warn "entering sync_job";
2906 3640
2907 cf::sync_job { 3641 cf::sync_job {
2908 cf::write_runtime; # external watchdog should not bark 3642 cf::write_runtime_sync; # external watchdog should not bark
2909 cf::emergency_save; 3643 cf::emergency_save;
2910 cf::write_runtime; # external watchdog should not bark 3644 cf::write_runtime_sync; # external watchdog should not bark
2911 3645
2912 warn "syncing database to disk"; 3646 warn "syncing database to disk";
2913 BDB::db_env_txn_checkpoint $DB_ENV; 3647 BDB::db_env_txn_checkpoint $DB_ENV;
2914 3648
2915 # if anything goes wrong in here, we should simply crash as we already saved 3649 # if anything goes wrong in here, we should simply crash as we already saved
2916 3650
2917 warn "cancelling all WF_AUTOCANCEL watchers";
2918 for (Event::all_watchers) {
2919 $_->cancel if $_->data & WF_AUTOCANCEL;
2920 }
2921
2922 warn "flushing outstanding aio requests"; 3651 warn "flushing outstanding aio requests";
2923 for (;;) {
2924 BDB::flush;
2925 IO::AIO::flush;
2926 Coro::cede;
2927 last unless IO::AIO::nreqs || BDB::nreqs; 3652 while (IO::AIO::nreqs || BDB::nreqs) {
2928 warn "iterate..."; 3653 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2929 }
2930
2931 ++$RELOAD;
2932
2933 warn "cancelling all extension coros";
2934 $_->cancel for values %EXT_CORO;
2935 %EXT_CORO = ();
2936
2937 warn "removing commands";
2938 %COMMAND = ();
2939
2940 warn "removing ext/exti commands";
2941 %EXTCMD = ();
2942 %EXTICMD = ();
2943
2944 warn "unloading/nuking all extensions";
2945 for my $pkg (@EXTS) {
2946 warn "... unloading $pkg";
2947
2948 if (my $cb = $pkg->can ("unload")) {
2949 eval {
2950 $cb->($pkg);
2951 1
2952 } or warn "$pkg unloaded, but with errors: $@";
2953 } 3654 }
2954 3655
2955 warn "... nuking $pkg"; 3656 warn "cancelling all extension coros";
2956 Symbol::delete_package $pkg; 3657 $_->cancel for values %EXT_CORO;
2957 } 3658 %EXT_CORO = ();
2958 3659
2959 warn "unloading all perl modules loaded from $LIBDIR"; 3660 warn "removing commands";
2960 while (my ($k, $v) = each %INC) { 3661 %COMMAND = ();
2961 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2962 3662
3663 warn "removing ext/exti commands";
3664 %EXTCMD = ();
3665 %EXTICMD = ();
3666
3667 warn "unloading/nuking all extensions";
3668 for my $pkg (@EXTS) {
2963 warn "... unloading $k"; 3669 warn "... unloading $pkg";
2964 delete $INC{$k};
2965 3670
2966 $k =~ s/\.pm$//;
2967 $k =~ s/\//::/g;
2968
2969 if (my $cb = $k->can ("unload_module")) { 3671 if (my $cb = $pkg->can ("unload")) {
3672 eval {
2970 $cb->(); 3673 $cb->($pkg);
3674 1
3675 } or warn "$pkg unloaded, but with errors: $@";
3676 }
3677
3678 warn "... clearing $pkg";
3679 clear_package $pkg;
2971 } 3680 }
2972 3681
2973 Symbol::delete_package $k; 3682 warn "unloading all perl modules loaded from $LIBDIR";
3683 while (my ($k, $v) = each %INC) {
3684 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3685
3686 warn "... unloading $k";
3687 delete $INC{$k};
3688
3689 $k =~ s/\.pm$//;
3690 $k =~ s/\//::/g;
3691
3692 if (my $cb = $k->can ("unload_module")) {
3693 $cb->();
3694 }
3695
3696 clear_package $k;
2974 } 3697 }
2975 3698
2976 warn "getting rid of safe::, as good as possible"; 3699 warn "getting rid of safe::, as good as possible";
2977 Symbol::delete_package "safe::$_" 3700 clear_package "safe::$_"
2978 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3701 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2979 3702
2980 warn "unloading cf.pm \"a bit\""; 3703 warn "unloading cf.pm \"a bit\"";
2981 delete $INC{"cf.pm"}; 3704 delete $INC{"cf.pm"};
2982 delete $INC{"cf/pod.pm"}; 3705 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2983 3706
2984 # don't, removes xs symbols, too, 3707 # don't, removes xs symbols, too,
2985 # and global variables created in xs 3708 # and global variables created in xs
2986 #Symbol::delete_package __PACKAGE__; 3709 #clear_package __PACKAGE__;
2987 3710
2988 warn "unload completed, starting to reload now"; 3711 warn "unload completed, starting to reload now";
2989 3712
2990 warn "reloading cf.pm"; 3713 warn "reloading cf.pm";
2991 require cf; 3714 require cf;
2992 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2993 3716
2994 warn "loading config and database again"; 3717 warn "loading config and database again";
2995 cf::cfg_load; 3718 cf::reload_config;
2996 3719
2997 warn "loading extensions"; 3720 warn "loading extensions";
2998 cf::load_extensions; 3721 cf::load_extensions;
2999 3722
3723 if ($REATTACH_ON_RELOAD) {
3000 warn "reattaching attachments to objects/players"; 3724 warn "reattaching attachments to objects/players";
3001 _global_reattach; # objects, sockets 3725 _global_reattach; # objects, sockets
3002 warn "reattaching attachments to maps"; 3726 warn "reattaching attachments to maps";
3003 reattach $_ for values %MAP; 3727 reattach $_ for values %MAP;
3004 warn "reattaching attachments to players"; 3728 warn "reattaching attachments to players";
3005 reattach $_ for values %PLAYER; 3729 reattach $_ for values %PLAYER;
3730 }
3006 3731
3732 warn "running post_init jobs";
3733 (pop @POST_INIT)->(1) while @POST_INIT;
3734
3007 warn "leaving sync_job"; 3735 warn "leaving sync_job";
3008 3736
3009 1 3737 1
3010 } or do { 3738 } or do {
3011 warn $@; 3739 warn $@;
3012 warn "error while reloading, exiting."; 3740 cf::cleanup "error while reloading, exiting.";
3013 exit 1;
3014 }; 3741 };
3015 3742
3016 warn "reloaded"; 3743 warn "reloaded";
3744 --$RELOAD;
3745 }
3746
3747 $t1 = EV::time - $t1;
3748 warn "reload completed in ${t1}s\n";
3017}; 3749};
3018 3750
3019our $RELOAD_WATCHER; # used only during reload 3751our $RELOAD_WATCHER; # used only during reload
3020 3752
3021sub reload_perl() { 3753sub reload_perl() {
3022 # doing reload synchronously and two reloads happen back-to-back, 3754 # doing reload synchronously and two reloads happen back-to-back,
3023 # coro crashes during coro_state_free->destroy here. 3755 # coro crashes during coro_state_free->destroy here.
3024 3756
3025 $RELOAD_WATCHER ||= Event->timer ( 3757 $RELOAD_WATCHER ||= cf::async {
3026 reentrant => 0, 3758 Coro::AIO::aio_wait cache_extensions;
3027 after => 0, 3759
3028 data => WF_AUTOCANCEL, 3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3029 cb => sub {
3030 do_reload_perl; 3761 do_reload_perl;
3031 undef $RELOAD_WATCHER; 3762 undef $RELOAD_WATCHER;
3032 }, 3763 };
3033 ); 3764 };
3034} 3765}
3035 3766
3036register_command "reload" => sub { 3767register_command "reload" => sub {
3037 my ($who, $arg) = @_; 3768 my ($who, $arg) = @_;
3038 3769
3039 if ($who->flag (FLAG_WIZ)) { 3770 if ($who->flag (FLAG_WIZ)) {
3040 $who->message ("reloading server."); 3771 $who->message ("reloading server.");
3772 async {
3773 $Coro::current->{desc} = "perl_reload";
3041 async { reload_perl }; 3774 reload_perl;
3775 };
3042 } 3776 }
3043}; 3777};
3044 3778
3045unshift @INC, $LIBDIR; 3779unshift @INC, $LIBDIR;
3046 3780
… …
3048 3782
3049our @WAIT_FOR_TICK; 3783our @WAIT_FOR_TICK;
3050our @WAIT_FOR_TICK_BEGIN; 3784our @WAIT_FOR_TICK_BEGIN;
3051 3785
3052sub wait_for_tick { 3786sub wait_for_tick {
3053 return unless $TICK_WATCHER->is_active;
3054 return if $Coro::current == $Coro::main; 3787 return if tick_inhibit || $Coro::current == $Coro::main;
3055 3788
3056 my $signal = new Coro::Signal; 3789 my $signal = new Coro::Signal;
3057 push @WAIT_FOR_TICK, $signal; 3790 push @WAIT_FOR_TICK, $signal;
3058 $signal->wait; 3791 $signal->wait;
3059} 3792}
3060 3793
3061sub wait_for_tick_begin { 3794sub wait_for_tick_begin {
3062 return unless $TICK_WATCHER->is_active;
3063 return if $Coro::current == $Coro::main; 3795 return if tick_inhibit || $Coro::current == $Coro::main;
3064 3796
3065 my $signal = new Coro::Signal; 3797 my $signal = new Coro::Signal;
3066 push @WAIT_FOR_TICK_BEGIN, $signal; 3798 push @WAIT_FOR_TICK_BEGIN, $signal;
3067 $signal->wait; 3799 $signal->wait;
3068} 3800}
3069 3801
3070 my $min = 1e6;#d# 3802sub tick {
3071 my $avg = 10;
3072$TICK_WATCHER = Event->timer (
3073 reentrant => 0,
3074 parked => 1,
3075 prio => 0,
3076 at => $NEXT_TICK || $TICK,
3077 data => WF_AUTOCANCEL,
3078 cb => sub {
3079 if ($Coro::current != $Coro::main) { 3803 if ($Coro::current != $Coro::main) {
3080 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3804 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3081 unless ++$bug_warning > 10; 3805 unless ++$bug_warning > 10;
3082 return; 3806 return;
3083 } 3807 }
3084 3808
3085 $NOW = $tick_start = Event::time;
3086
3087 cf::server_tick; # one server iteration 3809 cf::server_tick; # one server iteration
3088 3810
3089 0 && sync_job {#d# 3811 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3090 for(1..10) { 3812 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3091 my $t = Event::time; 3813 Coro::async_pool {
3092 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3814 $Coro::current->{desc} = "runtime saver";
3093 or die; 3815 write_runtime_sync
3094 3816 or warn "ERROR: unable to write runtime file: $!";
3095 $map->width (50);
3096 $map->height (50);
3097 $map->alloc;
3098 $map->_load_objects ("/tmp/x.map", 1);
3099 my $t = Event::time - $t;
3100
3101 #next unless $t < 0.0013;#d#
3102 if ($t < $min) {
3103 $min = $t;
3104 }
3105 $avg = $avg * 0.99 + $t * 0.01;
3106 }
3107 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3108 exit 0;
3109 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3110 }; 3817 };
3818 }
3111 3819
3112 $RUNTIME += $TICK;
3113 $NEXT_TICK += $TICK;
3114
3115 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3116 $NEXT_RUNTIME_WRITE = $NOW + 10;
3117 Coro::async_pool {
3118 write_runtime
3119 or warn "ERROR: unable to write runtime file: $!";
3120 };
3121 }
3122
3123# my $AFTER = Event::time;
3124# warn $AFTER - $NOW;#d#
3125
3126 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3820 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3127 $sig->send; 3821 $sig->send;
3128 } 3822 }
3129 while (my $sig = shift @WAIT_FOR_TICK) { 3823 while (my $sig = shift @WAIT_FOR_TICK) {
3130 $sig->send; 3824 $sig->send;
3131 } 3825 }
3132 3826
3133 $NOW = Event::time; 3827 $LOAD = ($NOW - $TICK_START) / $TICK;
3134
3135 # if we are delayed by four ticks or more, skip them all
3136 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3137
3138 $TICK_WATCHER->at ($NEXT_TICK);
3139 $TICK_WATCHER->start;
3140
3141 $LOAD = ($NOW - $tick_start) / $TICK;
3142 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3828 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3143 3829
3144 _post_tick; 3830 if (0) {
3145 3831 if ($NEXT_TICK) {
3146 3832 my $jitter = $TICK_START - $NEXT_TICK;
3833 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3834 warn "jitter $JITTER\n";#d#
3835 }
3147 }, 3836 }
3148); 3837}
3149 3838
3150{ 3839{
3151 BDB::max_poll_time $TICK * 0.1; 3840 # configure BDB
3152 $BDB_POLL_WATCHER = Event->io ( 3841
3153 reentrant => 0,
3154 fd => BDB::poll_fileno,
3155 poll => 'r',
3156 prio => 0,
3157 data => WF_AUTOCANCEL,
3158 cb => \&BDB::poll_cb,
3159 );
3160 BDB::min_parallel 8; 3842 BDB::min_parallel 8;
3161 3843 BDB::max_poll_reqs $TICK * 0.1;
3162 BDB::set_sync_prepare { 3844 $AnyEvent::BDB::WATCHER->priority (1);
3163 my $status;
3164 my $current = $Coro::current;
3165 (
3166 sub {
3167 $status = $!;
3168 $current->ready; undef $current;
3169 },
3170 sub {
3171 Coro::schedule while defined $current;
3172 $! = $status;
3173 },
3174 )
3175 };
3176 3845
3177 unless ($DB_ENV) { 3846 unless ($DB_ENV) {
3178 $DB_ENV = BDB::db_env_create; 3847 $DB_ENV = BDB::db_env_create;
3848 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3849 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3850 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3851 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3852 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3179 3853
3180 cf::sync_job { 3854 cf::sync_job {
3181 eval { 3855 eval {
3182 BDB::db_env_open 3856 BDB::db_env_open
3183 $DB_ENV, 3857 $DB_ENV,
… …
3185 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3859 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3186 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3860 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3187 0666; 3861 0666;
3188 3862
3189 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3863 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3190
3191 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3192 $DB_ENV->set_lk_detect;
3193 }; 3864 };
3194 3865
3195 cf::cleanup "db_env_open(db): $@" if $@; 3866 cf::cleanup "db_env_open(db): $@" if $@;
3196 }; 3867 };
3197 } 3868 }
3869
3870 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3871 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3872 };
3873 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3874 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3875 };
3876 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3877 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3878 };
3198} 3879}
3199 3880
3200{ 3881{
3882 # configure IO::AIO
3883
3201 IO::AIO::min_parallel 8; 3884 IO::AIO::min_parallel 8;
3202
3203 undef $Coro::AIO::WATCHER;
3204 IO::AIO::max_poll_time $TICK * 0.1; 3885 IO::AIO::max_poll_time $TICK * 0.1;
3205 $AIO_POLL_WATCHER = Event->io ( 3886 undef $AnyEvent::AIO::WATCHER;
3206 reentrant => 0,
3207 data => WF_AUTOCANCEL,
3208 fd => IO::AIO::poll_fileno,
3209 poll => 'r',
3210 prio => 6,
3211 cb => \&IO::AIO::poll_cb,
3212 );
3213} 3887}
3214 3888
3215my $_log_backtrace; 3889my $_log_backtrace;
3216 3890
3217sub _log_backtrace { 3891sub _log_backtrace {
… …
3220 $msg =~ s/\n//; 3894 $msg =~ s/\n//;
3221 3895
3222 # limit the # of concurrent backtraces 3896 # limit the # of concurrent backtraces
3223 if ($_log_backtrace < 2) { 3897 if ($_log_backtrace < 2) {
3224 ++$_log_backtrace; 3898 ++$_log_backtrace;
3899 my $perl_bt = Carp::longmess $msg;
3225 async { 3900 async {
3901 $Coro::current->{desc} = "abt $msg";
3902
3226 my @bt = fork_call { 3903 my @bt = fork_call {
3227 @addr = map { sprintf "%x", $_ } @addr; 3904 @addr = map { sprintf "%x", $_ } @addr;
3228 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3905 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3229 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3906 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3230 or die "addr2line: $!"; 3907 or die "addr2line: $!";
… …
3238 } 3915 }
3239 3916
3240 @funcs 3917 @funcs
3241 }; 3918 };
3242 3919
3243 LOG llevInfo, "[ABT] $msg\n"; 3920 LOG llevInfo, "[ABT] $perl_bt\n";
3921 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3244 LOG llevInfo, "[ABT] $_\n" for @bt; 3922 LOG llevInfo, "[ABT] $_\n" for @bt;
3245 --$_log_backtrace; 3923 --$_log_backtrace;
3246 }; 3924 };
3247 } else { 3925 } else {
3248 LOG llevInfo, "[ABT] $msg\n"; 3926 LOG llevInfo, "[ABT] $msg\n";
3249 LOG llevInfo, "[ABT] [suppressed]\n"; 3927 LOG llevInfo, "[ABT] [suppressed]\n";
3250 } 3928 }
3251} 3929}
3252 3930
3253# load additional modules 3931# load additional modules
3254use cf::pod; 3932require "cf/$_.pm" for @EXTRA_MODULES;
3255 3933
3256END { cf::emergency_save } 3934END { cf::emergency_save }
3257 3935
32581 39361
3259 3937

Diff Legend

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