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.135 by root, Thu Jan 4 20:29:46 2007 UTC vs.
Revision 1.154 by root, Tue Jan 9 15:36:19 2007 UTC

… …
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 29# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 30$YAML::Syck::ImplicitUnicode = 1;
30 31
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 32$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 33
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 34sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
… …
47our %CFG; 48our %CFG;
48 49
49our $UPTIME; $UPTIME ||= time; 50our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 51our $RUNTIME;
51 52
53our %PLAYER; # all users
52our %MAP; # all maps 54our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 55our $LINK_MAP; # the special {link} map
54our $RANDOM_MAPS = cf::localdir . "/random"; 56our $RANDOM_MAPS = cf::localdir . "/random";
55our %EXT_CORO; 57our %EXT_CORO; # coroutines bound to extensions
56 58
57binmode STDOUT; 59binmode STDOUT;
58binmode STDERR; 60binmode STDERR;
59 61
60# read virtual server time, if available 62# read virtual server time, if available
… …
117 utf8::encode $msg; 119 utf8::encode $msg;
118 120
119 $msg .= "\n" 121 $msg .= "\n"
120 unless $msg =~ /\n$/; 122 unless $msg =~ /\n$/;
121 123
122 LOG llevError, "cfperl: $msg"; 124 LOG llevError, $msg;
123 }; 125 };
124} 126}
125 127
126@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
… …
153 155
154=head2 UTILITY FUNCTIONS 156=head2 UTILITY FUNCTIONS
155 157
156=over 4 158=over 4
157 159
160=item dumpval $ref
161
158=cut 162=cut
163
164sub dumpval {
165 eval {
166 local $SIG{__DIE__};
167 my $d;
168 if (1) {
169 $d = new Data::Dumper([$_[0]], ["*var"]);
170 $d->Terse(1);
171 $d->Indent(2);
172 $d->Quotekeys(0);
173 $d->Useqq(1);
174 #$d->Bless(...);
175 $d->Seen($_[1]) if @_ > 1;
176 $d = $d->Dump();
177 }
178 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
179 $d
180 } || "[unable to dump $_[0]: '$@']";
181}
159 182
160use JSON::Syck (); # TODO# replace by JSON::PC once working 183use JSON::Syck (); # TODO# replace by JSON::PC once working
161 184
162=item $ref = cf::from_json $json 185=item $ref = cf::from_json $json
163 186
… …
221 # wake up all waiters, to be on the safe side 244 # wake up all waiters, to be on the safe side
222 $_->ready for @{ delete $LOCK{$key} }; 245 $_->ready for @{ delete $LOCK{$key} };
223 } 246 }
224} 247}
225 248
226=item cf::async { BLOCK }
227
228Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
229error instead of exiting the server in case of a problem.
230
231=cut
232
233sub async(&) {
234 my ($cb) = @_;
235
236 Coro::async {
237 eval { $cb->() };
238 warn $@ if $@;
239 }
240}
241
242sub freeze_mainloop { 249sub freeze_mainloop {
243 return unless $TICK_WATCHER->is_active; 250 return unless $TICK_WATCHER->is_active;
244 251
245 my $guard = Coro::guard { $TICK_WATCHER->start }; 252 my $guard = Coro::guard { $TICK_WATCHER->start };
246 $TICK_WATCHER->stop; 253 $TICK_WATCHER->stop;
247 $guard 254 $guard
248} 255}
256
257=item cf::async { BLOCK }
258
259Currently the same as Coro::async_pool, meaning you cannot use
260C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
261thing you are allowed to do is call C<prio> on it.
262
263=cut
264
265BEGIN { *async = \&Coro::async_pool }
249 266
250=item cf::sync_job { BLOCK } 267=item cf::sync_job { BLOCK }
251 268
252The design of crossfire+ requires that the main coro ($Coro::main) is 269The design of crossfire+ requires that the main coro ($Coro::main) is
253always able to handle events or runnable, as crossfire+ is only partly 270always able to handle events or runnable, as crossfire+ is only partly
… …
272 my $freeze_guard = freeze_mainloop; 289 my $freeze_guard = freeze_mainloop;
273 290
274 my $busy = 1; 291 my $busy = 1;
275 my @res; 292 my @res;
276 293
277 (Coro::async { 294 (async {
278 @res = eval { $job->() }; 295 @res = eval { $job->() };
279 warn $@ if $@; 296 warn $@ if $@;
280 undef $busy; 297 undef $busy;
281 })->prio (Coro::PRIO_MAX); 298 })->prio (Coro::PRIO_MAX);
282 299
283 while ($busy) { 300 while ($busy) {
284 Coro::cede_notself; 301 Coro::cede or Event::one_event;
285 Event::one_event unless Coro::nready;
286 } 302 }
287 303
288 wantarray ? @res : $res[0] 304 wantarray ? @res : $res[0]
289 } else { 305 } else {
290 # we are in another coroutine, how wonderful, everything just works 306 # we are in another coroutine, how wonderful, everything just works
291 307
292 $job->() 308 $job->()
293 } 309 }
294} 310}
295 311
296=item $coro = cf::coro { BLOCK } 312=item $coro = cf::async_ext { BLOCK }
297 313
298Creates and returns a new coro. This coro is automcatially being canceled 314Like async, but this coro is automcatially being canceled when the
299when the extension calling this is being unloaded. 315extension calling this is being unloaded.
300 316
301=cut 317=cut
302 318
303sub coro(&) { 319sub async_ext(&) {
304 my $cb = shift; 320 my $cb = shift;
305 321
306 my $coro = &cf::async ($cb); 322 my $coro = &Coro::async ($cb);
307 323
308 $coro->on_destroy (sub { 324 $coro->on_destroy (sub {
309 delete $EXT_CORO{$coro+0}; 325 delete $EXT_CORO{$coro+0};
310 }); 326 });
311 $EXT_CORO{$coro+0} = $coro; 327 $EXT_CORO{$coro+0} = $coro;
… …
340=cut 356=cut
341 357
342############################################################################# 358#############################################################################
343 359
344package cf::path; 360package cf::path;
361
362# used to convert map paths into valid unix filenames by repalcing / by ∕
363our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
345 364
346sub new { 365sub new {
347 my ($class, $path, $base) = @_; 366 my ($class, $path, $base) = @_;
348 367
349 $path = $path->as_string if ref $path; 368 $path = $path->as_string if ref $path;
… …
413# } 432# }
414} 433}
415 434
416# escape the /'s in the path 435# escape the /'s in the path
417sub _escaped_path { 436sub _escaped_path {
418 # ∕ is U+2215
419 (my $path = $_[0]{path}) =~ s/\//∕/g; 437 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
420 $path 438 $path
421} 439}
422 440
423# the original (read-only) location 441# the original (read-only) location
424sub load_path { 442sub load_path {
… …
1078 1096
1079=head2 CORE EXTENSIONS 1097=head2 CORE EXTENSIONS
1080 1098
1081Functions and methods that extend core crossfire objects. 1099Functions and methods that extend core crossfire objects.
1082 1100
1101=cut
1102
1103package cf::player;
1104
1105use Coro::AIO;
1106
1083=head3 cf::player 1107=head3 cf::player
1084 1108
1085=over 4 1109=over 4
1086 1110
1087=item cf::player::exists $login 1111=item cf::player::find $login
1088 1112
1089Returns true when the given account exists. 1113Returns the given player object, loading it if necessary (might block).
1090 1114
1091=cut 1115=cut
1092 1116
1093sub cf::player::exists($) { 1117sub playerdir($) {
1094 cf::player::find $_[0] 1118 cf::localdir
1095 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1119 . "/"
1120 . cf::playerdir
1121 . "/"
1122 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1123}
1124
1125sub path($) {
1126 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1127
1128 (playerdir $login) . "/$login.pl"
1129}
1130
1131sub find_active($) {
1132 $cf::PLAYER{$_[0]}
1133 and $cf::PLAYER{$_[0]}->active
1134 and $cf::PLAYER{$_[0]}
1135}
1136
1137sub exists($) {
1138 my ($login) = @_;
1139
1140 $cf::PLAYER{$login}
1141 or cf::sync_job { !aio_stat $login }
1142}
1143
1144sub find($) {
1145 return $cf::PLAYER{$_[0]} || do {
1146 my $login = $_[0];
1147
1148 my $guard = cf::lock_acquire "user_find:$login";
1149
1150 $cf::PLAYER{$_[0]} || do {
1151 my $pl = load_pl path $login
1152 or return;
1153 $cf::PLAYER{$login} = $pl
1154 }
1155 }
1156}
1157
1158sub save($) {
1159 my ($pl) = @_;
1160
1161 return if $pl->{deny_save};
1162
1163 my $path = path $pl;
1164 my $guard = cf::lock_acquire "user_save:$path";
1165
1166 return if $pl->{deny_save};
1167
1168 aio_mkdir playerdir $pl, 0770;
1169 $pl->{last_save} = $cf::RUNTIME;
1170
1171 $pl->save_pl ($path);
1172 Coro::cede;
1173}
1174
1175sub new($) {
1176 my ($login) = @_;
1177
1178 my $self = create;
1179
1180 $self->ob->name ($login);
1181 $self->{deny_save} = 1;
1182
1183 $cf::PLAYER{$login} = $self;
1184
1185 $self
1186}
1187
1188=item $pl->quit_character
1189
1190Nukes the player without looking back. If logged in, the connection will
1191be destroyed. May block for a long time.
1192
1193=cut
1194
1195sub quit_character {
1196 my ($pl) = @_;
1197
1198 $pl->{deny_save} = 1;
1199 $pl->password ("*"); # this should lock out the player until we nuked the dir
1200
1201 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1202 $pl->deactivate;
1203 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1204 $pl->ns->destroy if $pl->ns;
1205
1206 my $path = playerdir $pl;
1207 my $temp = "$path~$cf::RUNTIME~deleting~";
1208 aio_rename $path, $temp;
1209 delete $cf::PLAYER{$pl->ob->name};
1210 $pl->destroy;
1211 IO::AIO::aio_rmtree $temp;
1212}
1213
1214=item cf::player::list_logins
1215
1216Returns am arrayref of all valid playernames in the system, can take a
1217while and may block, so not sync_job-capable, ever.
1218
1219=cut
1220
1221sub list_logins {
1222 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1223 or return [];
1224
1225 my @logins;
1226
1227 for my $login (@$dirs) {
1228 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1229 aio_read $fh, 0, 512, my $buf, 0 or next;
1230 $buf !~ /^password -------------$/ or next; # official not-valid tag
1231
1232 utf8::decode $login;
1233 push @logins, $login;
1234 }
1235
1236 \@logins
1237}
1238
1239=item $player->maps
1240
1241Returns an arrayref of cf::path's of all maps that are private for this
1242player. May block.
1243
1244=cut
1245
1246sub maps($) {
1247 my ($pl) = @_;
1248
1249 my $files = aio_readdir playerdir $pl
1250 or return;
1251
1252 my @paths;
1253
1254 for (@$files) {
1255 utf8::decode $_;
1256 next if /\.(?:pl|pst)$/;
1257 next unless /^$PATH_SEP/;
1258
1259 s/$PATH_SEP/\//g;
1260 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1261 }
1262
1263 \@paths
1096} 1264}
1097 1265
1098=item $player->ext_reply ($msgid, $msgtype, %msg) 1266=item $player->ext_reply ($msgid, $msgtype, %msg)
1099 1267
1100Sends an ext reply to the player. 1268Sends an ext reply to the player.
1101 1269
1102=cut 1270=cut
1103 1271
1104sub cf::player::ext_reply($$$%) { 1272sub ext_reply($$$%) {
1105 my ($self, $id, %msg) = @_; 1273 my ($self, $id, %msg) = @_;
1106 1274
1107 $msg{msgid} = $id; 1275 $msg{msgid} = $id;
1108 1276
1109 $self->send ("ext " . to_json \%msg); 1277 $self->send ("ext " . cf::to_json \%msg);
1110} 1278}
1279
1280package cf;
1111 1281
1112=back 1282=back
1113 1283
1114 1284
1115=head3 cf::map 1285=head3 cf::map
… …
1296} 1466}
1297 1467
1298sub save { 1468sub save {
1299 my ($self) = @_; 1469 my ($self) = @_;
1300 1470
1471 my $lock = cf::lock_acquire "map_data:" . $self->path;
1472
1301 $self->{last_save} = $cf::RUNTIME; 1473 $self->{last_save} = $cf::RUNTIME;
1302 1474
1303 return unless $self->dirty; 1475 return unless $self->dirty;
1304 1476
1305 my $save = $self->{path}->save_path; utf8::encode $save; 1477 my $save = $self->{path}->save_path; utf8::encode $save;
… …
1308 $self->{load_path} = $save; 1480 $self->{load_path} = $save;
1309 1481
1310 return if $self->{deny_save}; 1482 return if $self->{deny_save};
1311 1483
1312 local $self->{last_access} = $self->last_access;#d# 1484 local $self->{last_access} = $self->last_access;#d#
1485
1486 cf::async {
1487 $_->contr->save for $self->players;
1488 };
1313 1489
1314 if ($uniq) { 1490 if ($uniq) {
1315 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1491 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1316 $self->save_objects ($uniq, cf::IO_UNIQUES); 1492 $self->save_objects ($uniq, cf::IO_UNIQUES);
1317 } else { 1493 } else {
… …
1323 my ($self) = @_; 1499 my ($self) = @_;
1324 1500
1325 # save first because save cedes 1501 # save first because save cedes
1326 $self->save; 1502 $self->save;
1327 1503
1504 my $lock = cf::lock_acquire "map_data:" . $self->path;
1505
1328 return if $self->players; 1506 return if $self->players;
1329 return if $self->in_memory != cf::MAP_IN_MEMORY; 1507 return if $self->in_memory != cf::MAP_IN_MEMORY;
1330 return if $self->{deny_save}; 1508 return if $self->{deny_save};
1331 1509
1332 $self->clear; 1510 $self->clear;
… …
1374} 1552}
1375 1553
1376sub reset { 1554sub reset {
1377 my ($self) = @_; 1555 my ($self) = @_;
1378 1556
1557 my $lock = cf::lock_acquire "map_data:" . $self->path;
1558
1379 return if $self->players; 1559 return if $self->players;
1380 return if $self->{path}{user_rel};#d# 1560 return if $self->{path}{user_rel};#d#
1381 1561
1382 warn "resetting map ", $self->path;#d# 1562 warn "resetting map ", $self->path;#d#
1383 1563
… …
1411} 1591}
1412 1592
1413sub emergency_save { 1593sub emergency_save {
1414 my $freeze_guard = cf::freeze_mainloop; 1594 my $freeze_guard = cf::freeze_mainloop;
1415 1595
1416 warn "enter emergency map save\n"; 1596 warn "enter emergency perl save\n";
1417 1597
1418 cf::sync_job { 1598 cf::sync_job {
1599 warn "begin emergency player save\n";
1600 $_->save for values %cf::PLAYER;
1601 warn "end emergency player save\n";
1602
1419 warn "begin emergency map save\n"; 1603 warn "begin emergency map save\n";
1420 $_->save for values %cf::MAP; 1604 $_->save for values %cf::MAP;
1605 warn "end emergency map save\n";
1421 }; 1606 };
1422 1607
1423 warn "end emergency map save\n"; 1608 warn "leave emergency perl save\n";
1424} 1609}
1425 1610
1426package cf; 1611package cf;
1427 1612
1428=back 1613=back
… …
1527 ($x, $y) = ($map->enter_x, $map->enter_y) 1712 ($x, $y) = ($map->enter_x, $map->enter_y)
1528 if $x <=0 && $y <= 0; 1713 if $x <=0 && $y <= 0;
1529 1714
1530 $map->load; 1715 $map->load;
1531 1716
1717 return unless $self->contr->active;
1532 $self->activate_recursive; 1718 $self->activate_recursive;
1533 $self->enter_map ($map, $x, $y); 1719 $self->enter_map ($map, $x, $y);
1534} 1720}
1535 1721
1536cf::player->attach ( 1722cf::player->attach (
… …
1549 1735
1550 # try to abort aborted map switching on player login :) 1736 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes 1737 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) { 1738 if ($pl->ob->{_link_pos}) {
1553 $pl->ob->enter_link; 1739 $pl->ob->enter_link;
1554 cf::async { 1740 (async {
1555 # we need this sleep as the login has a concurrent enter_exit running 1741 # we need this sleep as the login has a concurrent enter_exit running
1556 # and this sleep increases chances of the player not ending up in scorn 1742 # and this sleep increases chances of the player not ending up in scorn
1743 $pl->ob->reply (undef,
1744 "There was an internal problem at your last logout, "
1745 . "the server will try to bring you to your intended destination in a second.",
1746 cf::NDI_RED);
1557 Coro::Timer::sleep 1; 1747 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link; 1748 $pl->ob->leave_link;
1559 }; 1749 })->prio (2);
1560 } 1750 }
1561 }, 1751 },
1562); 1752);
1563 1753
1564=item $player_object->goto_map ($path, $x, $y) 1754=item $player_object->goto ($path, $x, $y)
1565 1755
1566=cut 1756=cut
1567 1757
1568sub cf::object::player::goto_map { 1758sub cf::object::player::goto {
1569 my ($self, $path, $x, $y) = @_; 1759 my ($self, $path, $x, $y) = @_;
1570 1760
1761 $path = new cf::path $path;
1762 $path ne "/" or Carp::cluck ("oy");#d#
1763
1571 $self->enter_link; 1764 $self->enter_link;
1572 1765
1573 (cf::async { 1766 (async {
1574 $path = new cf::path $path;
1575
1576 my $map = cf::map::find $path->as_string; 1767 my $map = cf::map::find $path->as_string;
1577 $map = $map->customise_for ($self) if $map; 1768 $map = $map->customise_for ($self) if $map;
1578 1769
1579# warn "entering ", $map->path, " at ($x, $y)\n" 1770# warn "entering ", $map->path, " at ($x, $y)\n"
1580# if $map; 1771# if $map;
1581 1772
1582 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1773 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1583 1774
1584 $self->leave_link ($map, $x, $y); 1775 $self->leave_link ($map, $x, $y);
1585 })->prio (1); 1776 })->prio (1);
1586} 1777}
1587 1778
… …
1640 1831
1641 return unless $self->type == cf::PLAYER; 1832 return unless $self->type == cf::PLAYER;
1642 1833
1643 $self->enter_link; 1834 $self->enter_link;
1644 1835
1645 (cf::async { 1836 (async {
1646 $self->deactivate_recursive; # just to be sure 1837 $self->deactivate_recursive; # just to be sure
1647 unless (eval { 1838 unless (eval {
1648 prepare_random_map $exit 1839 prepare_random_map $exit
1649 if $exit->slaying eq "/!"; 1840 if $exit->slaying eq "/!";
1650 1841
1651 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1842 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1652 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1843 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1653 1844
1654 1; 1845 1;
1655 }) { 1846 }) {
1656 $self->message ("Something went wrong deep within the crossfire server. " 1847 $self->message ("Something went wrong deep within the crossfire server. "
1657 . "I'll try to bring you back to the map you were before. " 1848 . "I'll try to bring you back to the map you were before. "
… …
1731 } 1922 }
1732 } 1923 }
1733 }, 1924 },
1734); 1925);
1735 1926
1736=item $client->coro (\&cb) 1927=item $client->async (\&cb)
1737 1928
1738Create a new coroutine, running the specified callback. The coroutine will 1929Create a new coroutine, running the specified callback. The coroutine will
1739be automatically cancelled when the client gets destroyed (e.g. on logout, 1930be automatically cancelled when the client gets destroyed (e.g. on logout,
1740or loss of connection). 1931or loss of connection).
1741 1932
1742=cut 1933=cut
1743 1934
1744sub cf::client::coro { 1935sub cf::client::async {
1745 my ($self, $cb) = @_; 1936 my ($self, $cb) = @_;
1746 1937
1747 my $coro = &cf::async ($cb); 1938 my $coro = &Coro::async ($cb);
1748 1939
1749 $coro->on_destroy (sub { 1940 $coro->on_destroy (sub {
1750 delete $self->{_coro}{$coro+0}; 1941 delete $self->{_coro}{$coro+0};
1751 }); 1942 });
1752 1943
… …
1990 local $/; 2181 local $/;
1991 *CFG = YAML::Syck::Load <$fh>; 2182 *CFG = YAML::Syck::Load <$fh>;
1992 2183
1993 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2184 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1994 2185
2186 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2187 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2188
1995 if (exists $CFG{mlockall}) { 2189 if (exists $CFG{mlockall}) {
1996 eval { 2190 eval {
1997 $CFG{mlockall} ? &mlockall : &munlockall 2191 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1998 and die "WARNING: m(un)lockall failed: $!\n"; 2192 and die "WARNING: m(un)lockall failed: $!\n";
1999 }; 2193 };
2000 warn $@ if $@; 2194 warn $@ if $@;
2001 } 2195 }
2002} 2196}
2003 2197
2004sub main { 2198sub main {
2005 # we must not ever block the main coroutine 2199 # we must not ever block the main coroutine
2006 local $Coro::idle = sub { 2200 local $Coro::idle = sub {
2007 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2008 (Coro::unblock_sub {
2009 Event::one_event; 2202 async { Event::one_event };
2010 })->();
2011 }; 2203 };
2012 2204
2013 cfg_load; 2205 cfg_load;
2014 db_load; 2206 db_load;
2015 load_extensions; 2207 load_extensions;
… …
2098 cf::load_extensions; 2290 cf::load_extensions;
2099 2291
2100 # reattach attachments to objects 2292 # reattach attachments to objects
2101 warn "reattach"; 2293 warn "reattach";
2102 _global_reattach; 2294 _global_reattach;
2295 reattach $_ for values %MAP;
2103 }; 2296 };
2104 2297
2105 if ($@) { 2298 if ($@) {
2106 warn $@; 2299 warn $@;
2107 warn "error while reloading, exiting."; 2300 warn "error while reloading, exiting.";
… …
2123 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2316 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2124 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2317 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2125 2318
2126 # dirty hack because... archetypes are not yet loaded 2319 # dirty hack because... archetypes are not yet loaded
2127 Event->timer ( 2320 Event->timer (
2128 after => 2, 2321 after => 10,
2129 cb => sub { 2322 cb => sub {
2130 $_[0]->w->cancel; 2323 $_[0]->w->cancel;
2131 2324
2132 # provide some exits "home" 2325 # provide some exits "home"
2133 my $exit = cf::object::new "exit"; 2326 my $exit = cf::object::new "exit";

Diff Legend

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