ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

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

Diff Legend

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