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.110 by root, Mon Jan 1 11:21:55 2007 UTC vs.
Revision 1.127 by root, Wed Jan 3 00:05:26 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
181sub to_json($) { 181sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 183 JSON::Syck::Dump $_[0]
184} 184}
185 185
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string
209
210Wait until the given lock is available. See cf::lock_acquire.
211
212=item my $lock = cf::lock_acquire $string
213
214Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically
217returned.
218
219Lock names should begin with a unique identifier (for example, find_map
220uses map_find and load_map uses map_load).
221
222=cut
223
224our %LOCK;
225
226sub lock_wait($) {
227 my ($key) = @_;
228
229 # wait for lock, if any
230 while ($LOCK{$key}) {
231 push @{ $LOCK{$key} }, $Coro::current;
232 Coro::schedule;
233 }
234}
235
236sub lock_acquire($) {
237 my ($key) = @_;
238
239 # wait, to be sure we are not locked
240 lock_wait $key;
241
242 $LOCK{$key} = [];
243
244 cf::guard {
245 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} };
247 }
248}
249
250=item cf::async { BLOCK }
251
252Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
253error instead of exiting the server in case of a problem.
254
255=cut
256
257sub async(&) {
258 my ($cb) = @_;
259
260 Coro::async {
261 eval { $cb->() };
262 warn $@ if $@;
263 }
264}
265
186=item cf::sync_job { BLOCK } 266=item cf::sync_job { BLOCK }
187 267
188The design of crossfire+ requires that the main coro ($Coro::main) is 268The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 269always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 270reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
197=cut 277=cut
198 278
199sub sync_job(&) { 279sub sync_job(&) {
200 my ($job) = @_; 280 my ($job) = @_;
201 281
202 my $busy = 1;
203 my @res;
204
205 my $coro = Coro::async {
206 @res = eval { $job->() };
207 warn $@ if $@;
208 undef $busy;
209 };
210
211 if ($Coro::current == $Coro::main) { 282 if ($Coro::current == $Coro::main) {
283 # this is the main coro, too bad, we have to block
284 # till the operation succeeds, freezing the server :/
285
212 # TODO: use suspend/resume instead 286 # TODO: use suspend/resume instead
287 # (but this is cancel-safe)
213 local $FREEZE = 1; 288 local $FREEZE = 1;
289
290 my $busy = 1;
291 my @res;
292
293 (Coro::async {
294 @res = eval { $job->() };
295 warn $@ if $@;
296 undef $busy;
214 $coro->prio (Coro::PRIO_MAX); 297 })->prio (Coro::PRIO_MAX);
298
215 while ($busy) { 299 while ($busy) {
216 Coro::cede_notself; 300 Coro::cede_notself;
217 Event::one_event unless Coro::nready; 301 Event::one_event unless Coro::nready;
218 } 302 }
303
304 wantarray ? @res : $res[0]
219 } else { 305 } else {
220 $coro->join; 306 # we are in another coroutine, how wonderful, everything just works
307
308 $job->()
221 } 309 }
222
223 wantarray ? @res : $res[0]
224} 310}
225 311
226=item $coro = cf::coro { BLOCK } 312=item $coro = cf::coro { BLOCK }
227 313
228Creates and returns a new coro. This coro is automcatially being canceled 314Creates and returns a new coro. This coro is automcatially being canceled
… …
231=cut 317=cut
232 318
233sub coro(&) { 319sub coro(&) {
234 my $cb = shift; 320 my $cb = shift;
235 321
236 my $coro; $coro = async { 322 my $coro = &cf::async ($cb);
237 eval {
238 $cb->();
239 };
240 warn $@ if $@;
241 };
242 323
243 $coro->on_destroy (sub { 324 $coro->on_destroy (sub {
244 delete $EXT_CORO{$coro+0}; 325 delete $EXT_CORO{$coro+0};
245 }); 326 });
246 $EXT_CORO{$coro+0} = $coro; 327 $EXT_CORO{$coro+0} = $coro;
… …
252 my $runtime = cf::localdir . "/runtime"; 333 my $runtime = cf::localdir . "/runtime";
253 334
254 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 335 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
255 or return; 336 or return;
256 337
257 my $value = $cf::RUNTIME; 338 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock
258 (aio_write $fh, 0, (length $value), $value, 0) <= 0 339 (aio_write $fh, 0, (length $value), $value, 0) <= 0
259 and return; 340 and return;
260 341
261 aio_fsync $fh 342 aio_fsync $fh
262 and return; 343 and return;
… …
283 364
284 $path = $path->as_string if ref $path; 365 $path = $path->as_string if ref $path;
285 366
286 my $self = bless { }, $class; 367 my $self = bless { }, $class;
287 368
369 # {... are special paths that are not touched
370 # ?xxx/... are special absolute paths
371 # ?random/... random maps
372 # /! non-realised random map exit
373 # /... normal maps
374 # ~/... per-player maps without a specific player (DO NOT USE)
375 # ~user/... per-player map of a specific user
376
377 if ($path =~ /^{/) {
378 # fine as it is
288 if ($path =~ s{^\?random/}{}) { 379 } elsif ($path =~ s{^\?random/}{}) {
289 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 380 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
290 $self->{random} = cf::from_json $data; 381 $self->{random} = cf::from_json $data;
291 } else { 382 } else {
292 if ($path =~ s{^~([^/]+)?}{}) { 383 if ($path =~ s{^~([^/]+)?}{}) {
293 $self->{user_rel} = 1; 384 $self->{user_rel} = 1;
… …
798 or return; 889 or return;
799 890
800 unless (aio_stat "$filename.pst") { 891 unless (aio_stat "$filename.pst") {
801 (aio_load "$filename.pst", $av) >= 0 892 (aio_load "$filename.pst", $av) >= 0
802 or return; 893 or return;
803 $av = eval { (Storable::thaw <$av>)->{objs} }; 894 $av = eval { (Storable::thaw $av)->{objs} };
804 } 895 }
805 896
897 warn sprintf "loading %s (%d)\n",
898 $filename, length $data, scalar @{$av || []};#d#
806 return ($data, $av); 899 return ($data, $av);
807} 900}
808 901
809############################################################################# 902#############################################################################
810# command handling &c 903# command handling &c
… …
1046use Fcntl; 1139use Fcntl;
1047use Coro::AIO; 1140use Coro::AIO;
1048 1141
1049our $MAX_RESET = 7200; 1142our $MAX_RESET = 7200;
1050our $DEFAULT_RESET = 3600; 1143our $DEFAULT_RESET = 3600;
1051$MAX_RESET = 10;#d#
1052$DEFAULT_RESET = 10;#d#
1053 1144
1054sub generate_random_map { 1145sub generate_random_map {
1055 my ($path, $rmp) = @_; 1146 my ($path, $rmp) = @_;
1056 1147
1057 # mit "rum" bekleckern, nicht 1148 # mit "rum" bekleckern, nicht
… …
1073# and all this just because we cannot iterate over 1164# and all this just because we cannot iterate over
1074# all maps in C++... 1165# all maps in C++...
1075sub change_all_map_light { 1166sub change_all_map_light {
1076 my ($change) = @_; 1167 my ($change) = @_;
1077 1168
1078 $_->change_map_light ($change) for values %cf::MAP; 1169 $_->change_map_light ($change)
1170 for grep $_->outdoor, values %cf::MAP;
1079} 1171}
1080 1172
1081sub try_load_header($) { 1173sub try_load_header($) {
1082 my ($path) = @_; 1174 my ($path) = @_;
1083 1175
… …
1090 1182
1091 $map->load_header ($path) 1183 $map->load_header ($path)
1092 or return; 1184 or return;
1093 1185
1094 $map->{load_path} = $path; 1186 $map->{load_path} = $path;
1095 use Data::Dumper; warn Dumper $map;#d#
1096 1187
1097 $map 1188 $map
1098} 1189}
1099 1190
1191sub find_map;
1100sub find_map { 1192sub find_map {
1101 my ($path, $origin) = @_; 1193 my ($path, $origin) = @_;
1102 1194
1103 #warn "find_map<$path,$origin>\n";#d# 1195 #warn "find_map<$path,$origin>\n";#d#
1104 1196
1105 $path = ref $path ? $path : new cf::path $path, $origin && $origin->path; 1197 $path = new cf::path $path, $origin && $origin->path;
1106 my $key = $path->as_string; 1198 my $key = $path->as_string;
1107 1199
1200 cf::lock_wait "map_find:$key";
1201
1108 $cf::MAP{$key} || do { 1202 $cf::MAP{$key} || do {
1203 my $guard = cf::lock_acquire "map_find:$key";
1204
1109 # do it the slow way 1205 # do it the slow way
1110 my $map = try_load_header $path->save_path; 1206 my $map = try_load_header $path->save_path;
1111 1207
1112 if ($map) { 1208 if ($map) {
1113 # safety 1209 # safety
… …
1120 $map = try_load_header $path->load_path; 1216 $map = try_load_header $path->load_path;
1121 } 1217 }
1122 1218
1123 $map or return; 1219 $map or return;
1124 1220
1221 $map->{load_original} = 1;
1125 $map->{instantiate_time} = $cf::RUNTIME; 1222 $map->{instantiate_time} = $cf::RUNTIME;
1126 $map->instantiate; 1223 $map->instantiate;
1127 1224
1128 # per-player maps become, after loading, normal maps 1225 # per-player maps become, after loading, normal maps
1129 $map->per_player (0) if $path->{user_rel}; 1226 $map->per_player (0) if $path->{user_rel};
1130 } 1227 }
1131 1228
1132 $map->path ($key); 1229 $map->path ($key);
1133 $map->{path} = $path; 1230 $map->{path} = $path;
1231 $map->{last_save} = $cf::RUNTIME;
1134 $map->last_access ($cf::RUNTIME); 1232 $map->last_access ($cf::RUNTIME);
1135 1233
1136 $map->reset if $map->should_reset; 1234 if ($map->should_reset) {
1235 $map->reset;
1236 undef $guard;
1237 $map = find_map $path
1238 or return;
1239 }
1137 1240
1138 $cf::MAP{$key} = $map 1241 $cf::MAP{$key} = $map
1139 } 1242 }
1140} 1243}
1141 1244
1142sub load { 1245sub load {
1143 my ($self) = @_; 1246 my ($self) = @_;
1144 1247
1248 my $path = $self->{path};
1249 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1250
1145 return if $self->in_memory != cf::MAP_SWAPPED; 1251 return if $self->in_memory != cf::MAP_SWAPPED;
1146 1252
1147 $self->in_memory (cf::MAP_LOADING); 1253 $self->in_memory (cf::MAP_LOADING);
1148
1149 my $path = $self->{path};
1150 1254
1151 $self->alloc; 1255 $self->alloc;
1152 $self->load_objects ($self->{load_path}, 1) 1256 $self->load_objects ($self->{load_path}, 1)
1153 or return; 1257 or return;
1258
1259 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1260 if delete $self->{load_original};
1154 1261
1155 if (my $uniq = $path->uniq_path) { 1262 if (my $uniq = $path->uniq_path) {
1156 utf8::encode $uniq; 1263 utf8::encode $uniq;
1157 if (aio_open $uniq, O_RDONLY, 0) { 1264 if (aio_open $uniq, O_RDONLY, 0) {
1158 $self->clear_unique_items; 1265 $self->clear_unique_items;
… …
1193} 1300}
1194 1301
1195sub save { 1302sub save {
1196 my ($self) = @_; 1303 my ($self) = @_;
1197 1304
1305 $self->{last_save} = $cf::RUNTIME;
1306
1307 return unless $self->dirty;
1308
1198 my $save = $self->{path}->save_path; utf8::encode $save; 1309 my $save = $self->{path}->save_path; utf8::encode $save;
1199 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1310 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1200 1311
1201 $self->{last_save} = $cf::RUNTIME;
1202
1203 return unless $self->dirty;
1204
1205 $self->{load_path} = $save; 1312 $self->{load_path} = $save;
1206 1313
1207 return if $self->{deny_save}; 1314 return if $self->{deny_save};
1208
1209 warn "saving map ", $self->path;
1210 1315
1211 if ($uniq) { 1316 if ($uniq) {
1212 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1317 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1213 $self->save_objects ($uniq, cf::IO_UNIQUES); 1318 $self->save_objects ($uniq, cf::IO_UNIQUES);
1214 } else { 1319 } else {
… …
1226 $self->save; 1331 $self->save;
1227 $self->clear; 1332 $self->clear;
1228 $self->in_memory (cf::MAP_SWAPPED); 1333 $self->in_memory (cf::MAP_SWAPPED);
1229} 1334}
1230 1335
1336sub reset_at {
1337 my ($self) = @_;
1338
1339 # TODO: safety, remove and allow resettable per-player maps
1340 return 1e99 if $self->{path}{user_rel};
1341 return 1e99 if $self->{deny_reset};
1342
1343 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1344 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1345
1346 $time + $to
1347}
1348
1231sub should_reset { 1349sub should_reset {
1232 my ($map) = @_;
1233
1234 # TODO: safety, remove and allow resettable per-player maps
1235 return if $map->{path}{user_rel};#d#
1236 return if $map->{deny_reset};
1237 #return unless $map->reset_timeout;
1238
1239 my $time = $map->fixed_resettime ? $map->{instantiate_time} : $map->last_access;
1240
1241 $time + ($map->reset_timeout || $DEFAULT_RESET) < $cf::RUNTIME
1242}
1243
1244sub reset {
1245 my ($self) = @_; 1350 my ($self) = @_;
1246 1351
1247 return if $self->players; 1352 $self->reset_at <= $cf::RUNTIME
1248 return if $self->{path}{user_rel};#d# 1353}
1249 1354
1250 warn "resetting map ", $self->path;#d# 1355sub unlink_save {
1356 my ($self) = @_;
1251 1357
1252 utf8::encode (my $save = $self->{path}->save_path); 1358 utf8::encode (my $save = $self->{path}->save_path);
1253 aioreq_pri 3; IO::AIO::aio_unlink $save; 1359 aioreq_pri 3; IO::AIO::aio_unlink $save;
1254 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; 1360 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1361}
1362
1363sub rename {
1364 my ($self, $new_path) = @_;
1365
1366 $self->unlink_save;
1367
1368 delete $cf::MAP{$self->path};
1369 $self->{path} = new cf::path $new_path;
1370 $self->path ($self->{path}->as_string);
1371 $cf::MAP{$self->path} = $self;
1372
1373 $self->save;
1374}
1375
1376sub reset {
1377 my ($self) = @_;
1378
1379 return if $self->players;
1380 return if $self->{path}{user_rel};#d#
1381
1382 warn "resetting map ", $self->path;#d#
1383
1384 delete $cf::MAP{$self->path};
1255 1385
1256 $_->clear_links_to ($self) for values %cf::MAP; 1386 $_->clear_links_to ($self) for values %cf::MAP;
1257 1387
1388 $self->unlink_save;
1258 $self->clear; 1389 $self->destroy;
1259 $self->in_memory (cf::MAP_SWAPPED); 1390}
1260 utf8::encode ($self->{load_path} = $self->{path}->load_path); 1391
1392my $nuke_counter = "aaaa";
1393
1394sub nuke {
1395 my ($self) = @_;
1396
1397 $self->{deny_save} = 1;
1398 $self->reset_timeout (1);
1399 $self->rename ("{nuke}/" . ($nuke_counter++));
1400 $self->reset; # polite request, might not happen
1261} 1401}
1262 1402
1263sub customise_for { 1403sub customise_for {
1264 my ($map, $ob) = @_; 1404 my ($map, $ob) = @_;
1265 1405
… …
1330 (ref $cf::CFG{"may_$access"} 1470 (ref $cf::CFG{"may_$access"}
1331 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1471 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1332 : $cf::CFG{"may_$access"}) 1472 : $cf::CFG{"may_$access"})
1333} 1473}
1334 1474
1475=item $player_object->enter_link
1476
1477Freezes the player and moves him/her to a special map (C<{link}>).
1478
1479The player should be reaosnably safe there for short amounts of time. You
1480I<MUST> call C<leave_link> as soon as possible, though.
1481
1482=item $player_object->leave_link ($map, $x, $y)
1483
1484Moves the player out of the specila link map onto the given map. If the
1485map is not valid (or omitted), the player will be moved back to the
1486location he/she was before the call to C<enter_link>, or, if that fails,
1487to the emergency map position.
1488
1489Might block.
1490
1491=cut
1492
1335sub cf::object::player::enter_link { 1493sub cf::object::player::enter_link {
1336 my ($self) = @_; 1494 my ($self) = @_;
1337 1495
1496 $self->deactivate_recursive;
1497
1338 return if $self->map == $LINK_MAP; 1498 return if $self->map == $LINK_MAP;
1339 1499
1340 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1341 if $self->map; 1501 if $self->map;
1342 1502
1343 $self->enter_map ($LINK_MAP, 20, 20); 1503 $self->enter_map ($LINK_MAP, 20, 20);
1344 $self->deactivate_recursive;
1345} 1504}
1346 1505
1347sub cf::object::player::leave_link { 1506sub cf::object::player::leave_link {
1348 my ($self, $map, $x, $y) = @_; 1507 my ($self, $map, $x, $y) = @_;
1349 1508
1350 my $link_pos = delete $self->{_link_pos}; 1509 my $link_pos = delete $self->{_link_pos};
1351 1510
1352 unless ($map) { 1511 unless ($map) {
1353 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1354
1355 # restore original map position 1512 # restore original map position
1356 ($map, $x, $y) = @{ $link_pos || [] }; 1513 ($map, $x, $y) = @{ $link_pos || [] };
1357 $map = cf::map::find_map $map; 1514 $map = cf::map::find_map $map;
1358 1515
1359 unless ($map) { 1516 unless ($map) {
… …
1374 1531
1375 $self->activate_recursive; 1532 $self->activate_recursive;
1376 $self->enter_map ($map, $x, $y); 1533 $self->enter_map ($map, $x, $y);
1377} 1534}
1378 1535
1536cf::player->attach (
1537 on_logout => sub {
1538 my ($pl) = @_;
1539
1540 # abort map switching before logout
1541 if ($pl->ob->{_link_pos}) {
1542 cf::sync_job {
1543 $pl->ob->leave_link
1544 };
1545 }
1546 },
1547 on_login => sub {
1548 my ($pl) = @_;
1549
1550 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) {
1553 $pl->ob->enter_link;
1554 cf::async {
1555 # 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
1557 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link;
1559 };
1560 }
1561 },
1562);
1563
1379=item $player_object->goto_map ($map, $x, $y) 1564=item $player_object->goto_map ($path, $x, $y)
1380 1565
1381=cut 1566=cut
1382 1567
1383sub cf::object::player::goto_map { 1568sub cf::object::player::goto_map {
1384 my ($self, $path, $x, $y) = @_; 1569 my ($self, $path, $x, $y) = @_;
1385 1570
1386 $self->enter_link; 1571 $self->enter_link;
1387 1572
1388 (Coro::async { 1573 (cf::async {
1389 $path = new cf::path $path; 1574 $path = new cf::path $path;
1390 1575
1391 my $map = cf::map::find_map $path->as_string; 1576 my $map = cf::map::find_map $path->as_string;
1392 $map = $map->customise_for ($self) if $map; 1577 $map = $map->customise_for ($self) if $map;
1393 1578
1394 warn "entering ", $map->path, " at ($x, $y)\n" 1579# warn "entering ", $map->path, " at ($x, $y)\n"
1395 if $map; 1580# if $map;
1581
1582 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1396 1583
1397 $self->leave_link ($map, $x, $y); 1584 $self->leave_link ($map, $x, $y);
1398 })->prio (1); 1585 })->prio (1);
1399} 1586}
1400 1587
… …
1453 1640
1454 return unless $self->type == cf::PLAYER; 1641 return unless $self->type == cf::PLAYER;
1455 1642
1456 $self->enter_link; 1643 $self->enter_link;
1457 1644
1458 (Coro::async { 1645 (cf::async {
1459 unless (eval { 1646 unless (eval {
1460
1461 prepare_random_map $exit 1647 prepare_random_map $exit
1462 if $exit->slaying eq "/!"; 1648 if $exit->slaying eq "/!";
1463 1649
1464 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1650 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1465 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1651 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);
… …
1554=cut 1740=cut
1555 1741
1556sub cf::client::coro { 1742sub cf::client::coro {
1557 my ($self, $cb) = @_; 1743 my ($self, $cb) = @_;
1558 1744
1559 my $coro; $coro = async { 1745 my $coro = &cf::async ($cb);
1560 eval {
1561 $cb->();
1562 };
1563 warn $@ if $@;
1564 };
1565 1746
1566 $coro->on_destroy (sub { 1747 $coro->on_destroy (sub {
1567 delete $self->{_coro}{$coro+0}; 1748 delete $self->{_coro}{$coro+0};
1568 }); 1749 });
1569 1750
… …
1741 1922
1742{ 1923{
1743 my $path = cf::localdir . "/database.pst"; 1924 my $path = cf::localdir . "/database.pst";
1744 1925
1745 sub db_load() { 1926 sub db_load() {
1746 warn "loading database $path\n";#d# remove later
1747 $DB = stat $path ? Storable::retrieve $path : { }; 1927 $DB = stat $path ? Storable::retrieve $path : { };
1748 } 1928 }
1749 1929
1750 my $pid; 1930 my $pid;
1751 1931
1752 sub db_save() { 1932 sub db_save() {
1753 warn "saving database $path\n";#d# remove later
1754 waitpid $pid, 0 if $pid; 1933 waitpid $pid, 0 if $pid;
1755 if (0 == ($pid = fork)) { 1934 if (0 == ($pid = fork)) {
1756 $DB->{_meta}{version} = 1; 1935 $DB->{_meta}{version} = 1;
1757 Storable::nstore $DB, "$path~"; 1936 Storable::nstore $DB, "$path~";
1758 rename "$path~", $path; 1937 rename "$path~", $path;
… …
1811} 1990}
1812 1991
1813sub main { 1992sub main {
1814 # we must not ever block the main coroutine 1993 # we must not ever block the main coroutine
1815 local $Coro::idle = sub { 1994 local $Coro::idle = sub {
1816 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 1995 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1817 (Coro::unblock_sub { 1996 (Coro::unblock_sub {
1818 Event::one_event; 1997 Event::one_event;
1819 })->(); 1998 })->();
1820 }; 1999 };
1821 2000
… …
1826} 2005}
1827 2006
1828############################################################################# 2007#############################################################################
1829# initialisation 2008# initialisation
1830 2009
1831sub perl_reload() { 2010sub reload() {
1832 # can/must only be called in main 2011 # can/must only be called in main
1833 if ($Coro::current != $Coro::main) { 2012 if ($Coro::current != $Coro::main) {
1834 warn "can only reload from main coroutine\n"; 2013 warn "can only reload from main coroutine\n";
1835 return; 2014 return;
1836 } 2015 }
… …
1963 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2142 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
1964} 2143}
1965 2144
1966register "<global>", __PACKAGE__; 2145register "<global>", __PACKAGE__;
1967 2146
1968register_command "perl-reload" => sub { 2147register_command "reload" => sub {
1969 my ($who, $arg) = @_; 2148 my ($who, $arg) = @_;
1970 2149
1971 if ($who->flag (FLAG_WIZ)) { 2150 if ($who->flag (FLAG_WIZ)) {
1972 $who->message ("start of reload."); 2151 $who->message ("start of reload.");
1973 perl_reload; 2152 reload;
1974 $who->message ("end of reload."); 2153 $who->message ("end of reload.");
1975 } 2154 }
1976}; 2155};
1977 2156
1978unshift @INC, $LIBDIR; 2157unshift @INC, $LIBDIR;
… …
2018 or warn "ERROR: unable to write runtime file: $!"; 2197 or warn "ERROR: unable to write runtime file: $!";
2019 })->(); 2198 })->();
2020 }, 2199 },
2021); 2200);
2022 2201
2202END { cf::emergency_save }
2203
20231 22041
2024 2205

Diff Legend

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