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.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.470 by root, Sun Apr 26 19:42:45 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
53use JSON::XS 2.01 ();
25use BDB (); 54use BDB ();
26use Data::Dumper; 55use Data::Dumper;
27use Digest::MD5; 56use Digest::MD5;
28use Fcntl; 57use Fcntl;
29use YAML::Syck (); 58use YAML ();
30use IO::AIO 2.32 (); 59use IO::AIO ();
31use Time::HiRes; 60use Time::HiRes;
32use Compress::LZF; 61use Compress::LZF;
62use Digest::MD5 ();
63
64AnyEvent::detect;
33 65
34# configure various modules to our taste 66# configure various modules to our taste
35# 67#
36$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
37Coro::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";
38Compress::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
39
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 76
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 78
49our %COMMAND = (); 79our %COMMAND = ();
50our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
… …
53our %EXTCMD = (); 83our %EXTCMD = ();
54our %EXTICMD = (); 84our %EXTICMD = ();
55our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
56our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
57 87
58our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
59our @EVENT; 89our @EVENT;
60 90
61our $CONFDIR = confdir; 91our $CONFDIR = confdir;
62our $DATADIR = datadir; 92our $DATADIR = datadir;
63our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
64our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
65our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
66our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
67our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
68our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
69our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
70our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
71our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
105our %RESOURCE;
72 106
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 109our $NEXT_TICK;
78our $NOW;
79our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default on
80 111
112our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER;
81our $BDB_POLL_WATCHER; 114our $BDB_TRICKLE_WATCHER;
82our $DB_ENV; 115our $DB_ENV;
116
117our @EXTRA_MODULES = qw(pod mapscript);
83 118
84our %CFG; 119our %CFG;
85 120
86our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
87our $RUNTIME; 122our $RUNTIME;
123our $NOW;
88 124
89our %PLAYER; # all users 125our (%PLAYER, %PLAYER_LOADING); # all users
90our %MAP; # all maps 126our (%MAP, %MAP_LOADING ); # all maps
91our $LINK_MAP; # the special {link} map, which is always available 127our $LINK_MAP; # the special {link} map, which is always available
92 128
93# 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 ∕
94our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 130our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
95 131
96our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
97our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
134our $JITTER; # average jitter
98our $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)
99 140
100binmode STDOUT; 141binmode STDOUT;
101binmode STDERR; 142binmode STDERR;
102 143
103# read virtual server time, if available 144# read virtual server time, if available
104unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
105 open my $fh, "<", "$LOCALDIR/runtime" 146 open my $fh, "<", $RUNTIMEFILE
106 or die "unable to read runtime file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
107 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
108} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
109 152
110mkdir $_ 153mkdir $_
111 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
112 155
113our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
… …
156 199
157The raw value load value from the last tick. 200The raw value load value from the last tick.
158 201
159=item %cf::CFG 202=item %cf::CFG
160 203
161Configuration for the server, loaded from C</etc/crossfire/config>, or 204Configuration for the server, loaded from C</etc/deliantra-server/config>, or
162from wherever your confdir points to. 205from wherever your confdir points to.
163 206
164=item cf::wait_for_tick, cf::wait_for_tick_begin 207=item cf::wait_for_tick, cf::wait_for_tick_begin
165 208
166These 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
167returns 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
168per 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.
169 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
170=back 219=back
171 220
172=cut 221=cut
173 222
174BEGIN { 223BEGIN {
… …
178 $msg .= "\n" 227 $msg .= "\n"
179 unless $msg =~ /\n$/; 228 unless $msg =~ /\n$/;
180 229
181 $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;
182 231
183 utf8::encode $msg;
184 LOG llevError, $msg; 232 LOG llevError, $msg;
185 }; 233 };
186} 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#?
187 250
188@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
189@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
190@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
191@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
198for my $pkg (qw( 261for my $pkg (qw(
199 cf::global cf::attachable 262 cf::global cf::attachable
200 cf::object cf::object::player 263 cf::object cf::object::player
201 cf::client cf::player 264 cf::client cf::player
202 cf::arch cf::living 265 cf::arch cf::living
266 cf::map cf::mapspace
203 cf::map cf::party cf::region 267 cf::party cf::region
204)) { 268)) {
205 no strict 'refs';
206 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
207} 270}
208 271
209$Event::DIED = sub { 272$EV::DIED = sub {
210 warn "error in event callback: @_"; 273 warn "error in event callback: @_";
211}; 274};
212 275
213############################################################################# 276#############################################################################
214 277
… …
237 $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;
238 $d 301 $d
239 } || "[unable to dump $_[0]: '$@']"; 302 } || "[unable to dump $_[0]: '$@']";
240} 303}
241 304
242use JSON::XS ();
243
244=item $ref = cf::from_json $json 305=item $ref = cf::decode_json $json
245 306
246Converts a JSON string into the corresponding perl data structure. 307Converts a JSON string into the corresponding perl data structure.
247 308
248=item $json = cf::to_json $ref 309=item $json = cf::encode_json $ref
249 310
250Converts a perl data structure into its JSON representation. 311Converts a perl data structure into its JSON representation.
251 312
252=cut 313=cut
253 314
254our $json_coder = JSON::XS->new->convert_blessed->utf8; 315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 316
256sub to_json ($) { $json_coder->encode ($_[0]) } 317sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 318sub decode_json($) { $json_coder->decode ($_[0]) }
319
320=item cf::post_init { BLOCK }
321
322Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again.
324
325The cdoeblock will have a single boolean argument to indicate whether this
326is a reload or not.
327
328=cut
329
330sub post_init(&) {
331 push @POST_INIT, shift;
332}
258 333
259=item cf::lock_wait $string 334=item cf::lock_wait $string
260 335
261Wait until the given lock is available. See cf::lock_acquire. 336Wait until the given lock is available. See cf::lock_acquire.
262 337
263=item my $lock = cf::lock_acquire $string 338=item my $lock = cf::lock_acquire $string
264 339
265Wait until the given lock is available and then acquires it and returns 340Wait until the given lock is available and then acquires it and returns
266a Coro::guard object. If the guard object gets destroyed (goes out of scope, 341a L<Guard> object. If the guard object gets destroyed (goes out of scope,
267for example when the coroutine gets canceled), the lock is automatically 342for example when the coroutine gets canceled), the lock is automatically
268returned. 343returned.
269 344
345Locks are *not* recursive, locking from the same coro twice results in a
346deadlocked coro.
347
270Lock names should begin with a unique identifier (for example, cf::map::find 348Lock names should begin with a unique identifier (for example, cf::map::find
271uses map_find and cf::map::load uses map_load). 349uses map_find and cf::map::load uses map_load).
272 350
273=item $locked = cf::lock_active $string 351=item $locked = cf::lock_active $string
274 352
275Return true if the lock is currently active, i.e. somebody has locked it. 353Return true if the lock is currently active, i.e. somebody has locked it.
276 354
277=cut 355=cut
278 356
279our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
280 358
281sub lock_wait($) { 359sub lock_wait($) {
282 my ($key) = @_; 360 $LOCKS->wait ($_[0]);
283
284 # wait for lock, if any
285 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule;
288 }
289} 361}
290 362
291sub lock_acquire($) { 363sub lock_acquire($) {
292 my ($key) = @_; 364 $LOCKS->guard ($_[0])
293
294 # wait, to be sure we are not locked
295 lock_wait $key;
296
297 $LOCK{$key} = [];
298
299 Coro::guard {
300 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} };
302 }
303} 365}
304 366
305sub lock_active($) { 367sub lock_active($) {
306 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
307
308 ! ! $LOCK{$key}
309} 369}
310 370
311sub freeze_mainloop { 371sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 372 tick_inhibit_inc;
313 373
314 my $guard = Coro::guard { 374 &Guard::guard (\&tick_inhibit_dec);
315 $TICK_WATCHER->start; 375}
376
377=item cf::periodic $interval, $cb
378
379Like EV::periodic, but randomly selects a starting point so that the actions
380get spread over timer.
381
382=cut
383
384sub periodic($$) {
385 my ($interval, $cb) = @_;
386
387 my $start = rand List::Util::min 180, $interval;
388
389 EV::periodic $start, $interval, 0, $cb
390}
391
392=item cf::get_slot $time[, $priority[, $name]]
393
394Allocate $time seconds of blocking CPU time at priority C<$priority>:
395This call blocks and returns only when you have at least C<$time> seconds
396of cpu time till the next tick. The slot is only valid till the next cede.
397
398The optional C<$name> can be used to identify the job to run. It might be
399used for statistical purposes and should identify the same time-class.
400
401Useful for short background jobs.
402
403=cut
404
405our @SLOT_QUEUE;
406our $SLOT_QUEUE;
407
408$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager");
411
412 my $signal = new Coro::Signal;
413
414 while () {
415 next_job:
416 my $avail = cf::till_tick;
417 if ($avail > 0.01) {
418 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) {
420 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send;
422 Coro::cede;
423 goto next_job;
424 }
425 }
426 }
427
428 if (@SLOT_QUEUE) {
429 # we do not use wait_for_tick() as it returns immediately when tick is inactive
430 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait;
432 } else {
433 Coro::schedule;
434 }
316 }; 435 }
317 $TICK_WATCHER->stop; 436};
318 $guard 437
438sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main;
440
441 my ($time, $pri, $name) = @_;
442
443 $time = $TICK * .6 if $time > $TICK * .6;
444 my $sig = new Coro::Signal;
445
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready;
449 $sig->wait;
319} 450}
320 451
321=item cf::async { BLOCK } 452=item cf::async { BLOCK }
322 453
323Currently the same as Coro::async_pool, meaning you cannot use 454Currently the same as Coro::async_pool, meaning you cannot use
… …
328 459
329BEGIN { *async = \&Coro::async_pool } 460BEGIN { *async = \&Coro::async_pool }
330 461
331=item cf::sync_job { BLOCK } 462=item cf::sync_job { BLOCK }
332 463
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 464The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 465is always able to handle events or runnable, as Deliantra is only
335partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 466partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable. 467acceptable.
337 468
338If it must be done, put the blocking parts into C<sync_job>. This will run 469If it must be done, put the blocking parts into C<sync_job>. This will run
339the given BLOCK in another coroutine while waiting for the result. The 470the given BLOCK in another coroutine while waiting for the result. The
… …
344 475
345sub sync_job(&) { 476sub sync_job(&) {
346 my ($job) = @_; 477 my ($job) = @_;
347 478
348 if ($Coro::current == $Coro::main) { 479 if ($Coro::current == $Coro::main) {
349 my $time = Event::time; 480 my $time = EV::time;
350 481
351 # this is the main coro, too bad, we have to block 482 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 483 # till the operation succeeds, freezing the server :/
353 484
354 # TODO: use suspend/resume instead 485 LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 486
356 my $freeze_guard = freeze_mainloop; 487 my $freeze_guard = freeze_mainloop;
357 488
358 my $busy = 1; 489 my $busy = 1;
359 my @res; 490 my @res;
360 491
361 (async { 492 (async {
493 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 494 @res = eval { $job->() };
363 warn $@ if $@; 495 warn $@ if $@;
364 undef $busy; 496 undef $busy;
365 })->prio (Coro::PRIO_MAX); 497 })->prio (Coro::PRIO_MAX);
366 498
367 while ($busy) { 499 while ($busy) {
368 Coro::cede or Event::one_event; 500 if (Coro::nready) {
501 Coro::cede_notself;
502 } else {
503 EV::loop EV::LOOP_ONESHOT;
369 } 504 }
505 }
370 506
371 $time = Event::time - $time; 507 my $time = EV::time - $time;
372 508
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 509 $TICK_START += $time; # do not account sync jobs to server load
377 510
378 wantarray ? @res : $res[0] 511 wantarray ? @res : $res[0]
379 } else { 512 } else {
380 # we are in another coroutine, how wonderful, everything just works 513 # we are in another coroutine, how wonderful, everything just works
381 514
… …
406=item fork_call { }, $args 539=item fork_call { }, $args
407 540
408Executes the given code block with the given arguments in a seperate 541Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 542process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 543Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 544never block itself or use any form of event handling.
412 545
413=cut 546=cut
414 547
415sub fork_call(&@) { 548sub fork_call(&@) {
416 my ($cb, @args) = @_; 549 my ($cb, @args) = @_;
417 550
418# 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,
419# or die "socketpair: $!"; 552 # otherwise perl prematurely frees the stuff :/
420 pipe my $fh1, my $fh2 553 # TODO: investigate and fix (likely this will be rather laborious)
421 or die "pipe: $!";
422 554
423 if (my $pid = fork) { 555 my @res = Coro::Util::fork_eval {
424 close $fh2;
425
426 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 die $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 556 reset_signals;
436 local $SIG{__WARN__}; 557 &$cb
437 local $SIG{__DIE__}; 558 }, @args;
438 eval {
439 close $fh1;
440 559
441 my @res = eval { $cb->(@args) }; 560 wantarray ? @res : $res[-1]
442 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 561}
443 };
444 562
445 warn $@ if $@; 563=item $coin = coin_from_name $name
446 _exit 0; 564
447 } 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
448} 588}
449 589
450=item $value = cf::db_get $family => $key 590=item $value = cf::db_get $family => $key
451 591
452Returns a single value from the environment database. 592Returns a single value from the environment database.
… …
454=item cf::db_put $family => $key => $value 594=item cf::db_put $family => $key => $value
455 595
456Stores 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
457data 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).
458 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
459=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}
460 622
461our $DB; 623our $DB;
462 624
463sub db_init { 625sub db_init {
464 unless ($DB) {
465 $DB = BDB::db_create $DB_ENV;
466
467 cf::sync_job { 626 cf::sync_job {
468 eval { 627 $DB ||= db_table "db";
469 $DB->set_flags (BDB::CHKSUM);
470
471 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
472 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
473 cf::cleanup "db_open(db): $!" if $!;
474 };
475 cf::cleanup "db_open(db): $@" if $@;
476 };
477 } 628 };
478} 629}
479 630
480sub db_get($$) { 631sub db_get($$) {
481 my $key = "$_[0]/$_[1]"; 632 my $key = "$_[0]/$_[1]";
482 633
… …
532 if (1) { 683 if (1) {
533 $md5 = 684 $md5 =
534 join "\x00", 685 join "\x00",
535 $processversion, 686 $processversion,
536 map { 687 map {
537 Coro::cede; 688 cf::cede_to_tick;
538 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 689 ($src->[$_], Digest::MD5::md5_hex $data[$_])
539 } 0.. $#$src; 690 } 0.. $#$src;
540 691
541 692
542 my $dbmd5 = db_get cache => "$id/md5"; 693 my $dbmd5 = db_get cache => "$id/md5";
… …
580 731
581############################################################################# 732#############################################################################
582 733
583=head2 ATTACHABLE OBJECTS 734=head2 ATTACHABLE OBJECTS
584 735
585Many 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
586attach callbacks/event handlers (a collection of which is called an "attachment") 737attach callbacks/event handlers (a collection of which is called an "attachment")
587to it. All such attachable objects support the following methods. 738to it. All such attachable objects support the following methods.
588 739
589In 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>
590C<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
591Crossfire TRT). 742Deliantra).
592 743
593=over 4 744=over 4
594 745
595=item $attachable->attach ($attachment, key => $value...) 746=item $attachable->attach ($attachment, key => $value...)
596 747
… …
640=item cf::CLASS::attachment $name, ... 791=item cf::CLASS::attachment $name, ...
641 792
642Register an attachment by C<$name> through which attachable objects of the 793Register an attachment by C<$name> through which attachable objects of the
643given CLASS can refer to this attachment. 794given CLASS can refer to this attachment.
644 795
645Some classes such as crossfire maps and objects can specify attachments 796Some classes such as deliantra maps and objects can specify attachments
646that 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.
647 798
648These calls expect any number of the following handler/hook descriptions: 799These calls expect any number of the following handler/hook descriptions:
649 800
650=over 4 801=over 4
… …
848 "; 999 ";
849 die if $@; 1000 die if $@;
850} 1001}
851 1002
852our $override; 1003our $override;
853our @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?
854 1005
855sub override { 1006sub override {
856 $override = 1; 1007 $override = 1;
857 @invoke_results = (); 1008 @INVOKE_RESULTS = (@_);
858} 1009}
859 1010
860sub do_invoke { 1011sub do_invoke {
861 my $event = shift; 1012 my $event = shift;
862 my $callbacks = shift; 1013 my $callbacks = shift;
863 1014
864 @invoke_results = (); 1015 @INVOKE_RESULTS = ();
865 1016
866 local $override; 1017 local $override;
867 1018
868 for (@$callbacks) { 1019 for (@$callbacks) {
869 eval { &{$_->[1]} }; 1020 eval { &{$_->[1]} };
… …
878 } 1029 }
879 1030
880 0 1031 0
881} 1032}
882 1033
883=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1034=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
884 1035
885=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1036=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
886 1037
887Generate an object-specific event with the given arguments. 1038Generate an object-specific event with the given arguments.
888 1039
889This 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
890removed 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
891results (if you must, access C<@cf::invoke_results> directly). 1042results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892 1043
893=back 1044=back
894 1045
895=cut 1046=cut
896 1047
897############################################################################# 1048#############################################################################
898# 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}
899 1092
900sub reattach { 1093sub reattach {
901 # basically do the same as instantiate, without calling instantiate 1094 # basically do the same as instantiate, without calling instantiate
902 my ($obj) = @_; 1095 my ($obj) = @_;
903 1096
1097 # no longer needed after getting rid of delete_package?
904 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
905 1099
906 my $registry = $obj->registry; 1100 my $registry = $obj->registry;
907 1101
908 @$registry = (); 1102 @$registry = ();
909 1103
… …
924cf::attachable->attach ( 1118cf::attachable->attach (
925 prio => -1000000, 1119 prio => -1000000,
926 on_instantiate => sub { 1120 on_instantiate => sub {
927 my ($obj, $data) = @_; 1121 my ($obj, $data) = @_;
928 1122
929 $data = from_json $data; 1123 $data = decode_json $data;
930 1124
931 for (@$data) { 1125 for (@$data) {
932 my ($name, $args) = @$_; 1126 my ($name, $args) = @$_;
933 1127
934 $obj->attach ($name, %{$args || {} }); 1128 $obj->attach ($name, %{$args || {} });
… …
950sub object_freezer_save { 1144sub object_freezer_save {
951 my ($filename, $rdata, $objs) = @_; 1145 my ($filename, $rdata, $objs) = @_;
952 1146
953 sync_job { 1147 sync_job {
954 if (length $$rdata) { 1148 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename);
955 warn sprintf "saving %s (%d,%d)\n", 1150 warn sprintf "saving %s (%d,%d)\n",
956 $filename, length $$rdata, scalar @$objs; 1151 $decname, length $$rdata, scalar @$objs;
957 1152
958 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
959 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
960 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1157 aio_close $fh;
963 1158
964 if (@$objs) { 1159 if (@$objs) {
965 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) {
966 chmod SAVE_MODE, $fh; 1161 aio_chmod $fh, SAVE_MODE;
967 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
968 aio_write $fh, 0, (length $data), $data, 0; 1163 aio_write $fh, 0, (length $data), $data, 0;
969 aio_fsync $fh if $cf::USE_FSYNC; 1164 aio_fsync $fh if $cf::USE_FSYNC;
970 close $fh; 1165 aio_close $fh;
971 aio_rename "$filename.pst~", "$filename.pst"; 1166 aio_rename "$filename.pst~", "$filename.pst";
972 } 1167 }
973 } else { 1168 } else {
974 aio_unlink "$filename.pst"; 1169 aio_unlink "$filename.pst";
975 } 1170 }
976 1171
977 aio_rename "$filename~", $filename; 1172 aio_rename "$filename~", $filename;
1173
1174 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC;
978 } else { 1176 } else {
979 warn "FATAL: $filename~: $!\n"; 1177 warn "unable to save objects: $filename~: $!\n";
980 } 1178 }
981 } else { 1179 } else {
982 aio_unlink $filename; 1180 aio_unlink $filename;
983 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
984 } 1182 }
985 } 1183 };
986} 1184}
987 1185
988sub object_freezer_as_string { 1186sub object_freezer_as_string {
989 my ($rdata, $objs) = @_; 1187 my ($rdata, $objs) = @_;
990 1188
… …
1002 or return; 1200 or return;
1003 1201
1004 unless (aio_stat "$filename.pst") { 1202 unless (aio_stat "$filename.pst") {
1005 (aio_load "$filename.pst", $av) >= 0 1203 (aio_load "$filename.pst", $av) >= 0
1006 or return; 1204 or return;
1205
1007 $av = eval { (Storable::thaw $av)->{objs} }; 1206 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs};
1008 } 1208 }
1009 1209
1210 utf8::decode (my $decname = $filename);
1010 warn sprintf "loading %s (%d)\n", 1211 warn sprintf "loading %s (%d,%d)\n",
1011 $filename, length $data, scalar @{$av || []}; 1212 $decname, length $data, scalar @{$av || []};
1213
1012 return ($data, $av); 1214 ($data, $av)
1013} 1215}
1014 1216
1015=head2 COMMAND CALLBACKS 1217=head2 COMMAND CALLBACKS
1016 1218
1017=over 4 1219=over 4
… …
1071 my ($name, $cb) = @_; 1273 my ($name, $cb) = @_;
1072 1274
1073 $EXTICMD{$name} = $cb; 1275 $EXTICMD{$name} = $cb;
1074} 1276}
1075 1277
1278use File::Glob ();
1279
1076cf::player->attach ( 1280cf::player->attach (
1077 on_command => sub { 1281 on_command => sub {
1078 my ($pl, $name, $params) = @_; 1282 my ($pl, $name, $params) = @_;
1079 1283
1080 my $cb = $COMMAND{$name} 1284 my $cb = $COMMAND{$name}
… …
1087 cf::override; 1291 cf::override;
1088 }, 1292 },
1089 on_extcmd => sub { 1293 on_extcmd => sub {
1090 my ($pl, $buf) = @_; 1294 my ($pl, $buf) = @_;
1091 1295
1092 my $msg = eval { from_json $buf }; 1296 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093 1297
1094 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
1095 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1306 if (my $cb = $EXTCMD{$type}) {
1096 if (my %reply = $cb->($pl, $msg)) { 1307 @reply = $cb->($pl, @payload);
1097 $pl->ext_reply ($msg->{msgid}, %reply);
1098 }
1099 } 1308 }
1309
1310 $pl->ext_reply ($reply, @reply)
1311 if $reply;
1312
1100 } else { 1313 } else {
1101 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1314 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102 } 1315 }
1103 1316
1104 cf::override; 1317 cf::override;
1105 }, 1318 },
1106); 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}
1107 1333
1108sub load_extensions { 1334sub load_extensions {
1109 cf::sync_job { 1335 cf::sync_job {
1110 my %todo; 1336 my %todo;
1111 1337
… …
1131 1357
1132 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1133 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1134 1360
1135 $ext{source} = 1361 $ext{source} =
1136 "package $pkg; use strict; use utf8;\n" 1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1137 . "#line 1 \"$path\"\n{\n" 1363 . "#line 1 \"$path\"\n{\n"
1138 . $source 1364 . $source
1139 . "\n};\n1"; 1365 . "\n};\n1";
1140 1366
1141 $todo{$base} = \%ext; 1367 $todo{$base} = \%ext;
… …
1157 my $msg = $@ ? "$v->{path}: $@\n" 1383 my $msg = $@ ? "$v->{path}: $@\n"
1158 : "$v->{base}: extension inactive.\n"; 1384 : "$v->{base}: extension inactive.\n";
1159 1385
1160 if (exists $v->{meta}{mandatory}) { 1386 if (exists $v->{meta}{mandatory}) {
1161 warn $msg; 1387 warn $msg;
1162 warn "mandatory extension failed to load, exiting.\n"; 1388 cf::cleanup "mandatory extension failed to load, exiting.";
1163 exit 1;
1164 } 1389 }
1165 1390
1166 warn $msg; 1391 warn $msg;
1167 } 1392 }
1168 1393
… …
1182 1407
1183=back 1408=back
1184 1409
1185=head2 CORE EXTENSIONS 1410=head2 CORE EXTENSIONS
1186 1411
1187Functions and methods that extend core crossfire objects. 1412Functions and methods that extend core deliantra objects.
1188 1413
1189=cut 1414=cut
1190 1415
1191package cf::player; 1416package cf::player;
1192 1417
1193use Coro::AIO; 1418use Coro::AIO;
1194 1419
1195=head3 cf::player 1420=head3 cf::player
1196 1421
1197=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}
1198 1437
1199=item cf::player::find $login 1438=item cf::player::find $login
1200 1439
1201Returns the given player object, loading it if necessary (might block). 1440Returns the given player object, loading it if necessary (might block).
1202 1441
… …
1221 1460
1222sub exists($) { 1461sub exists($) {
1223 my ($login) = @_; 1462 my ($login) = @_;
1224 1463
1225 $cf::PLAYER{$login} 1464 $cf::PLAYER{$login}
1226 or cf::sync_job { !aio_stat path $login } 1465 or !aio_stat path $login
1227} 1466}
1228 1467
1229sub find($) { 1468sub find($) {
1230 return $cf::PLAYER{$_[0]} || do { 1469 return $cf::PLAYER{$_[0]} || do {
1231 my $login = $_[0]; 1470 my $login = $_[0];
… …
1238 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1477 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1478 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1479 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241 aio_unlink +(playerdir $login) . "/$login.pl"; 1480 aio_unlink +(playerdir $login) . "/$login.pl";
1242 1481
1243 my $pl = load_pl path $login 1482 my $f = new_from_file cf::object::thawer path $login
1244 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;
1245 $cf::PLAYER{$login} = $pl 1490 $cf::PLAYER{$login} = $pl
1246 } 1491 }
1247 } 1492 }
1248} 1493}
1249 1494
… …
1258 return if $pl->{deny_save}; 1503 return if $pl->{deny_save};
1259 1504
1260 aio_mkdir playerdir $pl, 0770; 1505 aio_mkdir playerdir $pl, 0770;
1261 $pl->{last_save} = $cf::RUNTIME; 1506 $pl->{last_save} = $cf::RUNTIME;
1262 1507
1508 cf::get_slot 0.01;
1509
1263 $pl->save_pl ($path); 1510 $pl->save_pl ($path);
1264 Coro::cede; 1511 cf::cede_to_tick;
1265} 1512}
1266 1513
1267sub new($) { 1514sub new($) {
1268 my ($login) = @_; 1515 my ($login) = @_;
1269 1516
… …
1275 $cf::PLAYER{$login} = $self; 1522 $cf::PLAYER{$login} = $self;
1276 1523
1277 $self 1524 $self
1278} 1525}
1279 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
1280=item $pl->quit_character 1537=item $pl->quit_character
1281 1538
1282Nukes the player without looking back. If logged in, the connection will 1539Nukes the player without looking back. If logged in, the connection will
1283be destroyed. May block for a long time. 1540be destroyed. May block for a long time.
1284 1541
… …
1288 my ($pl) = @_; 1545 my ($pl) = @_;
1289 1546
1290 my $name = $pl->ob->name; 1547 my $name = $pl->ob->name;
1291 1548
1292 $pl->{deny_save} = 1; 1549 $pl->{deny_save} = 1;
1293 $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
1294 1551
1295 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1296 $pl->deactivate; 1553 $pl->deactivate;
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1297 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1556 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1298 $pl->ns->destroy if $pl->ns; 1557 $pl->ns->destroy if $pl->ns;
1299 1558
1300 my $path = playerdir $pl; 1559 my $path = playerdir $pl;
1301 my $temp = "$path~$cf::RUNTIME~deleting~"; 1560 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1337 or return []; 1596 or return [];
1338 1597
1339 my @logins; 1598 my @logins;
1340 1599
1341 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") {
1342 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1606 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1343 aio_read $fh, 0, 512, my $buf, 0 or next; 1607 aio_read $fh, 0, 512, my $buf, 0 or next;
1344 $buf !~ /^password -------------$/m or next; # official not-valid tag 1608 $buf !~ /^password -------------$/m or next; # official not-valid tag
1609 }
1345 1610
1346 utf8::decode $login; 1611 utf8::decode $login;
1347 push @logins, $login; 1612 push @logins, $login;
1348 } 1613 }
1349 1614
… …
1376 } 1641 }
1377 1642
1378 \@paths 1643 \@paths
1379} 1644}
1380 1645
1381=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1646=item $protocol_xml = $player->expand_cfpod ($cfpod)
1382 1647
1383Expand crossfire pod fragments into protocol xml. 1648Expand deliantra pod fragments into protocol xml.
1384 1649
1385=cut
1386
1387sub expand_cfpod {
1388 ((my $self), (local $_)) = @_;
1389
1390 # escape & and <
1391 s/&/&amp;/g;
1392 s/(?<![BIUGH])</&lt;/g;
1393
1394 # this is buggy, it needs to properly take care of nested <'s
1395
1396 1 while
1397 # replace B<>, I<>, U<> etc.
1398 s/B<([^\>]*)>/<b>$1<\/b>/
1399 || s/I<([^\>]*)>/<i>$1<\/i>/
1400 || s/U<([^\>]*)>/<u>$1<\/u>/
1401 # replace G<male|female> tags
1402 || s{G<([^>|]*)\|([^>]*)>}{
1403 $self->gender ? $2 : $1
1404 }ge
1405 # replace H<hint text>
1406 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1407
1408 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g;
1410
1411 $_
1412}
1413
1414=item $player->ext_reply ($msgid, %msg) 1650=item $player->ext_reply ($msgid, @msg)
1415 1651
1416Sends an ext reply to the player. 1652Sends an ext reply to the player.
1417 1653
1418=cut 1654=cut
1419 1655
1420sub ext_reply($$%) { 1656sub ext_reply($$@) {
1421 my ($self, $id, %msg) = @_; 1657 my ($self, $id, @msg) = @_;
1422 1658
1423 $msg{msgid} = $id; 1659 $self->ns->ext_reply ($id, @msg)
1424 $self->send ("ext " . cf::to_json \%msg);
1425} 1660}
1426 1661
1427=item $player->ext_event ($type, %msg) 1662=item $player->ext_msg ($type, @msg)
1428 1663
1429Sends an ext event to the client. 1664Sends an ext event to the client.
1430 1665
1431=cut 1666=cut
1432 1667
1433sub ext_event($$%) { 1668sub ext_msg($$@) {
1434 my ($self, $type, %msg) = @_; 1669 my ($self, $type, @msg) = @_;
1435 1670
1436 $self->ns->ext_event ($type, %msg); 1671 $self->ns->ext_msg ($type, @msg);
1437} 1672}
1438 1673
1439=head3 cf::region 1674=head3 cf::region
1440 1675
1441=over 4 1676=over 4
… …
1454 my ($path) = @_; 1689 my ($path) = @_;
1455 1690
1456 my ($match, $specificity); 1691 my ($match, $specificity);
1457 1692
1458 for my $region (list) { 1693 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1694 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1695 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1696 if $region->specificity > $specificity;
1462 } 1697 }
1463 } 1698 }
1464 1699
… …
1485our $MAX_RESET = 3600; 1720our $MAX_RESET = 3600;
1486our $DEFAULT_RESET = 3000; 1721our $DEFAULT_RESET = 3000;
1487 1722
1488sub generate_random_map { 1723sub generate_random_map {
1489 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
1490 # mit "rum" bekleckern, nicht 1728 # mit "rum" bekleckern, nicht
1491 $self->_create_random_map ( 1729 $self->_create_random_map (
1492 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1493 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1494 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1584 $self->init; # pass $1 etc. 1822 $self->init; # pass $1 etc.
1585 return $self; 1823 return $self;
1586 } 1824 }
1587 } 1825 }
1588 1826
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 1827 Carp::cluck "unable to resolve path '$path' (base '$base').";
1590 () 1828 ()
1591} 1829}
1592 1830
1593sub init { 1831sub init {
1594 my ($self) = @_; 1832 my ($self) = @_;
… …
1616 1854
1617# the temporary/swap location 1855# the temporary/swap location
1618sub save_path { 1856sub save_path {
1619 my ($self) = @_; 1857 my ($self) = @_;
1620 1858
1621 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1622 "$TMPDIR/$path.map" 1860 "$TMPDIR/$path.map"
1623} 1861}
1624 1862
1625# the unique path, undef == no special unique path 1863# the unique path, undef == no special unique path
1626sub uniq_path { 1864sub uniq_path {
1627 my ($self) = @_; 1865 my ($self) = @_;
1628 1866
1629 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1630 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1631}
1632
1633# and all this just because we cannot iterate over
1634# all maps in C++...
1635sub change_all_map_light {
1636 my ($change) = @_;
1637
1638 $_->change_map_light ($change)
1639 for grep $_->outdoor, values %cf::MAP;
1640} 1869}
1641 1870
1642sub decay_objects { 1871sub decay_objects {
1643 my ($self) = @_; 1872 my ($self) = @_;
1644 1873
… …
1657 1886
1658sub load_header_from($) { 1887sub load_header_from($) {
1659 my ($self, $path) = @_; 1888 my ($self, $path) = @_;
1660 1889
1661 utf8::encode $path; 1890 utf8::encode $path;
1662 #aio_open $path, O_RDONLY, 0 1891 my $f = new_from_file cf::object::thawer $path
1663 # or return;
1664
1665 $self->_load_header ($path)
1666 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;
1667 1899
1668 $self->{load_path} = $path; 1900 $self->{load_path} = $path;
1669 1901
1670 1 1902 1
1671} 1903}
… …
1725sub find { 1957sub find {
1726 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
1727 1959
1728 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
1729 1961
1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1730 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
1731 1964
1732 $cf::MAP{$path} || do { 1965 $cf::MAP{$path} || do {
1733 my $guard = cf::lock_acquire "map_find:$path";
1734 my $map = new_from_path cf::map $path 1966 my $map = new_from_path cf::map $path
1735 or return; 1967 or return;
1736 1968
1737 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
1738 1970
… …
1740 or return; 1972 or return;
1741 1973
1742 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1974 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1743 # doing this can freeze the server in a sync job, obviously 1975 # doing this can freeze the server in a sync job, obviously
1744 #$cf::WAIT_FOR_TICK->wait; 1976 #$cf::WAIT_FOR_TICK->wait;
1977 undef $guard2;
1978 undef $guard1;
1745 $map->reset; 1979 $map->reset;
1746 undef $guard;
1747 return find $path; 1980 return find $path;
1748 } 1981 }
1749 1982
1750 $cf::MAP{$path} = $map 1983 $cf::MAP{$path} = $map
1751 } 1984 }
… …
1760 local $self->{deny_reset} = 1; # loading can take a long time 1993 local $self->{deny_reset} = 1; # loading can take a long time
1761 1994
1762 my $path = $self->{path}; 1995 my $path = $self->{path};
1763 1996
1764 { 1997 {
1765 my $guard = cf::lock_acquire "map_load:$path"; 1998 my $guard = cf::lock_acquire "map_data:$path";
1766 1999
2000 return unless $self->valid;
1767 return if $self->in_memory != cf::MAP_SWAPPED; 2001 return unless $self->in_memory == cf::MAP_SWAPPED;
1768 2002
1769 $self->in_memory (cf::MAP_LOADING); 2003 $self->in_memory (cf::MAP_LOADING);
1770 2004
1771 $self->alloc; 2005 $self->alloc;
1772 2006
1773 $self->pre_load; 2007 $self->pre_load;
1774 Coro::cede; 2008 cf::cede_to_tick;
1775 2009
2010 my $f = new_from_file cf::object::thawer $self->{load_path};
2011 $f->skip_block;
1776 $self->_load_objects ($self->{load_path}, 1) 2012 $self->_load_objects ($f)
1777 or return; 2013 or return;
1778 2014
1779 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2015 $self->post_load_original
1780 if delete $self->{load_original}; 2016 if delete $self->{load_original};
1781 2017
1782 if (my $uniq = $self->uniq_path) { 2018 if (my $uniq = $self->uniq_path) {
1783 utf8::encode $uniq; 2019 utf8::encode $uniq;
1784 if (aio_open $uniq, O_RDONLY, 0) { 2020 unless (aio_stat $uniq) {
2021 if (my $f = new_from_file cf::object::thawer $uniq) {
1785 $self->clear_unique_items; 2022 $self->clear_unique_items;
1786 $self->_load_objects ($uniq, 0); 2023 $self->_load_objects ($f);
2024 $f->resolve_delayed_derefs;
2025 }
1787 } 2026 }
1788 } 2027 }
1789 2028
1790 Coro::cede; 2029 $f->resolve_delayed_derefs;
2030
2031 cf::cede_to_tick;
1791 # now do the right thing for maps 2032 # now do the right thing for maps
1792 $self->link_multipart_objects; 2033 $self->link_multipart_objects;
1793 $self->difficulty ($self->estimate_difficulty) 2034 $self->difficulty ($self->estimate_difficulty)
1794 unless $self->difficulty; 2035 unless $self->difficulty;
1795 Coro::cede; 2036 cf::cede_to_tick;
1796 2037
1797 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
1798 $self->decay_objects; 2039 $self->decay_objects;
1799 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
1800 $self->update_buttons; 2041 $self->update_buttons;
1801 Coro::cede; 2042 cf::cede_to_tick;
1802 $self->set_darkness_map;
1803 Coro::cede;
1804 $self->activate; 2043 $self->activate;
1805 } 2044 }
1806 2045
2046 $self->{last_save} = $cf::RUNTIME;
2047 $self->last_access ($cf::RUNTIME);
2048
1807 $self->in_memory (cf::MAP_IN_MEMORY); 2049 $self->in_memory (cf::MAP_ACTIVE);
1808 } 2050 }
1809 2051
1810 $self->post_load; 2052 $self->post_load;
1811} 2053}
1812 2054
… …
1821 2063
1822 $self 2064 $self
1823} 2065}
1824 2066
1825# 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
1826sub load_diag { 2068sub load_neighbours {
1827 my ($map) = @_; 2069 my ($map) = @_;
1828 2070
1829 my @diag; # diagonal neighbours 2071 my @neigh; # diagonal neighbours
1830 2072
1831 for (0 .. 3) { 2073 for (0 .. 3) {
1832 my $neigh = $map->tile_path ($_) 2074 my $neigh = $map->tile_path ($_)
1833 or next; 2075 or next;
1834 $neigh = find $neigh, $map 2076 $neigh = find $neigh, $map
1835 or next; 2077 or next;
1836 $neigh->load; 2078 $neigh->load;
1837 2079
2080 push @neigh,
1838 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2081 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1839 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2082 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1840 } 2083 }
1841 2084
1842 for (@diag) { 2085 for (grep defined $_->[0], @neigh) {
2086 my ($path, $origin) = @$_;
1843 my $neigh = find @$_ 2087 my $neigh = find $path, $origin
1844 or next; 2088 or next;
1845 $neigh->load; 2089 $neigh->load;
1846 } 2090 }
1847} 2091}
1848 2092
… …
1853} 2097}
1854 2098
1855sub do_load_sync { 2099sub do_load_sync {
1856 my ($map) = @_; 2100 my ($map) = @_;
1857 2101
2102 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2103 if $Coro::current == $Coro::main;
2104
1858 cf::sync_job { $map->load }; 2105 cf::sync_job { $map->load };
1859} 2106}
1860 2107
1861our %MAP_PREFETCH; 2108our %MAP_PREFETCH;
1862our $MAP_PREFETCHER = undef; 2109our $MAP_PREFETCHER = undef;
1863 2110
1864sub find_async { 2111sub find_async {
1865 my ($path, $origin) = @_; 2112 my ($path, $origin, $load) = @_;
1866 2113
1867 $path = normalise $path, $origin && $origin->{path}; 2114 $path = normalise $path, $origin && $origin->{path};
1868 2115
1869 if (my $map = $cf::MAP{$path}) { 2116 if (my $map = $cf::MAP{$path}) {
1870 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2117 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1871 } 2118 }
1872 2119
1873 undef $MAP_PREFETCH{$path}; 2120 $MAP_PREFETCH{$path} |= $load;
2121
1874 $MAP_PREFETCHER ||= cf::async { 2122 $MAP_PREFETCHER ||= cf::async {
2123 $Coro::current->{desc} = "map prefetcher";
2124
1875 while (%MAP_PREFETCH) { 2125 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 2126 while (my ($k, $v) = each %MAP_PREFETCH) {
1877 my $map = find $path 2127 if (my $map = find $k) {
1878 or next;
1879 $map->load; 2128 $map->load if $v;
2129 }
1880 2130
1881 delete $MAP_PREFETCH{$path}; 2131 delete $MAP_PREFETCH{$k};
1882 } 2132 }
1883 } 2133 }
1884 undef $MAP_PREFETCHER; 2134 undef $MAP_PREFETCHER;
1885 }; 2135 };
1886 $MAP_PREFETCHER->prio (6); 2136 $MAP_PREFETCHER->prio (6);
… …
1889} 2139}
1890 2140
1891sub save { 2141sub save {
1892 my ($self) = @_; 2142 my ($self) = @_;
1893 2143
1894 my $lock = cf::lock_acquire "map_data:" . $self->path; 2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
1895 2145
1896 $self->{last_save} = $cf::RUNTIME; 2146 $self->{last_save} = $cf::RUNTIME;
1897 2147
1898 return unless $self->dirty; 2148 return unless $self->dirty;
1899 2149
… …
1905 return if $self->{deny_save}; 2155 return if $self->{deny_save};
1906 2156
1907 local $self->{last_access} = $self->last_access;#d# 2157 local $self->{last_access} = $self->last_access;#d#
1908 2158
1909 cf::async { 2159 cf::async {
2160 $Coro::current->{desc} = "map player save";
1910 $_->contr->save for $self->players; 2161 $_->contr->save for $self->players;
1911 }; 2162 };
2163
2164 cf::get_slot 0.02;
1912 2165
1913 if ($uniq) { 2166 if ($uniq) {
1914 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2167 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1915 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2168 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1916 } else { 2169 } else {
… …
1922 my ($self) = @_; 2175 my ($self) = @_;
1923 2176
1924 # save first because save cedes 2177 # save first because save cedes
1925 $self->save; 2178 $self->save;
1926 2179
1927 my $lock = cf::lock_acquire "map_data:" . $self->path; 2180 my $lock = cf::lock_acquire "map_data:$self->{path}";
1928 2181
1929 return if $self->players; 2182 return if $self->players;
1930 return if $self->in_memory != cf::MAP_IN_MEMORY; 2183 return if $self->in_memory != cf::MAP_ACTIVE;
1931 return if $self->{deny_save}; 2184 return if $self->{deny_save};
1932 2185
2186 $self->in_memory (cf::MAP_SWAPPED);
2187
2188 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP;
1933 $self->clear; 2190 $self->clear;
1934 $self->in_memory (cf::MAP_SWAPPED);
1935} 2191}
1936 2192
1937sub reset_at { 2193sub reset_at {
1938 my ($self) = @_; 2194 my ($self) = @_;
1939 2195
… …
1971 if $uniq; 2227 if $uniq;
1972 } 2228 }
1973 2229
1974 delete $cf::MAP{$self->path}; 2230 delete $cf::MAP{$self->path};
1975 2231
2232 $self->deactivate;
2233 $_->clear_links_to ($self) for values %cf::MAP;
1976 $self->clear; 2234 $self->clear;
1977
1978 $_->clear_links_to ($self) for values %cf::MAP;
1979 2235
1980 $self->unlink_save; 2236 $self->unlink_save;
1981 $self->destroy; 2237 $self->destroy;
1982} 2238}
1983 2239
1984my $nuke_counter = "aaaa"; 2240my $nuke_counter = "aaaa";
1985 2241
1986sub nuke { 2242sub nuke {
1987 my ($self) = @_; 2243 my ($self) = @_;
1988 2244
2245 {
2246 my $lock = cf::lock_acquire "map_data:$self->{path}";
2247
1989 delete $cf::MAP{$self->path}; 2248 delete $cf::MAP{$self->path};
1990 2249
1991 $self->unlink_save; 2250 $self->unlink_save;
1992 2251
1993 bless $self, "cf::map"; 2252 bless $self, "cf::map";
1994 delete $self->{deny_reset}; 2253 delete $self->{deny_reset};
1995 $self->{deny_save} = 1; 2254 $self->{deny_save} = 1;
1996 $self->reset_timeout (1); 2255 $self->reset_timeout (1);
1997 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998 2257
1999 $cf::MAP{$self->path} = $self; 2258 $cf::MAP{$self->path} = $self;
2259 }
2000 2260
2001 $self->reset; # polite request, might not happen 2261 $self->reset; # polite request, might not happen
2002} 2262}
2003 2263
2004=item $maps = cf::map::tmp_maps 2264=item $maps = cf::map::tmp_maps
… …
2046 2306
2047sub unique_maps() { 2307sub unique_maps() {
2048 [ 2308 [
2049 map { 2309 map {
2050 utf8::decode $_; 2310 utf8::decode $_;
2051 /\.map$/ 2311 s/\.map$//; # TODO future compatibility hack
2312 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2313 ? ()
2052 ? normalise $_ 2314 : normalise $_
2053 : ()
2054 } @{ aio_readdir $UNIQUEDIR or [] } 2315 } @{ aio_readdir $UNIQUEDIR or [] }
2055 ] 2316 ]
2056} 2317}
2057 2318
2058package cf;
2059
2060=back 2319=back
2061 2320
2062=head3 cf::object 2321=head3 cf::object
2063 2322
2064=cut 2323=cut
… …
2067 2326
2068=over 4 2327=over 4
2069 2328
2070=item $ob->inv_recursive 2329=item $ob->inv_recursive
2071 2330
2072Returns 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.
2073 2333
2074=cut 2334=cut
2075 2335
2076sub inv_recursive_; 2336sub inv_recursive_;
2077sub inv_recursive_ { 2337sub inv_recursive_ {
… …
2080 2340
2081sub inv_recursive { 2341sub inv_recursive {
2082 inv_recursive_ inv $_[0] 2342 inv_recursive_ inv $_[0]
2083} 2343}
2084 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
2085package cf; 2373package cf;
2086 2374
2087=back 2375=back
2088 2376
2089=head3 cf::object::player 2377=head3 cf::object::player
… …
2095Sends 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>
2096can 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
2097dialogue with the given NPC character. 2385dialogue with the given NPC character.
2098 2386
2099=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};
2100 2402
2101# rough implementation of a future "reply" method that works 2403# rough implementation of a future "reply" method that works
2102# with dialog boxes. 2404# with dialog boxes.
2103#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
2104sub cf::object::player::reply($$$;$) { 2406sub cf::object::player::reply($$$;$) {
… …
2111 2413
2112 } else { 2414 } else {
2113 my $pl = $self->contr; 2415 my $pl = $self->contr;
2114 2416
2115 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2417 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116 my $diag = $pl->{npc_dialog}; 2418 my $dialog = $pl->{npc_dialog};
2117 $diag->{pl}->ext_reply ( 2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2118 $diag->{id},
2119 msgtype => "reply",
2120 msg => $diag->{pl}->expand_cfpod ($msg),
2121 add_topics => []
2122 );
2123 2420
2124 } else { 2421 } else {
2125 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
2126 $self->message ($msg, $flags); 2423 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2127 } 2424 }
2128 } 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 (@_);
2129} 2436}
2130 2437
2131=item $player_object->may ("access") 2438=item $player_object->may ("access")
2132 2439
2133Returns wether the given player is authorized to access resource "access" 2440Returns wether the given player is authorized to access resource "access"
… …
2146 2453
2147=item $player_object->enter_link 2454=item $player_object->enter_link
2148 2455
2149Freezes 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}>).
2150 2457
2151The 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.
2152I<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.
2153 2462
2154Will never block. 2463Will never block.
2155 2464
2156=item $player_object->leave_link ($map, $x, $y) 2465=item $player_object->leave_link ($map, $x, $y)
2157 2466
… …
2212 # use -1 or undef as default coordinates, not 0, 0 2521 # use -1 or undef as default coordinates, not 0, 0
2213 ($x, $y) = ($map->enter_x, $map->enter_y) 2522 ($x, $y) = ($map->enter_x, $map->enter_y)
2214 if $x <=0 && $y <= 0; 2523 if $x <=0 && $y <= 0;
2215 2524
2216 $map->load; 2525 $map->load;
2217 $map->load_diag; 2526 $map->load_neighbours;
2218 2527
2219 return unless $self->contr->active; 2528 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2220 $self->activate_recursive; 2530 $self->activate_recursive;
2221 2531
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2533 $self->enter_map ($map, $x, $y);
2224} 2534}
2225 2535
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227 2537
2228Moves 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
2229her, loading and preparing them map, calling the provided $check callback 2539her, loading and preparing them map, calling the provided $check callback
2230that 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
2231the 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 >>.
2232 2546
2233=cut 2547=cut
2234 2548
2235our $GOTOGEN; 2549our $GOTOGEN;
2236 2550
2237sub cf::object::player::goto { 2551sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2552 my ($self, $path, $x, $y, $check, $done) = @_;
2239 2553
2240 # 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
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2556
2243 $self->enter_link; 2557 $self->enter_link;
2244 2558
2245 (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
2246 my $map = eval { 2581 my $map = eval {
2247 my $map = cf::map::find $path; 2582 my $map = defined $path ? cf::map::find $path : undef;
2248 2583
2249 if ($map) { 2584 if ($map) {
2250 $map = $map->customise_for ($self); 2585 $map = $map->customise_for ($self);
2251 $map = $check->($map) if $check && $map; 2586 $map = $check->($map) if $check && $map;
2252 } else { 2587 } else {
2253 $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);
2254 } 2589 }
2255 2590
2256 $map 2591 $map
2257 }; 2592 };
2258 2593
… …
2263 2598
2264 if ($gen == $self->{_goto_generation}) { 2599 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2600 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2601 $self->leave_link ($map, $x, $y);
2267 } 2602 }
2603
2604 $done->() if $done;
2268 })->prio (1); 2605 })->prio (1);
2269} 2606}
2270 2607
2271=item $player_object->enter_exit ($exit_object) 2608=item $player_object->enter_exit ($exit_object)
2272 2609
… …
2292} 2629}
2293 2630
2294sub prepare_random_map { 2631sub prepare_random_map {
2295 my ($exit) = @_; 2632 my ($exit) = @_;
2296 2633
2297 my $guard = cf::lock_acquire "exit_prepare:$exit";
2298
2299 # all this does is basically replace the /! path by 2634 # all this does is basically replace the /! path by
2300 # a new random map path (?random/...) with a seed 2635 # a new random map path (?random/...) with a seed
2301 # that depends on the exit object 2636 # that depends on the exit object
2302 2637
2303 my $rmp = parse_random_map_params $exit->msg; 2638 my $rmp = parse_random_map_params $exit->msg;
… …
2305 if ($exit->map) { 2640 if ($exit->map) {
2306 $rmp->{region} = $exit->region->name; 2641 $rmp->{region} = $exit->region->name;
2307 $rmp->{origin_map} = $exit->map->path; 2642 $rmp->{origin_map} = $exit->map->path;
2308 $rmp->{origin_x} = $exit->x; 2643 $rmp->{origin_x} = $exit->x;
2309 $rmp->{origin_y} = $exit->y; 2644 $rmp->{origin_y} = $exit->y;
2645
2646 $exit->map->touch;
2310 } 2647 }
2311 2648
2312 $rmp->{random_seed} ||= $exit->random_seed; 2649 $rmp->{random_seed} ||= $exit->random_seed;
2313 2650
2314 my $data = cf::to_json $rmp; 2651 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2315 my $md5 = Digest::MD5::md5_hex $data; 2652 my $md5 = Digest::MD5::md5_hex $data;
2316 my $meta = "$RANDOMDIR/$md5.meta"; 2653 my $meta = "$RANDOMDIR/$md5.meta";
2317 2654
2318 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2655 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2319 aio_write $fh, 0, (length $data), $data, 0; 2656 aio_write $fh, 0, (length $data), $data, 0;
2320 undef $fh; 2657 undef $fh;
2321 aio_rename "$meta~", $meta; 2658 aio_rename "$meta~", $meta;
2322 2659
2660 my $slaying = "?random/$md5";
2661
2662 if ($exit->valid) {
2323 $exit->slaying ("?random/$md5"); 2663 $exit->slaying ("?random/$md5");
2324 $exit->msg (undef); 2664 $exit->msg (undef);
2665 }
2325 } 2666 }
2326} 2667}
2327 2668
2328sub cf::object::player::enter_exit { 2669sub cf::object::player::enter_exit {
2329 my ($self, $exit) = @_; 2670 my ($self, $exit) = @_;
2330 2671
2331 return unless $self->type == cf::PLAYER; 2672 return unless $self->type == cf::PLAYER;
2332 2673
2333 if ($exit->slaying eq "/!") {
2334 #TODO: this should de-fi-ni-te-ly not be a sync-job
2335 # the problem is that $exit might not survive long enough
2336 # so it needs to be done right now, right here
2337 cf::sync_job { prepare_random_map $exit };
2338 }
2339
2340 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2341 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp;
2343
2344 $self->enter_link; 2674 $self->enter_link;
2345 2675
2346 (async { 2676 (async {
2347 $self->deactivate_recursive; # just to be sure 2677 $Coro::current->{desc} = "enter_exit";
2678
2348 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
2349 $self->goto ($slaying, $hp, $sp); 2694 $self->goto ($map, $x, $y);
2350 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
2351 1; 2700 1
2352 }) { 2701 }) {
2353 $self->message ("Something went wrong deep within the crossfire server. " 2702 $self->message ("Something went wrong deep within the deliantra server. "
2354 . "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. "
2355 . "Please report this to the dungeon master!", 2704 . "Please report this to the dungeon master!",
2356 cf::NDI_UNIQUE | cf::NDI_RED); 2705 cf::NDI_UNIQUE | cf::NDI_RED);
2357 2706
2358 warn "ERROR in enter_exit: $@"; 2707 warn "ERROR in enter_exit: $@";
… …
2377 2726
2378 utf8::encode $text; 2727 utf8::encode $text;
2379 $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);
2380} 2729}
2381 2730
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 2731=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 2732
2384Send 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
2385client 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
2386the 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
2387the message unless the client supports the msg packet. 2736the message unless the client supports the msg packet.
2388 2737
2389=cut 2738=cut
2390 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/shopitems" => {
2791 id => "infobox",
2792 title => "Shop Items",
2793 reply => undef,
2794 tooltip => "Shows the items currently for sale in this shop",
2795 },
2796 "c/resistances" => {
2797 id => "infobox",
2798 title => "Resistances",
2799 reply => undef,
2800 tooltip => "Shows your resistances",
2801 },
2802 "c/pets" => {
2803 id => "infobox",
2804 title => "Pets",
2805 reply => undef,
2806 tooltip => "Shows information abotu your pets/a specific pet",
2807 },
2808 "c/uptime" => {
2809 id => "infobox",
2810 title => "Uptime",
2811 reply => undef,
2812 tooltip => "How long the server has been running since last restart",
2813 },
2814 "c/mapinfo" => {
2815 id => "infobox",
2816 title => "Map Info",
2817 reply => undef,
2818 tooltip => "Information related to the maps",
2819 },
2820 "c/party" => {
2821 id => "party",
2822 title => "Party",
2823 reply => "gsay ",
2824 tooltip => "Messages and chat related to your party",
2825 },
2826 "c/death" => {
2827 id => "death",
2828 title => "Death",
2829 reply => undef,
2830 tooltip => "Reason for and more info about your most recent death",
2831 },
2832 "c/say" => $SAY_CHANNEL,
2833 "c/chat" => $CHAT_CHANNEL,
2834);
2835
2391sub cf::client::send_msg { 2836sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 2837 my ($self, $channel, $msg, $color, @extra) = @_;
2393 2838
2394 $msg = $self->pl->expand_cfpod ($msg); 2839 $msg = $self->pl->expand_cfpod ($msg)
2840 unless $color & cf::NDI_VERBATIM;
2395 2841
2396 if ($self->can_msg) { 2842 $color &= cf::NDI_CLIENT_MASK; # just in case...
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);
2398 } else {
2399 # replace some tags by gcfclient-compatible ones
2400 for ($msg) {
2401 1 while
2402 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2403 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2404 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2405 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2406 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2407 }
2408 2843
2409 if ($color >= 0) { 2844 # check predefined channels, for the benefit of C
2410 if (0 && $msg =~ /\[/) { 2845 if ($CHANNEL{$channel}) {
2411 $self->send_packet ("drawextinfo $color 4 0 $msg") 2846 $channel = $CHANNEL{$channel};
2412 } else { 2847
2413 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2848 $self->ext_msg (channel_info => $channel);
2414 $self->send_packet ("drawinfo $color $msg") 2849 $channel = $channel->{id};
2850
2851 } elsif (ref $channel) {
2852 # send meta info to client, if not yet sent
2853 unless (exists $self->{channel}{$channel->{id}}) {
2854 $self->{channel}{$channel->{id}} = $channel;
2855 $self->ext_msg (channel_info => $channel);
2415 } 2856 }
2416 }
2417 }
2418}
2419 2857
2858 $channel = $channel->{id};
2859 }
2860
2861 return unless @extra || length $msg;
2862
2863 # default colour, mask it out
2864 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2865 if $color & cf::NDI_DEF;
2866
2867 my $pkt = "msg "
2868 . $self->{json_coder}->encode (
2869 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2870 );
2871
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if (8192 < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt);
2883}
2884
2420=item $client->ext_event ($type, %msg) 2885=item $client->ext_msg ($type, @msg)
2421 2886
2422Sends an ext event to the client. 2887Sends an ext event to the client.
2423 2888
2424=cut 2889=cut
2425 2890
2426sub cf::client::ext_event($$%) { 2891sub cf::client::ext_msg($$@) {
2427 my ($self, $type, %msg) = @_; 2892 my ($self, $type, @msg) = @_;
2428 2893
2894 if ($self->extcmd == 2) {
2895 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2896 } elsif ($self->extcmd == 1) { # TODO: remove
2429 $msg{msgtype} = "event_$type"; 2897 push @msg, msgtype => "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%msg); 2898 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2899 }
2900}
2901
2902=item $client->ext_reply ($msgid, @msg)
2903
2904Sends an ext reply to the client.
2905
2906=cut
2907
2908sub cf::client::ext_reply($$@) {
2909 my ($self, $id, @msg) = @_;
2910
2911 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2913 } elsif ($self->extcmd == 1) {
2914 #TODO: version 1, remove
2915 unshift @msg, msgtype => "reply", msgid => $id;
2916 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2917 }
2431} 2918}
2432 2919
2433=item $success = $client->query ($flags, "text", \&cb) 2920=item $success = $client->query ($flags, "text", \&cb)
2434 2921
2435Queues a query to the client, calling the given callback with 2922Queues a query to the client, calling the given callback with
… …
2458 2945
2459 1 2946 1
2460} 2947}
2461 2948
2462cf::client->attach ( 2949cf::client->attach (
2950 on_connect => sub {
2951 my ($ns) = @_;
2952
2953 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2954 },
2463 on_reply => sub { 2955 on_reply => sub {
2464 my ($ns, $msg) = @_; 2956 my ($ns, $msg) = @_;
2465 2957
2466 # this weird shuffling is so that direct followup queries 2958 # this weird shuffling is so that direct followup queries
2467 # get handled first 2959 # get handled first
… …
2482 } 2974 }
2483 }, 2975 },
2484 on_exticmd => sub { 2976 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 2977 my ($ns, $buf) = @_;
2486 2978
2487 my $msg = eval { from_json $buf }; 2979 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 2980
2489 if (ref $msg) { 2981 if (ref $msg) {
2982 my ($type, $reply, @payload) =
2983 "ARRAY" eq ref $msg
2984 ? @$msg
2985 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2986
2987 my @reply;
2988
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2989 if (my $cb = $EXTICMD{$type}) {
2491 if (my %reply = $cb->($ns, $msg)) { 2990 @reply = $cb->($ns, @payload);
2492 $reply{msgid} = $msg->{msgid};
2493 $ns->send ("ext " . cf::to_json \%reply);
2494 }
2495 } 2991 }
2992
2993 $ns->ext_reply ($reply, @reply)
2994 if $reply;
2995
2496 } else { 2996 } else {
2497 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2997 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498 } 2998 }
2499 2999
2500 cf::override; 3000 cf::override;
… …
2547our $safe = new Safe "safe"; 3047our $safe = new Safe "safe";
2548our $safe_hole = new Safe::Hole; 3048our $safe_hole = new Safe::Hole;
2549 3049
2550$SIG{FPE} = 'IGNORE'; 3050$SIG{FPE} = 'IGNORE';
2551 3051
2552$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3052$safe->permit_only (Opcode::opset qw(
3053 :base_core :base_mem :base_orig :base_math
3054 grepstart grepwhile mapstart mapwhile
3055 sort time
3056));
2553 3057
2554# here we export the classes and methods available to script code 3058# here we export the classes and methods available to script code
2555 3059
2556=pod 3060=pod
2557 3061
2558The following functions and methods are available within a safe environment: 3062The following functions and methods are available within a safe environment:
2559 3063
2560 cf::object contr pay_amount pay_player map 3064 cf::object
3065 contr pay_amount pay_player map x y force_find force_add destroy
3066 insert remove name archname title slaying race decrease split
3067 value
3068
2561 cf::object::player player 3069 cf::object::player
2562 cf::player peaceful 3070 player
2563 cf::map trigger 3071
3072 cf::player
3073 peaceful
3074
3075 cf::map
3076 trigger
2564 3077
2565=cut 3078=cut
2566 3079
2567for ( 3080for (
2568 ["cf::object" => qw(contr pay_amount pay_player map)], 3081 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3082 insert remove inv nrof name archname title slaying race
3083 decrease split destroy change_exp value msg lore send_msg)],
2569 ["cf::object::player" => qw(player)], 3084 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 3085 ["cf::player" => qw(peaceful send_msg)],
2571 ["cf::map" => qw(trigger)], 3086 ["cf::map" => qw(trigger)],
2572) { 3087) {
2573 no strict 'refs'; 3088 no strict 'refs';
2574 my ($pkg, @funs) = @$_; 3089 my ($pkg, @funs) = @$_;
2575 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3090 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2592 my ($code, %vars) = @_; 3107 my ($code, %vars) = @_;
2593 3108
2594 my $qcode = $code; 3109 my $qcode = $code;
2595 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3110 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2596 $qcode =~ s/\n/\\n/g; 3111 $qcode =~ s/\n/\\n/g;
3112
3113 %vars = (_dummy => 0) unless %vars;
2597 3114
2598 local $_; 3115 local $_;
2599 local @safe::cf::_safe_eval_args = values %vars; 3116 local @safe::cf::_safe_eval_args = values %vars;
2600 3117
2601 my $eval = 3118 my $eval =
… …
2649# the server's init and main functions 3166# the server's init and main functions
2650 3167
2651sub load_facedata($) { 3168sub load_facedata($) {
2652 my ($path) = @_; 3169 my ($path) = @_;
2653 3170
3171 # HACK to clear player env face cache, we need some signal framework
3172 # for this (global event?)
3173 %ext::player_env::MUSIC_FACE_CACHE = ();
3174
3175 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3176
2654 warn "loading facedata from $path\n"; 3177 warn "loading facedata from $path\n";
2655 3178
2656 my $facedata; 3179 my $facedata;
2657 0 < aio_load $path, $facedata 3180 0 < aio_load $path, $facedata
2658 or die "$path: $!"; 3181 or die "$path: $!";
… …
2660 $facedata = Coro::Storable::thaw $facedata; 3183 $facedata = Coro::Storable::thaw $facedata;
2661 3184
2662 $facedata->{version} == 2 3185 $facedata->{version} == 2
2663 or cf::cleanup "$path: version mismatch, cannot proceed."; 3186 or cf::cleanup "$path: version mismatch, cannot proceed.";
2664 3187
3188 # patch in the exptable
3189 $facedata->{resource}{"res/exp_table"} = {
3190 type => FT_RSRC,
3191 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3192 };
3193 cf::cede_to_tick;
3194
2665 { 3195 {
2666 my $faces = $facedata->{faceinfo}; 3196 my $faces = $facedata->{faceinfo};
2667 3197
2668 while (my ($face, $info) = each %$faces) { 3198 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3199 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3200
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3201 cf::face::set_visibility $idx, $info->{visibility};
3202 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3203 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3204 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673 Coro::cede; 3205
3206 cf::cede_to_tick;
2674 } 3207 }
2675 3208
2676 while (my ($face, $info) = each %$faces) { 3209 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 3210 next unless $info->{smooth};
3211
2678 my $idx = cf::face::find $face 3212 my $idx = cf::face::find $face
2679 or next; 3213 or next;
3214
2680 if (my $smooth = cf::face::find $info->{smooth}) { 3215 if (my $smooth = cf::face::find $info->{smooth}) {
3216 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3217 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 3218 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3219 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 3220 }
2685 Coro::cede; 3221
3222 cf::cede_to_tick;
2686 } 3223 }
2687 } 3224 }
2688 3225
2689 { 3226 {
2690 my $anims = $facedata->{animinfo}; 3227 my $anims = $facedata->{animinfo};
2691 3228
2692 while (my ($anim, $info) = each %$anims) { 3229 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3230 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 3231 cf::cede_to_tick;
2695 } 3232 }
2696 3233
2697 cf::anim::invalidate_all; # d'oh 3234 cf::anim::invalidate_all; # d'oh
2698 } 3235 }
2699 3236
3237 {
3238 # TODO: for gcfclient pleasure, we should give resources
3239 # that gcfclient doesn't grok a >10000 face index.
3240 my $res = $facedata->{resource};
3241
3242 while (my ($name, $info) = each %$res) {
3243 if (defined $info->{type}) {
3244 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3245 my $data;
3246
3247 if ($info->{type} & 1) {
3248 # prepend meta info
3249
3250 my $meta = $enc->encode ({
3251 name => $name,
3252 %{ $info->{meta} || {} },
3253 });
3254
3255 $data = pack "(w/a*)*", $meta, $info->{data};
3256 } else {
3257 $data = $info->{data};
3258 }
3259
3260 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3261 cf::face::set_type $idx, $info->{type};
3262 } else {
3263 $RESOURCE{$name} = $info;
3264 }
3265
3266 cf::cede_to_tick;
3267 }
3268 }
3269
3270 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3271
2700 1 3272 1
2701} 3273}
2702 3274
3275cf::global->attach (on_resource_update => sub {
3276 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3277 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3278
3279 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3280 my $sound = $soundconf->{compat}[$_]
3281 or next;
3282
3283 my $face = cf::face::find "sound/$sound->[1]";
3284 cf::sound::set $sound->[0] => $face;
3285 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3286 }
3287
3288 while (my ($k, $v) = each %{$soundconf->{event}}) {
3289 my $face = cf::face::find "sound/$v";
3290 cf::sound::set $k => $face;
3291 }
3292 }
3293});
3294
3295register_exticmd fx_want => sub {
3296 my ($ns, $want) = @_;
3297
3298 while (my ($k, $v) = each %$want) {
3299 $ns->fx_want ($k, $v);
3300 }
3301};
3302
3303sub load_resource_file($) {
3304 my $guard = lock_acquire "load_resource_file";
3305
3306 my $status = load_resource_file_ $_[0];
3307 get_slot 0.1, 100;
3308 cf::arch::commit_load;
3309
3310 $status
3311}
3312
2703sub reload_regions { 3313sub reload_regions {
3314 # HACK to clear player env face cache, we need some signal framework
3315 # for this (global event?)
3316 %ext::player_env::MUSIC_FACE_CACHE = ();
3317
2704 load_resource_file "$MAPDIR/regions" 3318 load_resource_file "$MAPDIR/regions"
2705 or die "unable to load regions file\n"; 3319 or die "unable to load regions file\n";
3320
3321 for (cf::region::list) {
3322 $_->{match} = qr/$_->{match}/
3323 if exists $_->{match};
3324 }
2706} 3325}
2707 3326
2708sub reload_facedata { 3327sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 3328 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 3329 or die "unable to load facedata\n";
… …
2721} 3340}
2722 3341
2723sub reload_resources { 3342sub reload_resources {
2724 warn "reloading resource files...\n"; 3343 warn "reloading resource files...\n";
2725 3344
3345 reload_facedata;
3346 reload_archetypes;
2726 reload_regions; 3347 reload_regions;
2727 reload_facedata;
2728 #reload_archetypes;#d#
2729 reload_archetypes;
2730 reload_treasures; 3348 reload_treasures;
2731 3349
2732 warn "finished reloading resource files\n"; 3350 warn "finished reloading resource files\n";
2733} 3351}
2734 3352
2735sub init { 3353sub reload_config {
2736 reload_resources;
2737}
2738
2739sub cfg_load {
2740 open my $fh, "<:utf8", "$CONFDIR/config" 3354 open my $fh, "<:utf8", "$CONFDIR/config"
2741 or return; 3355 or return;
2742 3356
2743 local $/; 3357 local $/;
2744 *CFG = YAML::Syck::Load <$fh>; 3358 *CFG = YAML::Load <$fh>;
2745 3359
2746 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2747 3361
2748 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3362 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2749 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3363 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2755 }; 3369 };
2756 warn $@ if $@; 3370 warn $@ if $@;
2757 } 3371 }
2758} 3372}
2759 3373
3374sub pidfile() {
3375 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3376 or die "$PIDFILE: $!";
3377 flock $fh, &Fcntl::LOCK_EX
3378 or die "$PIDFILE: flock: $!";
3379 $fh
3380}
3381
3382# make sure only one server instance is running at any one time
3383sub atomic {
3384 my $fh = pidfile;
3385
3386 my $pid = <$fh>;
3387 kill 9, $pid if $pid > 0;
3388
3389 seek $fh, 0, 0;
3390 print $fh $$;
3391}
3392
2760sub main { 3393sub main {
3394 cf::init_globals; # initialise logging
3395
3396 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3397 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3398 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3399 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3400
3401 cf::init_experience;
3402 cf::init_anim;
3403 cf::init_attackmess;
3404 cf::init_dynamic;
3405
3406 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3407
2761 # we must not ever block the main coroutine 3408 # we must not ever block the main coroutine
2762 local $Coro::idle = sub { 3409 local $Coro::idle = sub {
2763 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3410 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2764 (async { 3411 (async {
2765 Event::one_event; 3412 $Coro::current->{desc} = "IDLE BUG HANDLER";
3413 EV::loop EV::LOOP_ONESHOT;
2766 })->prio (Coro::PRIO_MAX); 3414 })->prio (Coro::PRIO_MAX);
2767 }; 3415 };
2768 3416
2769 cfg_load; 3417 evthread_start IO::AIO::poll_fileno;
3418
3419 cf::sync_job {
3420 reload_resources;
3421 reload_config;
2770 db_init; 3422 db_init;
3423
3424 cf::load_settings;
3425 cf::load_materials;
3426 cf::init_uuid;
3427 cf::init_signals;
3428 cf::init_commands;
3429 cf::init_skills;
3430
3431 cf::init_beforeplay;
3432
3433 atomic;
3434
2771 load_extensions; 3435 load_extensions;
2772 3436
2773 $TICK_WATCHER->start; 3437 utime time, time, $RUNTIMEFILE;
3438
3439 # no (long-running) fork's whatsoever before this point(!)
3440 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3441
3442 (pop @POST_INIT)->(0) while @POST_INIT;
3443 };
3444
2774 Event::loop; 3445 EV::loop;
2775} 3446}
2776 3447
2777############################################################################# 3448#############################################################################
2778# initialisation and cleanup 3449# initialisation and cleanup
2779 3450
2780# install some emergency cleanup handlers 3451# install some emergency cleanup handlers
2781BEGIN { 3452BEGIN {
3453 our %SIGWATCHER = ();
2782 for my $signal (qw(INT HUP TERM)) { 3454 for my $signal (qw(INT HUP TERM)) {
2783 Event->signal ( 3455 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2784 reentrant => 0,
2785 data => WF_AUTOCANCEL,
2786 signal => $signal,
2787 prio => 0,
2788 cb => sub {
2789 cf::cleanup "SIG$signal"; 3456 cf::cleanup "SIG$signal";
2790 },
2791 ); 3457 };
2792 } 3458 }
2793} 3459}
2794 3460
2795sub write_runtime { 3461sub write_runtime_sync {
2796 my $runtime = "$LOCALDIR/runtime";
2797
2798 # first touch the runtime file to show we are still running: 3462 # first touch the runtime file to show we are still running:
2799 # the fsync below can take a very very long time. 3463 # the fsync below can take a very very long time.
2800 3464
2801 IO::AIO::aio_utime $runtime, undef, undef; 3465 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2802 3466
2803 my $guard = cf::lock_acquire "write_runtime"; 3467 my $guard = cf::lock_acquire "write_runtime";
2804 3468
2805 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3469 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2806 or return; 3470 or return;
2807 3471
2808 my $value = $cf::RUNTIME + 90 + 10; 3472 my $value = $cf::RUNTIME + 90 + 10;
2809 # 10 is the runtime save interval, for a monotonic clock 3473 # 10 is the runtime save interval, for a monotonic clock
2810 # 60 allows for the watchdog to kill the server. 3474 # 60 allows for the watchdog to kill the server.
… …
2820 aio_utime $fh, undef, undef; 3484 aio_utime $fh, undef, undef;
2821 3485
2822 close $fh 3486 close $fh
2823 or return; 3487 or return;
2824 3488
2825 aio_rename "$runtime~", $runtime 3489 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2826 and return; 3490 and return;
2827 3491
2828 warn "runtime file written.\n"; 3492 warn "runtime file written.\n";
2829 3493
2830 1 3494 1
3495}
3496
3497our $uuid_lock;
3498our $uuid_skip;
3499
3500sub write_uuid_sync($) {
3501 $uuid_skip ||= $_[0];
3502
3503 return if $uuid_lock;
3504 local $uuid_lock = 1;
3505
3506 my $uuid = "$LOCALDIR/uuid";
3507
3508 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3509 or return;
3510
3511 my $value = uuid_seq uuid_cur;
3512
3513 unless ($value) {
3514 warn "cowardly refusing to write zero uuid value!\n";
3515 return;
3516 }
3517
3518 my $value = uuid_str $value + $uuid_skip;
3519 $uuid_skip = 0;
3520
3521 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3522 and return;
3523
3524 # always fsync - this file is important
3525 aio_fsync $fh
3526 and return;
3527
3528 close $fh
3529 or return;
3530
3531 aio_rename "$uuid~", $uuid
3532 and return;
3533
3534 warn "uuid file written ($value).\n";
3535
3536 1
3537
3538}
3539
3540sub write_uuid($$) {
3541 my ($skip, $sync) = @_;
3542
3543 $sync ? write_uuid_sync $skip
3544 : async { write_uuid_sync $skip };
2831} 3545}
2832 3546
2833sub emergency_save() { 3547sub emergency_save() {
2834 my $freeze_guard = cf::freeze_mainloop; 3548 my $freeze_guard = cf::freeze_mainloop;
2835 3549
2836 warn "enter emergency perl save\n"; 3550 warn "emergency_perl_save: enter\n";
2837 3551
2838 cf::sync_job { 3552 cf::sync_job {
3553 # this is a trade-off: we want to be very quick here, so
3554 # save all maps without fsync, and later call a global sync
3555 # (which in turn might be very very slow)
3556 local $USE_FSYNC = 0;
3557
2839 # use a peculiar iteration method to avoid tripping on perl 3558 # use a peculiar iteration method to avoid tripping on perl
2840 # refcount bugs in for. also avoids problems with players 3559 # refcount bugs in for. also avoids problems with players
2841 # and maps saved/destroyed asynchronously. 3560 # and maps saved/destroyed asynchronously.
2842 warn "begin emergency player save\n"; 3561 warn "emergency_perl_save: begin player save\n";
2843 for my $login (keys %cf::PLAYER) { 3562 for my $login (keys %cf::PLAYER) {
2844 my $pl = $cf::PLAYER{$login} or next; 3563 my $pl = $cf::PLAYER{$login} or next;
2845 $pl->valid or next; 3564 $pl->valid or next;
3565 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2846 $pl->save; 3566 $pl->save;
2847 } 3567 }
2848 warn "end emergency player save\n"; 3568 warn "emergency_perl_save: end player save\n";
2849 3569
2850 warn "begin emergency map save\n"; 3570 warn "emergency_perl_save: begin map save\n";
2851 for my $path (keys %cf::MAP) { 3571 for my $path (keys %cf::MAP) {
2852 my $map = $cf::MAP{$path} or next; 3572 my $map = $cf::MAP{$path} or next;
2853 $map->valid or next; 3573 $map->valid or next;
2854 $map->save; 3574 $map->save;
2855 } 3575 }
2856 warn "end emergency map save\n"; 3576 warn "emergency_perl_save: end map save\n";
2857 3577
2858 warn "begin emergency database checkpoint\n"; 3578 warn "emergency_perl_save: begin database checkpoint\n";
2859 BDB::db_env_txn_checkpoint $DB_ENV; 3579 BDB::db_env_txn_checkpoint $DB_ENV;
2860 warn "end emergency database checkpoint\n"; 3580 warn "emergency_perl_save: end database checkpoint\n";
3581
3582 warn "emergency_perl_save: begin write uuid\n";
3583 write_uuid_sync 1;
3584 warn "emergency_perl_save: end write uuid\n";
2861 }; 3585 };
2862 3586
3587 warn "emergency_perl_save: starting sync()\n";
3588 IO::AIO::aio_sync sub {
3589 warn "emergency_perl_save: finished sync()\n";
3590 };
3591
2863 warn "leave emergency perl save\n"; 3592 warn "emergency_perl_save: leave\n";
2864} 3593}
2865 3594
2866sub post_cleanup { 3595sub post_cleanup {
2867 my ($make_core) = @_; 3596 my ($make_core) = @_;
2868 3597
2869 warn Carp::longmess "post_cleanup backtrace" 3598 warn Carp::longmess "post_cleanup backtrace"
2870 if $make_core; 3599 if $make_core;
3600
3601 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$;
3603}
3604
3605# a safer delete_package, copied from Symbol
3606sub clear_package($) {
3607 my $pkg = shift;
3608
3609 # expand to full symbol table name if needed
3610 unless ($pkg =~ /^main::.*::$/) {
3611 $pkg = "main$pkg" if $pkg =~ /^::/;
3612 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3613 $pkg .= '::' unless $pkg =~ /::$/;
3614 }
3615
3616 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3617 my $stem_symtab = *{$stem}{HASH};
3618
3619 defined $stem_symtab and exists $stem_symtab->{$leaf}
3620 or return;
3621
3622 # clear all symbols
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 }
3628 warn "cleared package $pkg\n";#d#
2871} 3629}
2872 3630
2873sub do_reload_perl() { 3631sub do_reload_perl() {
2874 # can/must only be called in main 3632 # can/must only be called in main
2875 if ($Coro::current != $Coro::main) { 3633 if ($Coro::current != $Coro::main) {
2876 warn "can only reload from main coroutine"; 3634 warn "can only reload from main coroutine";
2877 return; 3635 return;
2878 } 3636 }
2879 3637
3638 return if $RELOAD++;
3639
3640 my $t1 = EV::time;
3641
3642 while ($RELOAD) {
2880 warn "reloading..."; 3643 warn "reloading...";
2881 3644
2882 warn "entering sync_job"; 3645 warn "entering sync_job";
2883 3646
2884 cf::sync_job { 3647 cf::sync_job {
2885 cf::write_runtime; # external watchdog should not bark 3648 cf::write_runtime_sync; # external watchdog should not bark
2886 cf::emergency_save; 3649 cf::emergency_save;
2887 cf::write_runtime; # external watchdog should not bark 3650 cf::write_runtime_sync; # external watchdog should not bark
2888 3651
2889 warn "syncing database to disk"; 3652 warn "syncing database to disk";
2890 BDB::db_env_txn_checkpoint $DB_ENV; 3653 BDB::db_env_txn_checkpoint $DB_ENV;
2891 3654
2892 # if anything goes wrong in here, we should simply crash as we already saved 3655 # if anything goes wrong in here, we should simply crash as we already saved
2893 3656
2894 warn "cancelling all WF_AUTOCANCEL watchers";
2895 for (Event::all_watchers) {
2896 $_->cancel if $_->data & WF_AUTOCANCEL;
2897 }
2898
2899 warn "flushing outstanding aio requests"; 3657 warn "flushing outstanding aio requests";
2900 for (;;) {
2901 BDB::flush;
2902 IO::AIO::flush;
2903 Coro::cede;
2904 last unless IO::AIO::nreqs || BDB::nreqs; 3658 while (IO::AIO::nreqs || BDB::nreqs) {
2905 warn "iterate..."; 3659 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2906 }
2907
2908 ++$RELOAD;
2909
2910 warn "cancelling all extension coros";
2911 $_->cancel for values %EXT_CORO;
2912 %EXT_CORO = ();
2913
2914 warn "removing commands";
2915 %COMMAND = ();
2916
2917 warn "removing ext/exti commands";
2918 %EXTCMD = ();
2919 %EXTICMD = ();
2920
2921 warn "unloading/nuking all extensions";
2922 for my $pkg (@EXTS) {
2923 warn "... unloading $pkg";
2924
2925 if (my $cb = $pkg->can ("unload")) {
2926 eval {
2927 $cb->($pkg);
2928 1
2929 } or warn "$pkg unloaded, but with errors: $@";
2930 } 3660 }
2931 3661
2932 warn "... nuking $pkg"; 3662 warn "cancelling all extension coros";
2933 Symbol::delete_package $pkg; 3663 $_->cancel for values %EXT_CORO;
2934 } 3664 %EXT_CORO = ();
2935 3665
2936 warn "unloading all perl modules loaded from $LIBDIR"; 3666 warn "removing commands";
2937 while (my ($k, $v) = each %INC) { 3667 %COMMAND = ();
2938 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2939 3668
3669 warn "removing ext/exti commands";
3670 %EXTCMD = ();
3671 %EXTICMD = ();
3672
3673 warn "unloading/nuking all extensions";
3674 for my $pkg (@EXTS) {
2940 warn "... unloading $k"; 3675 warn "... unloading $pkg";
2941 delete $INC{$k};
2942 3676
2943 $k =~ s/\.pm$//;
2944 $k =~ s/\//::/g;
2945
2946 if (my $cb = $k->can ("unload_module")) { 3677 if (my $cb = $pkg->can ("unload")) {
3678 eval {
2947 $cb->(); 3679 $cb->($pkg);
3680 1
3681 } or warn "$pkg unloaded, but with errors: $@";
3682 }
3683
3684 warn "... clearing $pkg";
3685 clear_package $pkg;
2948 } 3686 }
2949 3687
2950 Symbol::delete_package $k; 3688 warn "unloading all perl modules loaded from $LIBDIR";
3689 while (my ($k, $v) = each %INC) {
3690 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3691
3692 warn "... unloading $k";
3693 delete $INC{$k};
3694
3695 $k =~ s/\.pm$//;
3696 $k =~ s/\//::/g;
3697
3698 if (my $cb = $k->can ("unload_module")) {
3699 $cb->();
3700 }
3701
3702 clear_package $k;
2951 } 3703 }
2952 3704
2953 warn "getting rid of safe::, as good as possible"; 3705 warn "getting rid of safe::, as good as possible";
2954 Symbol::delete_package "safe::$_" 3706 clear_package "safe::$_"
2955 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3707 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2956 3708
2957 warn "unloading cf.pm \"a bit\""; 3709 warn "unloading cf.pm \"a bit\"";
2958 delete $INC{"cf.pm"}; 3710 delete $INC{"cf.pm"};
2959 delete $INC{"cf/pod.pm"}; 3711 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2960 3712
2961 # don't, removes xs symbols, too, 3713 # don't, removes xs symbols, too,
2962 # and global variables created in xs 3714 # and global variables created in xs
2963 #Symbol::delete_package __PACKAGE__; 3715 #clear_package __PACKAGE__;
2964 3716
2965 warn "unload completed, starting to reload now"; 3717 warn "unload completed, starting to reload now";
2966 3718
2967 warn "reloading cf.pm"; 3719 warn "reloading cf.pm";
2968 require cf; 3720 require cf;
2969 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3721 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2970 3722
2971 warn "loading config and database again"; 3723 warn "loading config and database again";
2972 cf::cfg_load; 3724 cf::reload_config;
2973 3725
2974 warn "loading extensions"; 3726 warn "loading extensions";
2975 cf::load_extensions; 3727 cf::load_extensions;
2976 3728
3729 if ($REATTACH_ON_RELOAD) {
2977 warn "reattaching attachments to objects/players"; 3730 warn "reattaching attachments to objects/players";
2978 _global_reattach; # objects, sockets 3731 _global_reattach; # objects, sockets
2979 warn "reattaching attachments to maps"; 3732 warn "reattaching attachments to maps";
2980 reattach $_ for values %MAP; 3733 reattach $_ for values %MAP;
2981 warn "reattaching attachments to players"; 3734 warn "reattaching attachments to players";
2982 reattach $_ for values %PLAYER; 3735 reattach $_ for values %PLAYER;
3736 }
2983 3737
3738 warn "running post_init jobs";
3739 (pop @POST_INIT)->(1) while @POST_INIT;
3740
2984 warn "leaving sync_job"; 3741 warn "leaving sync_job";
2985 3742
2986 1 3743 1
2987 } or do { 3744 } or do {
2988 warn $@; 3745 warn $@;
2989 warn "error while reloading, exiting."; 3746 cf::cleanup "error while reloading, exiting.";
2990 exit 1;
2991 }; 3747 };
2992 3748
2993 warn "reloaded"; 3749 warn "reloaded";
3750 --$RELOAD;
3751 }
3752
3753 $t1 = EV::time - $t1;
3754 warn "reload completed in ${t1}s\n";
2994}; 3755};
2995 3756
2996our $RELOAD_WATCHER; # used only during reload 3757our $RELOAD_WATCHER; # used only during reload
2997 3758
2998sub reload_perl() { 3759sub reload_perl() {
2999 # doing reload synchronously and two reloads happen back-to-back, 3760 # doing reload synchronously and two reloads happen back-to-back,
3000 # coro crashes during coro_state_free->destroy here. 3761 # coro crashes during coro_state_free->destroy here.
3001 3762
3002 $RELOAD_WATCHER ||= Event->timer ( 3763 $RELOAD_WATCHER ||= cf::async {
3003 reentrant => 0, 3764 Coro::AIO::aio_wait cache_extensions;
3004 after => 0, 3765
3005 data => WF_AUTOCANCEL, 3766 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3006 cb => sub {
3007 do_reload_perl; 3767 do_reload_perl;
3008 undef $RELOAD_WATCHER; 3768 undef $RELOAD_WATCHER;
3009 }, 3769 };
3010 ); 3770 };
3011} 3771}
3012 3772
3013register_command "reload" => sub { 3773register_command "reload" => sub {
3014 my ($who, $arg) = @_; 3774 my ($who, $arg) = @_;
3015 3775
3016 if ($who->flag (FLAG_WIZ)) { 3776 if ($who->flag (FLAG_WIZ)) {
3017 $who->message ("reloading server."); 3777 $who->message ("reloading server.");
3778 async {
3779 $Coro::current->{desc} = "perl_reload";
3018 async { reload_perl }; 3780 reload_perl;
3781 };
3019 } 3782 }
3020}; 3783};
3021 3784
3022unshift @INC, $LIBDIR; 3785unshift @INC, $LIBDIR;
3023 3786
… …
3025 3788
3026our @WAIT_FOR_TICK; 3789our @WAIT_FOR_TICK;
3027our @WAIT_FOR_TICK_BEGIN; 3790our @WAIT_FOR_TICK_BEGIN;
3028 3791
3029sub wait_for_tick { 3792sub wait_for_tick {
3030 return unless $TICK_WATCHER->is_active;
3031 return if $Coro::current == $Coro::main; 3793 return if tick_inhibit || $Coro::current == $Coro::main;
3032 3794
3033 my $signal = new Coro::Signal; 3795 my $signal = new Coro::Signal;
3034 push @WAIT_FOR_TICK, $signal; 3796 push @WAIT_FOR_TICK, $signal;
3035 $signal->wait; 3797 $signal->wait;
3036} 3798}
3037 3799
3038sub wait_for_tick_begin { 3800sub wait_for_tick_begin {
3039 return unless $TICK_WATCHER->is_active;
3040 return if $Coro::current == $Coro::main; 3801 return if tick_inhibit || $Coro::current == $Coro::main;
3041 3802
3042 my $signal = new Coro::Signal; 3803 my $signal = new Coro::Signal;
3043 push @WAIT_FOR_TICK_BEGIN, $signal; 3804 push @WAIT_FOR_TICK_BEGIN, $signal;
3044 $signal->wait; 3805 $signal->wait;
3045} 3806}
3046 3807
3047 my $min = 1e6;#d# 3808sub tick {
3048 my $avg = 10;
3049$TICK_WATCHER = Event->timer (
3050 reentrant => 0,
3051 parked => 1,
3052 prio => 0,
3053 at => $NEXT_TICK || $TICK,
3054 data => WF_AUTOCANCEL,
3055 cb => sub {
3056 if ($Coro::current != $Coro::main) { 3809 if ($Coro::current != $Coro::main) {
3057 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3810 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3058 unless ++$bug_warning > 10; 3811 unless ++$bug_warning > 10;
3059 return; 3812 return;
3060 } 3813 }
3061 3814
3062 $NOW = $tick_start = Event::time;
3063
3064 cf::server_tick; # one server iteration 3815 cf::server_tick; # one server iteration
3065 3816
3066 0 && sync_job {#d# 3817 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3067 for(1..10) { 3818 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3068 my $t = Event::time; 3819 Coro::async_pool {
3069 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3820 $Coro::current->{desc} = "runtime saver";
3070 or die; 3821 write_runtime_sync
3071 3822 or warn "ERROR: unable to write runtime file: $!";
3072 $map->width (50);
3073 $map->height (50);
3074 $map->alloc;
3075 $map->_load_objects ("/tmp/x.map", 1);
3076 my $t = Event::time - $t;
3077
3078 #next unless $t < 0.0013;#d#
3079 if ($t < $min) {
3080 $min = $t;
3081 }
3082 $avg = $avg * 0.99 + $t * 0.01;
3083 }
3084 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3085 exit 0;
3086 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3087 }; 3823 };
3824 }
3088 3825
3089 $RUNTIME += $TICK;
3090 $NEXT_TICK += $TICK;
3091
3092 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3093 $NEXT_RUNTIME_WRITE = $NOW + 10;
3094 Coro::async_pool {
3095 write_runtime
3096 or warn "ERROR: unable to write runtime file: $!";
3097 };
3098 }
3099
3100# my $AFTER = Event::time;
3101# warn $AFTER - $NOW;#d#
3102
3103 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3826 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3104 $sig->send; 3827 $sig->send;
3105 } 3828 }
3106 while (my $sig = shift @WAIT_FOR_TICK) { 3829 while (my $sig = shift @WAIT_FOR_TICK) {
3107 $sig->send; 3830 $sig->send;
3108 } 3831 }
3109 3832
3110 $NOW = Event::time; 3833 $LOAD = ($NOW - $TICK_START) / $TICK;
3111
3112 # if we are delayed by four ticks or more, skip them all
3113 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3114
3115 $TICK_WATCHER->at ($NEXT_TICK);
3116 $TICK_WATCHER->start;
3117
3118 $LOAD = ($NOW - $tick_start) / $TICK;
3119 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3834 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3120 3835
3121 _post_tick; 3836 if (0) {
3122 3837 if ($NEXT_TICK) {
3123 3838 my $jitter = $TICK_START - $NEXT_TICK;
3839 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3840 warn "jitter $JITTER\n";#d#
3841 }
3124 }, 3842 }
3125); 3843}
3126 3844
3127{ 3845{
3128 BDB::max_poll_time $TICK * 0.1; 3846 # configure BDB
3129 $BDB_POLL_WATCHER = Event->io ( 3847
3130 reentrant => 0,
3131 fd => BDB::poll_fileno,
3132 poll => 'r',
3133 prio => 0,
3134 data => WF_AUTOCANCEL,
3135 cb => \&BDB::poll_cb,
3136 );
3137 BDB::min_parallel 8; 3848 BDB::min_parallel 8;
3138 3849 BDB::max_poll_reqs $TICK * 0.1;
3139 BDB::set_sync_prepare { 3850 $AnyEvent::BDB::WATCHER->priority (1);
3140 my $status;
3141 my $current = $Coro::current;
3142 (
3143 sub {
3144 $status = $!;
3145 $current->ready; undef $current;
3146 },
3147 sub {
3148 Coro::schedule while defined $current;
3149 $! = $status;
3150 },
3151 )
3152 };
3153 3851
3154 unless ($DB_ENV) { 3852 unless ($DB_ENV) {
3155 $DB_ENV = BDB::db_env_create; 3853 $DB_ENV = BDB::db_env_create;
3854 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3855 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3856 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3857 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3858 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3156 3859
3157 cf::sync_job { 3860 cf::sync_job {
3158 eval { 3861 eval {
3159 BDB::db_env_open 3862 BDB::db_env_open
3160 $DB_ENV, 3863 $DB_ENV,
… …
3162 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3865 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3163 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3866 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3164 0666; 3867 0666;
3165 3868
3166 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3869 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3167
3168 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3169 $DB_ENV->set_lk_detect;
3170 }; 3870 };
3171 3871
3172 cf::cleanup "db_env_open(db): $@" if $@; 3872 cf::cleanup "db_env_open(db): $@" if $@;
3173 }; 3873 };
3174 } 3874 }
3875
3876 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3877 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3878 };
3879 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3880 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3881 };
3882 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3883 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3884 };
3175} 3885}
3176 3886
3177{ 3887{
3888 # configure IO::AIO
3889
3178 IO::AIO::min_parallel 8; 3890 IO::AIO::min_parallel 8;
3179
3180 undef $Coro::AIO::WATCHER;
3181 IO::AIO::max_poll_time $TICK * 0.1; 3891 IO::AIO::max_poll_time $TICK * 0.1;
3182 $AIO_POLL_WATCHER = Event->io ( 3892 undef $AnyEvent::AIO::WATCHER;
3183 reentrant => 0,
3184 data => WF_AUTOCANCEL,
3185 fd => IO::AIO::poll_fileno,
3186 poll => 'r',
3187 prio => 6,
3188 cb => \&IO::AIO::poll_cb,
3189 );
3190} 3893}
3191 3894
3192my $_log_backtrace; 3895my $_log_backtrace;
3193 3896
3194sub _log_backtrace { 3897sub _log_backtrace {
… …
3197 $msg =~ s/\n//; 3900 $msg =~ s/\n//;
3198 3901
3199 # limit the # of concurrent backtraces 3902 # limit the # of concurrent backtraces
3200 if ($_log_backtrace < 2) { 3903 if ($_log_backtrace < 2) {
3201 ++$_log_backtrace; 3904 ++$_log_backtrace;
3905 my $perl_bt = Carp::longmess $msg;
3202 async { 3906 async {
3907 $Coro::current->{desc} = "abt $msg";
3908
3203 my @bt = fork_call { 3909 my @bt = fork_call {
3204 @addr = map { sprintf "%x", $_ } @addr; 3910 @addr = map { sprintf "%x", $_ } @addr;
3205 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3911 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3206 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3912 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3207 or die "addr2line: $!"; 3913 or die "addr2line: $!";
… …
3215 } 3921 }
3216 3922
3217 @funcs 3923 @funcs
3218 }; 3924 };
3219 3925
3220 LOG llevInfo, "[ABT] $msg\n"; 3926 LOG llevInfo, "[ABT] $perl_bt\n";
3927 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3221 LOG llevInfo, "[ABT] $_\n" for @bt; 3928 LOG llevInfo, "[ABT] $_\n" for @bt;
3222 --$_log_backtrace; 3929 --$_log_backtrace;
3223 }; 3930 };
3224 } else { 3931 } else {
3225 LOG llevInfo, "[ABT] $msg\n"; 3932 LOG llevInfo, "[ABT] $msg\n";
3226 LOG llevInfo, "[ABT] [suppressed]\n"; 3933 LOG llevInfo, "[ABT] [suppressed]\n";
3227 } 3934 }
3228} 3935}
3229 3936
3230# load additional modules 3937# load additional modules
3231use cf::pod; 3938require "cf/$_.pm" for @EXTRA_MODULES;
3232 3939
3233END { cf::emergency_save } 3940END { cf::emergency_save }
3234 3941
32351 39421
3236 3943

Diff Legend

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