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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.292 by root, Tue Jul 3 00:54:57 2007 UTC vs.
Revision 1.480 by root, Thu Oct 8 05:09:43 2009 UTC

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

Diff Legend

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