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

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

Diff Legend

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